Improved ChangeStatusForm and ChangeModeForm