Fixed an issue with the buttons