cleaned up the controls a little