diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua
index d49e28f1f..453a58b8f 100644
--- a/Libs/DF/fw.lua
+++ b/Libs/DF/fw.lua
@@ -1,6 +1,6 @@
 
 
-local dversion = 317
+local dversion = 319
 local major, minor = "DetailsFramework-1.0", dversion
 local DF, oldminor = LibStub:NewLibrary (major, minor)
 
@@ -1491,7 +1491,7 @@ end
 							parent.widgetids [widget_table.id] = switch
 						end
 						
-						local size = switch.hasLabel:GetStringWidth() + 60 + 4
+						local size = switch.hasLabel:GetStringWidth() + 32
 						if (size > max_x) then
 							max_x = size
 						end
@@ -1547,7 +1547,7 @@ end
 							parent.widgetids [widget_table.id] = slider
 						end
 
-						local size = slider.hasLabel:GetStringWidth() + 140 + 6
+						local size = slider.hasLabel:GetStringWidth() + 146
 						if (size > max_x) then
 							max_x = size
 						end
@@ -1593,7 +1593,7 @@ end
 							parent.widgetids [widget_table.id] = colorpick
 						end
 
-						local size = colorpick.hasLabel:GetStringWidth() + 60 + 4
+						local size = colorpick.hasLabel:GetStringWidth() + 32
 						if (size > max_x) then
 							max_x = size
 						end
@@ -1689,7 +1689,7 @@ end
 							parent.widgetids [widget_table.id] = textentry
 						end
 						
-						local size = textentry.hasLabel:GetStringWidth() + 60 + 4
+						local size = textentry.hasLabel:GetStringWidth() + 64
 						if (size > max_x) then
 							max_x = size
 						end
@@ -1710,8 +1710,7 @@ end
 					
 					if (widget_table.type == "breakline" or cur_y < height) then
 						cur_y = y_offset
-						cur_x = cur_x + max_x + 30
-						line_widgets_created = 0
+						cur_x = cur_x + max_x + 20
 						max_x = 0
 					end
 
@@ -1798,7 +1797,7 @@ end
 						parent.widgetids [widget_table.id] = dropdown
 					end
 					
-					local size = label.widget:GetStringWidth() + 140 + 4
+					local size = label.widget:GetStringWidth() + 144
 					if (size > max_x) then
 						max_x = size
 					end
@@ -1853,7 +1852,7 @@ end
 						parent.widgetids [widget_table.id] = switch
 					end
 					
-					local size = label.widget:GetStringWidth() + 60 + 4
+					local size = label.widget:GetStringWidth() + 32
 					if (size > max_x) then
 						max_x = size
 					end
@@ -1899,7 +1898,7 @@ end
 						parent.widgetids [widget_table.id] = slider
 					end
 
-					local size = label.widget:GetStringWidth() + 140 + 6
+					local size = label.widget:GetStringWidth() + 146
 					if (size > max_x) then
 						max_x = size
 					end
@@ -1944,7 +1943,7 @@ end
 						parent.widgetids [widget_table.id] = colorpick
 					end
 
-					local size = label.widget:GetStringWidth() + 60 + 4
+					local size = label.widget:GetStringWidth() + 32
 					if (size > max_x) then
 						max_x = size
 					end
@@ -2042,7 +2041,7 @@ end
 						parent.widgetids [widget_table.id] = textentry
 					end
 					
-					local size = label.widget:GetStringWidth() + 60 + 4
+					local size = label.widget:GetStringWidth() + 64
 					if (size > max_x) then
 						max_x = size
 					end
@@ -2070,7 +2069,7 @@ end
 
 				if (widget_table.type == "breakline" or cur_y < height) then
 					cur_y = y_offset
-					cur_x = cur_x + max_x + 30
+					cur_x = cur_x + max_x + 20
 					line_widgets_created = 0
 					max_x = 0
 				end
diff --git a/Libs/DF/panel.lua b/Libs/DF/panel.lua
index a47e8cb84..f015d0026 100644
--- a/Libs/DF/panel.lua
+++ b/Libs/DF/panel.lua
@@ -4016,7 +4016,7 @@ function DF:CreateTabContainer (parent, title, frame_name, frameList, options_ta
 	local mainFrame = CreateFrame ("frame", frame_name, parent.widget or parent, "BackdropTemplate")
 	mainFrame:SetAllPoints()
 	DF:Mixin (mainFrame, DF.TabContainerFunctions)
-	mainFrame.hookList = hookList
+	mainFrame.hookList = hookList or {}
 	
 	local mainTitle = DF:CreateLabel (mainFrame, title, 24, "white")
 	mainTitle:SetPoint ("topleft", mainFrame, "topleft", 10, -30 + y_offset)
diff --git a/boot.lua b/boot.lua
index 7734e0020..29769422f 100644
--- a/boot.lua
+++ b/boot.lua
@@ -6,8 +6,8 @@
 
 		local version, build, date, tocversion = GetBuildInfo()
 
-		_detalhes.build_counter = 9821
-		_detalhes.alpha_build_counter = 9821 --if this is higher than the regular counter, use it instead
+		_detalhes.build_counter = 9822
+		_detalhes.alpha_build_counter = 9822 --if this is higher than the regular counter, use it instead
 		_detalhes.bcc_counter = 39
 		_detalhes.dont_open_news = true
 		_detalhes.game_version = version