rework schema, add order and active_picker to draft