Fixed button state bindings