UI tweaks
Merge pull request #3927 from liggitt/ui_tweaks

Merged by openshift-bot