Some more UI fixes
Merge pull request #2 from rajatpatel92/master

Some more UI fixes