Ok, that's about all the GUI rework I can handle for today.
Removing excessive cleverness.