Move to using element stats rather then js class states remove ui-button-text spans. Removed button set