US11589: UI: Minor Fixes