Bug fixes:#769,#749
Merge pull request #799 from lingalamadhukar/ui_issues

Bug fixes:#769,#749