More form tweaks