WIP: Several UI changes #49

Draft
rskthomas wants to merge 5 commits from ux-changes into main

5 commits