Issue #1117: Minor UI tweaks