#26905 UI tweaks based on feedback.