fixing subpage layout. should be html.
Merge branch 'master' into gh-pages