Create US11711: UI: Minor Fixes (Iteration 19)