Completing work to rearrange procedure order to match product UI