Minor UI tweak
Merge branch 'uitweak'