diff --git a/Sources/arm/ui/TabLayers.hx b/Sources/arm/ui/TabLayers.hx
index 8849fe9b..81d12ba2 100644
--- a/Sources/arm/ui/TabLayers.hx
+++ b/Sources/arm/ui/TabLayers.hx
@@ -50,7 +50,7 @@ class TabLayers {
 			if (atlases != null) for (a in atlases) ar.push(a);
 			var filterHandle = Id.handle();
 			filterHandle.position = Context.layerFilter;
-			Context.layerFilter = ui.combo(filterHandle, ar, tr("Filter"), false, Left, 16);
+			Context.layerFilter = ui.combo(filterHandle, ar, tr("Filter"), false, Left);
 			if (filterHandle.changed) {
 				for (p in Project.paintObjects) {
 					p.visible = Context.layerFilter == 0 || p.name == ar[Context.layerFilter] || Project.isAtlasObject(p);
@@ -630,7 +630,7 @@ class TabLayers {
 					if (atlases != null) for (a in atlases) ar.push(a);
 					var objectHandle = Id.handle().nest(l.id);
 					objectHandle.position = l.objectMask;
-					l.objectMask = ui.combo(objectHandle, ar, tr("Object"), false, Left, 16);
+					l.objectMask = ui.combo(objectHandle, ar, tr("Object"), false, Left);
 					if (objectHandle.changed) {
 						Context.setLayer(l);
 						MakeMaterial.parseMeshMaterial();
diff --git a/Sources/arm/ui/UINodes.hx b/Sources/arm/ui/UINodes.hx
index 601a8751..9abfb15e 100644
--- a/Sources/arm/ui/UINodes.hx
+++ b/Sources/arm/ui/UINodes.hx
@@ -516,6 +516,9 @@ class UINodes {
 
 			// Nodes
 			ui.inputEnabled = !drawMenu;
+			ui.windowBorderRight = Config.raw.layout[LayoutSidebarW];
+			ui.windowBorderTop = UIHeader.inst.headerh * 2;
+			ui.windowBorderBottom = Config.raw.layout[LayoutStatusH];
 			nodes.nodeCanvas(ui, c);
 			ui.inputEnabled = true;
 
@@ -718,6 +721,7 @@ class UINodes {
 					nodes.nodesSelected = [node];
 					nodes.nodesDrag = true;
 				}
+				// Next column
 				if (ui._y - wy + ui.ELEMENT_H() / 2 > wh) { ui._x += menuw; ui._y = py; }
 			}
 			if (isGroupCategory) {