Fix layouts for more consistent styles

Changes keeping columns lined up and will make future styles
easier to maintain.
Headers smaller