Some fixes to the contact us form