CF - re-order OSD elements to match order in BF.