Housekeeping: UI tweaks