diff --git a/Config/OptionsTables.lua b/Config/OptionsTables.lua
index 21d80ee..d1115c7 100644
--- a/Config/OptionsTables.lua
+++ b/Config/OptionsTables.lua
@@ -1972,19 +1972,6 @@ local function MakeDebugOptions(opts, categoryName)
     end
   end
   
-  -- Debug Output
-  do
-    local opts = GUI:CreateGroup(opts, GUI:Order(), "Output")
-    
-    local disabled = not self:GetGlobalOption"debug"
-    
-    do
-      local opts = GUI:CreateGroupBox(opts, "Suppress All")
-      
-      GUI:CreateToggle(opts, {"debugOutput", "suppressAll"}, self.debugPrefix .. " " .. self.L["Hide messages like this one."], nil, disabled).width = 2
-    end
-  end
-  
   -- Caches
   do
     local opts = GUI:CreateGroup(opts, GUI:Order(), "Cache")
diff --git a/Operations/CalculatePadding.lua b/Operations/CalculatePadding.lua
index 25f5cf0..b7a72aa 100644
--- a/Operations/CalculatePadding.lua
+++ b/Operations/CalculatePadding.lua
@@ -21,14 +21,14 @@ local easyLines = {
   EnchantHint     = "Enchant",
   WeaponEnchant   = "WeaponEnchant",
   Rune            = "WeaponEnchant",
-  Socket          = "Socket",
-  RequiredSocket  = "Socket",
-  SocketBonus     = "SocketBonus",
+  -- Socket          = "Socket",
+  -- RequiredSocket  = "Socket",
+  -- SocketBonus     = "SocketBonus",
   SetName         = "SetBonus",
   SetPiece        = "SetBonus",
   SetBonus        = "SetBonus",
 }
-local hardLines = Addon:MakeLookupTable{"SecondaryStat", "EnchantOnUse", "RequiredEnchantOnUse", "Charges", "Cooldown", "SocketHint"}
+local hardLines = Addon:MakeLookupTable{"Socket", "RequiredSocket", "SocketBonus", "SecondaryStat", "EnchantOnUse", "RequiredEnchantOnUse", "Charges", "Cooldown", "SocketHint"}
 
 
 local function GetPadType(offset, lineType, lastUse)
@@ -41,7 +41,9 @@ local function GetPadType(offset, lineType, lastUse)
     return
   end
   
-  if lineType == "SecondaryStat" then
+  if lineType == "Socket" or lineType == "RequiredSocket" or lineType == "SocketBonus" then
+    return offset == -1 and "Socket" or "SocketBonus"
+  elseif lineType == "SecondaryStat" then
     if Addon:GetOption"combineStats" then
       return "BaseStat"
     end