Trying to fix the buttons