Merge branch '597-improve-contact-form-and-page' into 'develop'

Resolve "Improve contact form and page"

Closes #597

See merge request !441
7 jobs for develop in 7 minutes and 20 seconds (queued for 6 seconds)