Various UI changes #10975

to remove a lot of the textual duplication