More contact form tweaks