Added button and label code