Major fixes to the form + added phone field