Finally fix the effing buttons