State of buttons now correct.