small fixes

Arkerthanrequested to merge
(removed):pregmod-master into pregmod-master

Mostly layout changes and some small fixes I found while working on my java sanity checker.

Merge request reports