UI Alignment fixes
Merge pull request #897 from lingalamadhukar/bug_fixes

UI Alignment fixes