Fixing UI issues

UI Fixes II

UI Fixes iii
Merge pull request #887 from lingalamadhukar/bug_fixes

Fixing UI issues