Form UI tweaks