New UI update
Merge pull request #6 from vitamind/master

New UI update