fix save- and unsave-state for button elements