#26905 UI Tweaks based on feedback.