Button class fix