Fix the buttons bugs