Added button event handlers