Finish up revisions to the Form component