Issue #22120:rearrange supply order widgets