Various UI Improvements. MIFOSX-1388