Improvements on contact form