Updated button class