Modified Button class