Major partial rewrite of ManagementFormController