Added button handlers that I thought I'd already added