Complete refactor of the FormHelper