FIX: UI tweaks