Fixed the buttons again