Add form validation
DRY the form
Work on new form -> param flow
Improve logic flow