Added button class and util functions