Changing draw to pass, cleaning up. Setting default button.