UI updates
Merge pull request #56 from apatel/master

UI updates