diff --git a/EVE-X-Preview.json b/EVE-X-Preview.json
index 1febb06..c7f4724 100644
--- a/EVE-X-Preview.json
+++ b/EVE-X-Preview.json
@@ -382,13 +382,13 @@
     },
     "global_Settings":{
         "AddCharacterToGroupHotkey":"^SC029",
-        "AutoForwardDelay":15,
+        "AutoForwardDelay":10,
         "CharScreenHotkey":"",
         "CharacterNameOverlayHotkeyColor":"AAAAAA",
         "CharacterNameOverlayHotkeySize":14,
         "CharacterNameOverlayPosition":{
-            "x":1207,
-            "y":27
+            "x":1198,
+            "y":0
         },
         "CharacterNameOverlayTextBold":1,
         "CharacterNameOverlayTextColor":"FFFFFF",
@@ -396,7 +396,7 @@
         "DisableLiveThumbnail":1,
         "Exclude_Character_Hotkey":"",
         "Global_Hotkeys":1,
-        "LastUsedProfile":"Alternate",
+        "LastUsedProfile":"5",
         "Minimize_Delay":100,
         "Reload_Script_Hotkey":"+SC029",
         "Suspend_Hotkeys_Hotkey":"!SC029",
diff --git a/src/Main_Class.ahk b/src/Main_Class.ahk
index bf2168d..5e9c985 100644
--- a/src/Main_Class.ahk
+++ b/src/Main_Class.ahk
@@ -95,7 +95,7 @@
         
         ; Register Hotkey for Add Character to Group if the user has it Set
         if (This.AddCharacterToGroupHotkey != "") {
-            HotIf (*) => WinExist(This.EVEExe)
+            HotIf (*) => WinActive(This.EVEExe)
             try {
                 Hotkey This.AddCharacterToGroupHotkey, ( * ) => This.AddCharacterToGroup(), "S1"
             }
@@ -1226,13 +1226,12 @@
             return
         
         targetGroupName := ""
-        searchCharacter := This.LastActiveCharacter != "" ? This.LastActiveCharacter : currentTitle
         
         if (IsObject(This.Hotkey_Groups) && This.Hotkey_Groups.Count != 0) {
             for groupName, groupData in This.Hotkey_Groups {
                 if (IsObject(groupData["Characters"])) {
                     for index, charName in groupData["Characters"] {
-                        if (charName = searchCharacter) {
+                        if (charName = currentTitle) {
                             targetGroupName := groupName
                             break
                         }
@@ -1243,6 +1242,17 @@
             }
         }
         
+        if (targetGroupName = "") {
+            if (IsObject(This.Hotkey_Groups) && This.Hotkey_Groups.Count != 0) {
+                for groupName, groupData in This.Hotkey_Groups {
+                    if (IsObject(groupData["Characters"]) && groupData["Characters"].Length > 0) {
+                        targetGroupName := groupName
+                        break
+                    }
+                }
+            }
+        }
+        
         if (targetGroupName = "")
             return