Reorganized controls.