Previous buton added and controls cleaned up