some minor ui improvements
Merge branch 'master' into gh-pages
update from master