Cherry-pick all UI tweaks & fixes.
Merge pull request #2145 from ic-hep/minor_ui_fixes

[v6r12] Cherry-pick all UI tweaks & fixes.