UI updates
Merge pull request #2 from pukhalski/master

UI updates