More UI changes, and D-R-Yed up some interface code