Update to order of fields on new contact form