Added button mapping