Made the buttons a little smarter about clicks