Added emailField and improved forms