Minor tweaks.
Merge branch 'master' of https://github.com/crcd/Experimental-User-Interfaces