Cleanup styling and layout to simplify internal pages
Merge branch 'master' into gh-pages