re-organized the order of controls in toolbox