Button class updates