#356: UI Improvements