Refactor layouts to utilize base for all
Merge pull request #7 from github/layout-simplification

Refactor layouts to utilize base for all pages