Merge pull request #33 from pdh/ui-improv

Ui improv
Merge branch 'master' into ui-improv