Improve button class