Redo the controls

Put the controls in a better place