UI fixups missing in previous commits