Update contact

@apcomplete This is the work for the updated contact form. It's ready to go when you get a chance to review.