Added button class and text drawing