Rearrange/add the contact form (still broken)