Minor UI cleanup.
Merge branch 'more_fixes'

* more_fixes:
  Minor UI cleanup.