basic layout for interior pages
Merge branch 'master' into gh-pages

pdating pages from master