Lots of additional UI tweaks. Still much more to do.