Refactor requisition controller and UI