tiny tweaks
one layout to rule them all
Merge branch 'master' into gh-pages