Made the button toggle give focus to the text box after being pressed.
Fixed merge conflicts.