diff --git a/Internal/UI/Button.lua b/Internal/UI/Button.lua
index 4c66e88..786a608 100644
--- a/Internal/UI/Button.lua
+++ b/Internal/UI/Button.lua
@@ -155,7 +155,7 @@ function Button.Begin(Label, Options)
 	Cursor.SetItemBounds(X, Y, W, H)
 	Cursor.AdvanceY(H)
 
-	-- Window.AddItem(X, Y, W, H, Id)
+	Window.AddItem(X, Y, W, H, Id)
 
 	Stats.End(StatHandle)
 
diff --git a/Internal/UI/LayoutManager.lua b/Internal/UI/LayoutManager.lua
index 6b9759a..5db7906 100644
--- a/Internal/UI/LayoutManager.lua
+++ b/Internal/UI/LayoutManager.lua
@@ -218,8 +218,9 @@ local function AddControl(Instance, W, H, Type)
 			end
 		end
 
-		Cursor.SetX(WinX + X)
-		Cursor.SetY(WinY + Y)
+		local Border = Window.GetBorder()
+		Cursor.SetX(WinX + X - Border)
+		Cursor.SetY(WinY + Y - Border)
 
 		if H < RowH then
 			if Instance.AlignRowY == 'center' then