Contact form fixes
Fixing merge