UI tweaks. Fixes #121.
Merge branch 'master' into gh-pages