UI cosmetic fixes