Update to the controls


Some tweaks to make controls better.