UAR-626 Round 2 of UI changes.