requisition config UI + a bit of cleanup