UI changes
Merge pull request #13 from abhidbydx/cr_work

UI changes