fix contact form
Finish #3 and #4