diff --git a/Modules/Config.lua b/Modules/Config.lua
index 561e337..3e0df54 100644
--- a/Modules/Config.lua
+++ b/Modules/Config.lua
@@ -501,6 +501,7 @@ function shared.Config.Init()
     title:SetText("Heimdall Config")
     configFrame:Add(title, 1, 12)
 
+    -- Spotter
     do
         local r, g, b, a = unpack(colors[colorIndex])
         colorIndex = colorIndex + 1
@@ -597,6 +598,7 @@ function shared.Config.Init()
         spotterConfigFrame:Add(throttleTime, 2, 4)
     end
 
+    -- Whoer
     do
         local r, g, b, a = unpack(colors[colorIndex])
         colorIndex = colorIndex + 1
@@ -673,6 +675,7 @@ function shared.Config.Init()
         whoerConfigFrame:Add(zoneNotifyFor, 6, 6)
     end
 
+    -- Messenger
     do
         local r, g, b, a = unpack(colors[colorIndex])
         colorIndex = colorIndex + 1
@@ -691,7 +694,7 @@ function shared.Config.Init()
                 return Heimdall_Data.config.messenger.enabled
             end)
         enableButton:UpdateColor(Heimdall_Data.config.messenger.enabled)
-        messengerConfigFrame:Add(enableButton, 1, 6)
+        messengerConfigFrame:Add(enableButton, 2, 6)
 
         local interval = CreateBasicSmallEditBox("HeimdallMessengerConfigInterval",
             messengerConfigFrame.frame, "Interval",
@@ -709,6 +712,7 @@ function shared.Config.Init()
         messengerConfigFrame:Add(interval, 2, 6)
     end
 
+    -- Death Reporter
     do
         local r, g, b, a = unpack(colors[colorIndex])
         colorIndex = colorIndex + 1
@@ -717,7 +721,8 @@ function shared.Config.Init()
         deathReporterConfigFrame.frame:SetBackdropColor(r, g, b, 0.3)
         configFrame:Add(deathReporterConfigFrame, 6, 3)
 
-        local title = CreateFancyText("HeimdallDeathReporterConfigTitle", deathReporterConfigFrame.frame, "Death Reporter",
+        local title = CreateFancyText("HeimdallDeathReporterConfigTitle", deathReporterConfigFrame.frame,
+            "Death Reporter",
             { r, g, b, a })
         deathReporterConfigFrame:Add(title, 1, 12)
 
@@ -798,6 +803,7 @@ function shared.Config.Init()
         deathReporterConfigFrame:Add(zoneOverride, 2, 6)
     end
 
+    -- Inviter
     do
         local r, g, b, a = unpack(colors[colorIndex])
         colorIndex = colorIndex + 1
@@ -815,7 +821,7 @@ function shared.Config.Init()
                 return Heimdall_Data.config.inviter.enabled
             end)
         enableButton:UpdateColor(Heimdall_Data.config.inviter.enabled)
-        inviterConfigFrame:Add(enableButton, 1, 4)
+        inviterConfigFrame:Add(enableButton, 1, 3)
 
         local allAssistButton = CreateBasicButton("HeimdallInviterConfigAllAssistButton",
             inviterConfigFrame.frame, "All Assist", function()
@@ -823,7 +829,7 @@ function shared.Config.Init()
                 return Heimdall_Data.config.inviter.allAssist
             end)
         allAssistButton:UpdateColor(Heimdall_Data.config.inviter.allAssist)
-        inviterConfigFrame:Add(allAssistButton, 1, 4)
+        inviterConfigFrame:Add(allAssistButton, 1, 3)
 
         local agentsAssist = CreateBasicButton("HeimdallInviterConfigAgentsAssistButton",
             inviterConfigFrame.frame, "Agents Assist", function()
@@ -831,7 +837,15 @@ function shared.Config.Init()
                 return Heimdall_Data.config.inviter.agentsAssist
             end)
         agentsAssist:UpdateColor(Heimdall_Data.config.inviter.agentsAssist)
-        inviterConfigFrame:Add(agentsAssist, 1, 4)
+        inviterConfigFrame:Add(agentsAssist, 1, 3)
+
+        local kickOffline = CreateBasicButton("HeimdallInviterConfigKickOfflineButton",
+            inviterConfigFrame.frame, "Kick Offline", function()
+                Heimdall_Data.config.inviter.kickOffline = not Heimdall_Data.config.inviter.kickOffline
+                return Heimdall_Data.config.inviter.kickOffline
+            end)
+        kickOffline:UpdateColor(Heimdall_Data.config.inviter.kickOffline)
+        inviterConfigFrame:Add(kickOffline, 1, 3)
 
         local throttle = CreateBasicSmallEditBox("HeimdallInviterConfigThrottle",
             inviterConfigFrame.frame, "Throttle",
@@ -904,14 +918,6 @@ function shared.Config.Init()
                 end
             end)
         inviterConfigFrame:Add(afkThreshold, 2, 6)
-
-        local kickOffline = CreateBasicButton("HeimdallInviterConfigKickOfflineButton",
-            inviterConfigFrame.frame, "Kick Offline", function()
-                Heimdall_Data.config.inviter.kickOffline = not Heimdall_Data.config.inviter.kickOffline
-                return Heimdall_Data.config.inviter.kickOffline
-            end)
-        kickOffline:UpdateColor(Heimdall_Data.config.inviter.kickOffline)
-        inviterConfigFrame:Add(kickOffline, 1, 4)
     end
 
     print("Heimdall - Config loaded")