Added button handling