changed wording and preventDefault in form
resolve conflict and merge
added required to form fields