More contact form changes