Fixing up the layout some more
Cleanup organization of typography styles and layout styles