More form style tweaks