Reworked the contact form