Merge basic page setup live on gh-pages