More changes to FormController