separated form fields and changed some wording