Made spacing in templates consistant, and added fields to contact form