Fix post-merge
UI cosmetic fixes