diff --git a/WeakAuras/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/WeakAuras/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
index 3612fe8..f35d8d9 100644
--- a/WeakAuras/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
+++ b/WeakAuras/libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
@@ -4,7 +4,7 @@
 -- @release $Id: AceConfigDialog-3.0.lua 1139 2016-07-03 07:43:51Z nevcairiel $

 local LibStub = LibStub
-local MAJOR, MINOR = "AceConfigDialog-3.0", 61
+local MAJOR, MINOR = "AceConfigDialog-3.0", 62
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)

 if not AceConfigDialog then return end
@@ -1398,6 +1398,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
                    end

                    InjectInfo(control, options, v, path, rootframe, appName)
+                   control.rowStart = GetOptionsMemberValue("rowStart", v, options, path, appName);
                    container:AddChild(control)
                end

diff --git a/WeakAuras/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua b/WeakAuras/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
index cf81973..a3301fc 100644
--- a/WeakAuras/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
+++ b/WeakAuras/libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
@@ -9,7 +9,7 @@
 -- @class file
 -- @name AceConfigRegistry-3.0
 -- @release $Id: AceConfigRegistry-3.0.lua 1139 2016-07-03 07:43:51Z nevcairiel $
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 16
+local MAJOR, MINOR = "AceConfigRegistry-3.0", 17
 local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)

 if not AceConfigRegistry then return end
@@ -91,6 +91,7 @@ local basekeys={
    func=optmethodfalse,
    arg={["*"]=true},
    width=optstring,
+   rowStart=optbool
 }

 local typedkeys={
diff --git a/WeakAuras/libs/AceGUI-3.0/AceGUI-3.0.lua b/WeakAuras/libs/AceGUI-3.0/AceGUI-3.0.lua
index 9853644..5daad7b 100644
--- a/WeakAuras/libs/AceGUI-3.0/AceGUI-3.0.lua
+++ b/WeakAuras/libs/AceGUI-3.0/AceGUI-3.0.lua
@@ -25,7 +25,7 @@
 -- @class file
 -- @name AceGUI-3.0
 -- @release $Id: AceGUI-3.0.lua 1102 2013-10-25 14:15:23Z nevcairiel $
-local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 34
+local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 35
 local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)

 if not AceGUI then return end -- No upgrade needed
@@ -737,7 +737,7 @@ AceGUI:RegisterLayout("Flow",
            else
                -- if there isn't available width for the control start a new row
                -- if a control is "fill" it will be on a row of its own full width
-               if usedwidth == 0 or ((framewidth) + usedwidth > width) or child.width == "fill" then
+               if usedwidth == 0 or ((framewidth) + usedwidth > width) or child.width == "fill" or child.rowStart then
                    if isfullheight then
                        -- a previous row has already filled the entire height, there's nothing we can usefully do anymore
                        -- (maybe error/warn about this?)
diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua
index 45ff269..df61836 100644
--- a/WeakAurasOptions/WeakAurasOptions.lua
+++ b/WeakAurasOptions/WeakAurasOptions.lua
@@ -526,6 +526,7 @@ function WeakAuras.ConstructOptions(prototype, data, startorder, subPrefix, subS
         options["use_"..name] = {
           type = "toggle",
           name = arg.display,
+          rowStart = true,
           desc = function()
             local v = trigger["use_"..realname];
             if(v == true) then
@@ -572,6 +573,7 @@ function WeakAuras.ConstructOptions(prototype, data, startorder, subPrefix, subS
           order = order,
           hidden = hidden,
           desc = arg.desc,
+          rowStart = true,
           get = function() return trigger["use_"..realname]; end,
           set = function(info, v)
             trigger["use_"..realname] = v;