Button fix

Button is not a callback, they are listeners