Make buttons toggle correctly