Improve UI
Merge pull request #154 from vreddy18/master

Improve UI