Rework the Op policy UI