Some other UI/UX touches
Merge branch 'master' into gh-pages