Kim - Buttons now disable properly after being clicked.