Changes to the button behaviour