Changes related to the buttons