Updated elements to meet required order in control