UI fixes
Merge pull request #1 from rajatpatel92/master

UI fixes