Changing the name of the buttons and fixing #2