Tidy up contact form
Fix comment form
Resolved merge conflict