Issue #22120:rearrange supply order widgets
Merge pull request #232 from garyhgohoos/22120

Issue #22120:rearrange supply order widgets