MIFOSX-943,#743 fixed
Merge pull request #818 from lingalamadhukar/ui_issues

MIFOSX-943,#743 fixed