fixes
Contact form fixes
MERGE!! :D