Small changes to the button code