MIFOSX-1091-Fixing Usability issues
Merge pull request #892 from lingalamadhukar/bug_fixes

MIFOSX-1091-Fixing Usability issues