Tidied up almost all of the rest of the controls.