Split out contact form and modal into templates

Move the AddContactForm and SendMessageModal into their own templates.