Updating the form to use the new standard form structure.