Added button class with events