Restructure construction of controls.