Added validation, changed form fields, WIP