Refactor html/css
Tweak footer
Merge branch 'master' into gh-pages