Added button management class