Misc UI polish.

Fixes #3374 and some UI polish nits.