MIFOSX-1091-Fixing Usability issues