Change to signal from QLineEdits.  Also change to user_input method when checking whether return was pressed while editing a textbox - should mean clicking OK while text box has focus still closes GUI