Lots of UI fixups and the like