Some UI fixups