Re-wrote parts of GUIListener's methods