basic styling and global js
Merge branch 'master' into gh-pages