Added and integrated button class