reorganized some of the controls