cosmetic fixes  - standardizing some of the layouts