PM: reorganise layouts
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
another go at updating ghpages without affecting master