Fix updating of binary selections

Update the different two choice selections as soon as they are clicked.

Also fix a bug where clicks where going through to the next menu screen with the number pad.