UI changes
Merge pull request #5 from pandemanish/master

UI changes