UI updates
Merge pull request #2190 from thinkingserious/master

UI updates