Various UI Improvements. MIFOSX-1388
Merge pull request #987 from gauravsaini03/MIFOSX-1388

Various UI Improvements. MIFOSX-1388