Finish refactoring the Form component