Improve how the form is handled