more css changes, templating changes
Merge branch 'gh-pages'
css, templating