Adds layout consistencies from home; refactors bad design
Merge pull request #1 from marcomo/LayoutRefactors

Layout Refactors