Added stateClass property for buttons