More work on contact form
Merge
Finished contact form