Added button wrapper