fixed almost all the buttons now