Modify the order of the fields and replace 'circuit' with 'department' in the circuit and amendment interfaces