Bug fixes and testing for contact form