From 4657542def6defaa923f245a5811d241c136e824 Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Fri, 6 Jan 2023 12:21:47 -0800
Subject: [PATCH] labelpos

---
 d2layouts/d2dagrelayout/layout.go             |   3 +-
 .../elk_alignment/dagre/board.exp.json        |  54 +++---
 .../elk_alignment/dagre/sketch.exp.svg        |  14 +-
 .../dagre/board.exp.json                      |  44 ++---
 .../dagre/sketch.exp.svg                      |  12 +-
 .../arrowhead_labels/dagre/board.exp.json     |  12 +-
 .../arrowhead_labels/dagre/sketch.exp.svg     |   6 +-
 .../stable/chaos1/dagre/board.exp.json        |  24 +--
 .../stable/chaos1/dagre/sketch.exp.svg        |   8 +-
 .../stable/chaos2/dagre/board.exp.json        | 164 +++++++++---------
 .../stable/chaos2/dagre/sketch.exp.svg        |  22 +--
 .../child_parent_edges/dagre/board.exp.json   |  80 ++++-----
 .../child_parent_edges/dagre/sketch.exp.svg   |   6 +-
 .../dagre/board.exp.json                      |   2 +-
 .../dagre/sketch.exp.svg                      |   6 +-
 .../self-referencing/dagre/board.exp.json     | 118 ++++++-------
 .../self-referencing/dagre/sketch.exp.svg     |   8 +-
 .../container_child_edge/dagre/board.exp.json |  18 +-
 .../container_child_edge/dagre/sketch.exp.svg |  10 +-
 19 files changed, 305 insertions(+), 306 deletions(-)

diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go
index 5543d541f..0d5c5d569 100644
--- a/d2layouts/d2dagrelayout/layout.go
+++ b/d2layouts/d2dagrelayout/layout.go
@@ -291,7 +291,6 @@ func setGraphAttrs(attrs dagreOpts) string {
   edgesep: %d,
   nodesep: %d,
   rankdir: "%s",
-  labelpos: "c",
 });
 `,
 		attrs.ranksep,
@@ -322,5 +321,5 @@ func generateAddParentLine(childID, parentID string) string {
 }
 
 func generateAddEdgeLine(fromID, toID, edgeID string, width, height int) string {
-	return fmt.Sprintf("g.setEdge({v:`%s`, w:`%s`, name:`%s`}, { width:%d, height:%d });\n", escapeID(fromID), escapeID(toID), escapeID(edgeID), width, height)
+	return fmt.Sprintf("g.setEdge({v:`%s`, w:`%s`, name:`%s`}, { width:%d, height:%d, labelpos: `c` });\n", escapeID(fromID), escapeID(toID), escapeID(edgeID), width, height)
 }
diff --git a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
index c6210fd19..8e9064df9 100644
--- a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
+++ b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json
@@ -9,7 +9,7 @@
         "x": 0,
         "y": 0
       },
-      "width": 457,
+      "width": 430,
       "height": 1672,
       "opacity": 1,
       "strokeDash": 0,
@@ -246,10 +246,10 @@
       "id": "deploy_workflow",
       "type": "",
       "pos": {
-        "x": 497,
+        "x": 470,
         "y": 0
       },
-      "width": 388,
+      "width": 371,
       "height": 981,
       "opacity": 1,
       "strokeDash": 0,
@@ -286,7 +286,7 @@
       "id": "deploy_workflow.manual",
       "type": "",
       "pos": {
-        "x": 547,
+        "x": 520,
         "y": 73
       },
       "width": 271,
@@ -326,7 +326,7 @@
       "id": "deploy_workflow.GHA",
       "type": "",
       "pos": {
-        "x": 548,
+        "x": 521,
         "y": 382
       },
       "width": 269,
@@ -366,7 +366,7 @@
       "id": "deploy_workflow.AWS",
       "type": "",
       "pos": {
-        "x": 605,
+        "x": 578,
         "y": 771
       },
       "width": 155,
@@ -406,10 +406,10 @@
       "id": "apollo_workflow",
       "type": "",
       "pos": {
-        "x": 926,
+        "x": 881,
         "y": 0
       },
-      "width": 767,
+      "width": 613,
       "height": 981,
       "opacity": 1,
       "strokeDash": 0,
@@ -446,7 +446,7 @@
       "id": "apollo_workflow.apollo",
       "type": "",
       "pos": {
-        "x": 991,
+        "x": 1069,
         "y": 73
       },
       "width": 238,
@@ -486,7 +486,7 @@
       "id": "apollo_workflow.GHA",
       "type": "",
       "pos": {
-        "x": 976,
+        "x": 1053,
         "y": 382
       },
       "width": 269,
@@ -526,7 +526,7 @@
       "id": "apollo_workflow.AWS",
       "type": "",
       "pos": {
-        "x": 1033,
+        "x": 1110,
         "y": 771
       },
       "width": 155,
@@ -782,19 +782,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 682.5,
+          "x": 655.5,
           "y": 210
         },
         {
-          "x": 682.5,
+          "x": 655.5,
           "y": 278.8
         },
         {
-          "x": 682.5,
+          "x": 655.5,
           "y": 313.2
         },
         {
-          "x": 682.5,
+          "x": 655.5,
           "y": 382
         }
       ],
@@ -830,19 +830,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 682.5,
+          "x": 655.5,
           "y": 519
         },
         {
-          "x": 682.5,
+          "x": 655.5,
           "y": 619.8
         },
         {
-          "x": 682.5,
+          "x": 655.5,
           "y": 670.2
         },
         {
-          "x": 682.5,
+          "x": 655.5,
           "y": 771
         }
       ],
@@ -878,19 +878,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 1110,
+          "x": 1187.5,
           "y": 210
         },
         {
-          "x": 1110,
+          "x": 1187.5,
           "y": 278.8
         },
         {
-          "x": 1110,
+          "x": 1187.5,
           "y": 313.2
         },
         {
-          "x": 1110,
+          "x": 1187.5,
           "y": 382
         }
       ],
@@ -926,19 +926,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 1110,
+          "x": 1187.5,
           "y": 519
         },
         {
-          "x": 1110,
+          "x": 1187.5,
           "y": 619.8
         },
         {
-          "x": 1110,
+          "x": 1187.5,
           "y": 670.2
         },
         {
-          "x": 1110,
+          "x": 1187.5,
           "y": 771
         }
       ],
diff --git a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg
index c4ccbb2cd..63e8305ca 100644
--- a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="1897" height="1876" viewBox="-102 -102 1897 1876"><style type="text/css">
+width="1698" height="1876" viewBox="-102 -102 1698 1876"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,16 +39,16 @@ width="1897" height="1876" viewBox="-102 -102 1897 1876"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="build_workflow"><g class="shape" ><rect x="0" y="0" width="457" height="1672" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="228.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">lambda-build.yaml</text></g><g id="deploy_workflow"><g class="shape" ><rect x="497" y="0" width="388" height="981" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="691.000000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">lambda-deploy.yaml</text></g><g id="apollo_workflow"><g class="shape" ><rect x="926" y="0" width="767" height="981" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="1309.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">apollo-deploy.yaml</text></g><g id="build_workflow.push"><g class="shape" ><rect x="50" y="73" width="330" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.000000" y="148.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">Push to main branch</text></g><g id="build_workflow.GHA"><g class="shape" ><rect x="81" y="382" width="269" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.500000" y="457.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">GitHub Actions</text></g><g id="build_workflow.S3"><g class="shape" ><rect x="150" y="771" width="131" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.500000" y="846.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">S3</text></g><g id="build_workflow.Terraform"><g class="shape" ><rect x="106" y="1153" width="218" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.000000" y="1228.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">Terraform</text></g><g id="build_workflow.AWS"><g class="shape" ><rect x="138" y="1462" width="155" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.500000" y="1537.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">AWS</text></g><g id="deploy_workflow.manual"><g class="shape" ><rect x="547" y="73" width="271" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="682.500000" y="148.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">Manual Trigger</text></g><g id="deploy_workflow.GHA"><g class="shape" ><rect x="548" y="382" width="269" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="682.500000" y="457.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">GitHub Actions</text></g><g id="deploy_workflow.AWS"><g class="shape" ><rect x="605" y="771" width="155" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="682.500000" y="846.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">AWS</text></g><g id="apollo_workflow.apollo"><g class="shape" ><rect x="991" y="73" width="238" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1110.000000" y="148.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">Apollo Repo</text></g><g id="apollo_workflow.GHA"><g class="shape" ><rect x="976" y="382" width="269" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1110.500000" y="457.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">GitHub Actions</text></g><g id="apollo_workflow.AWS"><g class="shape" ><rect x="1033" y="771" width="155" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1110.500000" y="846.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">AWS</text></g><g id="build_workflow.(push -&gt; GHA)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 215.000000 212.000000 C 215.000000 278.800000 215.000000 313.200000 215.000000 378.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2783610857)"/><text class="text-italic" x="215.500000" y="303.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Triggers</text></g><g id="build_workflow.(GHA -&gt; S3)[0]"><path d="M 215.000000 521.000000 C 215.000000 619.800000 215.000000 670.200000 215.000000 767.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2783610857)"/><text class="text-italic" x="215.000000" y="652.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Builds zip and pushes it</text></g><g id="build_workflow.(S3 &lt;-&gt; Terraform)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><path d="M 215.000000 912.000000 C 215.000000 966.400000 215.000000 1084.200000 215.000000 1149.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#2783610857)"/><text class="text-italic" x="215.500000" y="1038.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Pulls zip to deploy</text></g><g id="build_workflow.(Terraform -&gt; AWS)[0]"><path d="M 215.000000 1292.000000 C 215.000000 1358.800000 215.000000 1393.200000 215.000000 1458.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2783610857)"/><text class="text-italic" x="215.500000" y="1383.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Changes live lambdas</text></g><g id="deploy_workflow.(manual -&gt; GHA)[0]"><path d="M 682.500000 212.000000 C 682.500000 278.800000 682.500000 313.200000 682.500000 378.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2783610857)"/><text class="text-italic" x="683.000000" y="303.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Launches</text></g><g id="deploy_workflow.(GHA -&gt; AWS)[0]"><path d="M 682.500000 521.000000 C 682.500000 619.800000 682.500000 670.200000 682.500000 767.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2783610857)"/><text class="text-italic" x="682.500000" y="612.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E"><tspan x="682.500000" dy="0.000000">Builds zip</tspan><tspan x="682.500000" dy="21.200000">pushes them to S3.</tspan><tspan x="682.500000" dy="21.200000"> </tspan><tspan x="682.500000" dy="21.200000">Deploys lambdas</tspan><tspan x="682.500000" dy="21.200000">using Terraform</tspan></text></g><g id="apollo_workflow.(apollo -&gt; GHA)[0]"><path d="M 1110.000000 212.000000 C 1110.000000 278.800000 1110.000000 313.200000 1110.000000 378.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2783610857)"/><text class="text-italic" x="1110.500000" y="303.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Triggered manually/push to master test test test test test test test</text></g><g id="apollo_workflow.(GHA -&gt; AWS)[0]"><path d="M 1110.000000 521.000000 C 1110.000000 619.800000 1110.000000 670.200000 1110.000000 767.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2783610857)"/><text class="text-italic" x="1110.500000" y="652.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">test</text></g><mask id="2783610857" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1897" height="1876">
-<rect x="-100" y="-100" width="1897" height="1876" fill="white"></rect>
+]]></script><g id="build_workflow"><g class="shape" ><rect x="0" y="0" width="430" height="1672" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="215.000000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">lambda-build.yaml</text></g><g id="deploy_workflow"><g class="shape" ><rect x="470" y="0" width="371" height="981" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="655.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">lambda-deploy.yaml</text></g><g id="apollo_workflow"><g class="shape" ><rect x="881" y="0" width="613" height="981" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="1187.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">apollo-deploy.yaml</text></g><g id="build_workflow.push"><g class="shape" ><rect x="50" y="73" width="330" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.000000" y="148.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">Push to main branch</text></g><g id="build_workflow.GHA"><g class="shape" ><rect x="81" y="382" width="269" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.500000" y="457.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">GitHub Actions</text></g><g id="build_workflow.S3"><g class="shape" ><rect x="150" y="771" width="131" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.500000" y="846.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">S3</text></g><g id="build_workflow.Terraform"><g class="shape" ><rect x="106" y="1153" width="218" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.000000" y="1228.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">Terraform</text></g><g id="build_workflow.AWS"><g class="shape" ><rect x="138" y="1462" width="155" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="215.500000" y="1537.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">AWS</text></g><g id="deploy_workflow.manual"><g class="shape" ><rect x="520" y="73" width="271" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="655.500000" y="148.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">Manual Trigger</text></g><g id="deploy_workflow.GHA"><g class="shape" ><rect x="521" y="382" width="269" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="655.500000" y="457.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">GitHub Actions</text></g><g id="deploy_workflow.AWS"><g class="shape" ><rect x="578" y="771" width="155" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="655.500000" y="846.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">AWS</text></g><g id="apollo_workflow.apollo"><g class="shape" ><rect x="1069" y="73" width="238" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1188.000000" y="148.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">Apollo Repo</text></g><g id="apollo_workflow.GHA"><g class="shape" ><rect x="1053" y="382" width="269" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1187.500000" y="457.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">GitHub Actions</text></g><g id="apollo_workflow.AWS"><g class="shape" ><rect x="1110" y="771" width="155" height="137" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1187.500000" y="846.000000" style="text-anchor:middle;font-size:25px;fill:#0A0F25">AWS</text></g><g id="build_workflow.(push -&gt; GHA)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 215.000000 212.000000 C 215.000000 278.800000 215.000000 313.200000 215.000000 378.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1726452628)"/><text class="text-italic" x="215.500000" y="303.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Triggers</text></g><g id="build_workflow.(GHA -&gt; S3)[0]"><path d="M 215.000000 521.000000 C 215.000000 619.800000 215.000000 670.200000 215.000000 767.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1726452628)"/><text class="text-italic" x="215.000000" y="652.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Builds zip and pushes it</text></g><g id="build_workflow.(S3 &lt;-&gt; Terraform)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><path d="M 215.000000 912.000000 C 215.000000 966.400000 215.000000 1084.200000 215.000000 1149.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#1726452628)"/><text class="text-italic" x="215.500000" y="1038.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Pulls zip to deploy</text></g><g id="build_workflow.(Terraform -&gt; AWS)[0]"><path d="M 215.000000 1292.000000 C 215.000000 1358.800000 215.000000 1393.200000 215.000000 1458.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1726452628)"/><text class="text-italic" x="215.500000" y="1383.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Changes live lambdas</text></g><g id="deploy_workflow.(manual -&gt; GHA)[0]"><path d="M 655.500000 212.000000 C 655.500000 278.800000 655.500000 313.200000 655.500000 378.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1726452628)"/><text class="text-italic" x="656.000000" y="303.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Launches</text></g><g id="deploy_workflow.(GHA -&gt; AWS)[0]"><path d="M 655.500000 521.000000 C 655.500000 619.800000 655.500000 670.200000 655.500000 767.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1726452628)"/><text class="text-italic" x="655.500000" y="612.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E"><tspan x="655.500000" dy="0.000000">Builds zip</tspan><tspan x="655.500000" dy="21.200000">pushes them to S3.</tspan><tspan x="655.500000" dy="21.200000"> </tspan><tspan x="655.500000" dy="21.200000">Deploys lambdas</tspan><tspan x="655.500000" dy="21.200000">using Terraform</tspan></text></g><g id="apollo_workflow.(apollo -&gt; GHA)[0]"><path d="M 1187.500000 212.000000 C 1187.500000 278.800000 1187.500000 313.200000 1187.500000 378.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1726452628)"/><text class="text-italic" x="1187.500000" y="303.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">Triggered manually/push to master test test test test test test test</text></g><g id="apollo_workflow.(GHA -&gt; AWS)[0]"><path d="M 1187.500000 521.000000 C 1187.500000 619.800000 1187.500000 670.200000 1187.500000 767.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1726452628)"/><text class="text-italic" x="1187.500000" y="652.000000" style="text-anchor:middle;font-size:20px;fill:#676C7E">test</text></g><mask id="1726452628" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1698" height="1876">
+<rect x="-100" y="-100" width="1698" height="1876" fill="white"></rect>
 <rect x="182.000000" y="283.000000" width="67" height="26" fill="black"></rect>
 <rect x="119.000000" y="632.000000" width="192" height="26" fill="black"></rect>
 <rect x="141.000000" y="1018.000000" width="149" height="26" fill="black"></rect>
 <rect x="126.000000" y="1363.000000" width="179" height="26" fill="black"></rect>
-<rect x="644.000000" y="283.000000" width="78" height="26" fill="black"></rect>
-<rect x="606.000000" y="592.000000" width="153" height="106" fill="black"></rect>
-<rect x="844.000000" y="283.000000" width="533" height="26" fill="black"></rect>
-<rect x="1095.000000" y="632.000000" width="31" height="26" fill="black"></rect>
+<rect x="617.000000" y="283.000000" width="78" height="26" fill="black"></rect>
+<rect x="579.000000" y="592.000000" width="153" height="106" fill="black"></rect>
+<rect x="921.000000" y="283.000000" width="533" height="26" fill="black"></rect>
+<rect x="1172.000000" y="632.000000" width="31" height="26" fill="black"></rect>
 </mask><style type="text/css"><![CDATA[
 .text {
 	font-family: "font-regular";
diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
index fd3010b8a..c3d59dcf3 100644
--- a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
+++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json
@@ -9,7 +9,7 @@
         "x": 0,
         "y": 0
       },
-      "width": 1634,
+      "width": 1621,
       "height": 226,
       "opacity": 1,
       "strokeDash": 0,
@@ -46,7 +46,7 @@
       "id": "k8s.m1",
       "type": "",
       "pos": {
-        "x": 129,
+        "x": 116,
         "y": 50
       },
       "width": 192,
@@ -86,7 +86,7 @@
       "id": "k8s.m2",
       "type": "",
       "pos": {
-        "x": 381,
+        "x": 368,
         "y": 50
       },
       "width": 192,
@@ -126,7 +126,7 @@
       "id": "k8s.m3",
       "type": "",
       "pos": {
-        "x": 633,
+        "x": 620,
         "y": 50
       },
       "width": 192,
@@ -166,7 +166,7 @@
       "id": "k8s.w1",
       "type": "",
       "pos": {
-        "x": 885,
+        "x": 872,
         "y": 50
       },
       "width": 193,
@@ -206,7 +206,7 @@
       "id": "k8s.w2",
       "type": "",
       "pos": {
-        "x": 1138,
+        "x": 1125,
         "y": 50
       },
       "width": 193,
@@ -246,7 +246,7 @@
       "id": "k8s.w3",
       "type": "",
       "pos": {
-        "x": 1391,
+        "x": 1378,
         "y": 50
       },
       "width": 193,
@@ -289,7 +289,7 @@
         "x": 0,
         "y": 347
       },
-      "width": 597,
+      "width": 555,
       "height": 226,
       "opacity": 1,
       "strokeDash": 0,
@@ -326,7 +326,7 @@
       "id": "osvc.vm1",
       "type": "",
       "pos": {
-        "x": 192,
+        "x": 171,
         "y": 397
       },
       "width": 136,
@@ -366,7 +366,7 @@
       "id": "osvc.vm2",
       "type": "",
       "pos": {
-        "x": 411,
+        "x": 369,
         "y": 397
       },
       "width": 136,
@@ -478,19 +478,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 208,
+          "x": 201,
           "y": 226
         },
         {
-          "x": 208,
+          "x": 201,
           "y": 274.4
         },
         {
-          "x": 208,
+          "x": 201,
           "y": 298.7
         },
         {
-          "x": 208,
+          "x": 201,
           "y": 347.5
         }
       ],
@@ -526,19 +526,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 323,
+          "x": 297,
           "y": 226
         },
         {
-          "x": 323,
+          "x": 297,
           "y": 274.4
         },
         {
-          "x": 323,
+          "x": 297,
           "y": 298.7
         },
         {
-          "x": 323,
+          "x": 297,
           "y": 347.5
         }
       ],
@@ -574,19 +574,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 420,
+          "x": 378,
           "y": 226
         },
         {
-          "x": 420,
+          "x": 378,
           "y": 274.4
         },
         {
-          "x": 420,
+          "x": 378,
           "y": 298.7
         },
         {
-          "x": 420,
+          "x": 378,
           "y": 347.5
         }
       ],
diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg
index 7d9fab079..5a0f1cfad 100644
--- a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg
+++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="1838" height="777" viewBox="-102 -102 1838 777"><style type="text/css">
+width="1825" height="777" viewBox="-102 -102 1825 777"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,12 +39,12 @@ width="1838" height="777" viewBox="-102 -102 1838 777"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="k8s"><g class="shape" ><rect x="0" y="0" width="1634" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="817.000000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">Kubernetes</text></g><g id="osvc"><g class="shape" ><rect x="0" y="347" width="597" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="298.500000" y="380.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">opensvc</text></g><g id="k8s.m1"><g class="shape" ><rect x="129" y="50" width="192" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="225.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-master1</text></g><g id="k8s.m2"><g class="shape" ><rect x="381" y="50" width="192" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="477.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-master2</text></g><g id="k8s.m3"><g class="shape" ><rect x="633" y="50" width="192" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="729.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-master3</text></g><g id="k8s.w1"><g class="shape" ><rect x="885" y="50" width="193" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="981.500000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-worker1</text></g><g id="k8s.w2"><g class="shape" ><rect x="1138" y="50" width="193" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1234.500000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-worker2</text></g><g id="k8s.w3"><g class="shape" ><rect x="1391" y="50" width="193" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1487.500000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-worker3</text></g><g id="osvc.vm1"><g class="shape" ><rect x="192" y="397" width="136" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="260.000000" y="463.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">VM1</text></g><g id="osvc.vm2"><g class="shape" ><rect x="411" y="397" width="136" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="479.000000" y="463.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">VM2</text></g><g id="(k8s -&gt; osvc)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 99.000000 228.000000 C 99.000000 274.400000 99.000000 298.700000 99.000000 343.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2147737434)"/><text class="text-italic" x="99.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">keycloak</text></g><g id="(k8s -&gt; osvc)[1]"><path d="M 208.000000 228.000000 C 208.000000 274.400000 208.000000 298.700000 208.000000 343.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2147737434)"/><text class="text-italic" x="208.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">heptapod</text></g><g id="(k8s -&gt; osvc)[2]"><path d="M 323.000000 228.000000 C 323.000000 274.400000 323.000000 298.700000 323.000000 343.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2147737434)"/><text class="text-italic" x="323.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">harbor</text></g><g id="(k8s -&gt; osvc)[3]"><path d="M 420.000000 228.000000 C 420.000000 274.400000 420.000000 298.700000 420.000000 343.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2147737434)"/><text class="text-italic" x="420.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">vault</text></g><mask id="2147737434" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1838" height="777">
-<rect x="-100" y="-100" width="1838" height="777" fill="white"></rect>
+]]></script><g id="k8s"><g class="shape" ><rect x="0" y="0" width="1621" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="810.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">Kubernetes</text></g><g id="osvc"><g class="shape" ><rect x="0" y="347" width="555" height="226" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="277.500000" y="380.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">opensvc</text></g><g id="k8s.m1"><g class="shape" ><rect x="116" y="50" width="192" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="212.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-master1</text></g><g id="k8s.m2"><g class="shape" ><rect x="368" y="50" width="192" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="464.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-master2</text></g><g id="k8s.m3"><g class="shape" ><rect x="620" y="50" width="192" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="716.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-master3</text></g><g id="k8s.w1"><g class="shape" ><rect x="872" y="50" width="193" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="968.500000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-worker1</text></g><g id="k8s.w2"><g class="shape" ><rect x="1125" y="50" width="193" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1221.500000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-worker2</text></g><g id="k8s.w3"><g class="shape" ><rect x="1378" y="50" width="193" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1474.500000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">k8s-worker3</text></g><g id="osvc.vm1"><g class="shape" ><rect x="171" y="397" width="136" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="239.000000" y="463.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">VM1</text></g><g id="osvc.vm2"><g class="shape" ><rect x="369" y="397" width="136" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="437.000000" y="463.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">VM2</text></g><g id="(k8s -&gt; osvc)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 99.000000 228.000000 C 99.000000 274.400000 99.000000 298.700000 99.000000 343.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2025777275)"/><text class="text-italic" x="99.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">keycloak</text></g><g id="(k8s -&gt; osvc)[1]"><path d="M 201.000000 228.000000 C 201.000000 274.400000 201.000000 298.700000 201.000000 343.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2025777275)"/><text class="text-italic" x="201.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">heptapod</text></g><g id="(k8s -&gt; osvc)[2]"><path d="M 297.000000 228.000000 C 297.000000 274.400000 297.000000 298.700000 297.000000 343.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2025777275)"/><text class="text-italic" x="297.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">harbor</text></g><g id="(k8s -&gt; osvc)[3]"><path d="M 378.000000 228.000000 C 378.000000 274.400000 378.000000 298.700000 378.000000 343.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2025777275)"/><text class="text-italic" x="378.500000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">vault</text></g><mask id="2025777275" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1825" height="777">
+<rect x="-100" y="-100" width="1825" height="777" fill="white"></rect>
 <rect x="70.000000" y="276.000000" width="59" height="21" fill="black"></rect>
-<rect x="176.000000" y="276.000000" width="65" height="21" fill="black"></rect>
-<rect x="300.000000" y="276.000000" width="47" height="21" fill="black"></rect>
-<rect x="403.000000" y="276.000000" width="35" height="21" fill="black"></rect>
+<rect x="169.000000" y="276.000000" width="65" height="21" fill="black"></rect>
+<rect x="274.000000" y="276.000000" width="47" height="21" fill="black"></rect>
+<rect x="361.000000" y="276.000000" width="35" height="21" fill="black"></rect>
 </mask><style type="text/css"><![CDATA[
 .text {
 	font-family: "font-regular";
diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
index a4bd08c79..7fc56f4fa 100644
--- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
+++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json
@@ -6,7 +6,7 @@
       "id": "a",
       "type": "",
       "pos": {
-        "x": 0,
+        "x": 44,
         "y": 0
       },
       "width": 113,
@@ -46,7 +46,7 @@
       "id": "b",
       "type": "",
       "pos": {
-        "x": 0,
+        "x": 44,
         "y": 247
       },
       "width": 113,
@@ -110,19 +110,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 56.5,
+          "x": 100.5,
           "y": 126
         },
         {
-          "x": 56.5,
+          "x": 100.5,
           "y": 174.4
         },
         {
-          "x": 56.5,
+          "x": 100.5,
           "y": 198.7
         },
         {
-          "x": 56.5,
+          "x": 100.5,
           "y": 247.5
         }
       ],
diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg
index ef85ef231..9bc4af0a9 100644
--- a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="401" height="577" viewBox="-144 -102 401 577"><style type="text/css">
+width="401" height="577" viewBox="-100 -102 401 577"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,9 +39,9 @@ width="401" height="577" viewBox="-144 -102 401 577"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="a"><g class="shape" ><rect x="0" y="0" width="113" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="56.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="0" y="247" width="113" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="56.500000" y="313.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-1247258845" markerWidth="24.200000" markerHeight="18.000000" refX="20.800000" refY="9.000000" viewBox="0.000000 0.000000 24.200000 18.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="white" stroke="#0D32B2" stroke-width="2" points="0.000000,9.000000 11.000000,2.250000 22.000000,9.000000 11.000000,16.200000" /> </marker><path d="M 56.500000 128.000000 C 56.500000 174.400000 56.500000 198.700000 56.500000 243.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-1247258845)" mask="url(#178283215)"/><text class="text-italic" x="56.500000" y="192.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">To err is human, to moo bovine</text><text class="text-italic" x="70.500000" y="150.000000" style="text-anchor:middle;font-size:16px;fill:black">1</text><text class="text-italic" x="70.500000" y="239.500000" style="text-anchor:middle;font-size:16px;fill:black">*</text></g><mask id="178283215" maskUnits="userSpaceOnUse" x="-100" y="-100" width="401" height="577">
+]]></script><g id="a"><g class="shape" ><rect x="44" y="0" width="113" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="100.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="44" y="247" width="113" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="100.500000" y="313.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="(a -&gt; b)[0]"><marker id="mk-1247258845" markerWidth="24.200000" markerHeight="18.000000" refX="20.800000" refY="9.000000" viewBox="0.000000 0.000000 24.200000 18.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="white" stroke="#0D32B2" stroke-width="2" points="0.000000,9.000000 11.000000,2.250000 22.000000,9.000000 11.000000,16.200000" /> </marker><path d="M 100.500000 128.000000 C 100.500000 174.400000 100.500000 198.700000 100.500000 243.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-1247258845)" mask="url(#3431639921)"/><text class="text-italic" x="100.500000" y="192.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">To err is human, to moo bovine</text><text class="text-italic" x="114.500000" y="150.000000" style="text-anchor:middle;font-size:16px;fill:black">1</text><text class="text-italic" x="114.500000" y="239.500000" style="text-anchor:middle;font-size:16px;fill:black">*</text></g><mask id="3431639921" maskUnits="userSpaceOnUse" x="-100" y="-100" width="401" height="577">
 <rect x="-100" y="-100" width="401" height="577" fill="white"></rect>
-<rect x="-44.000000" y="176.000000" width="201" height="21" fill="black"></rect>
+<rect x="0.000000" y="176.000000" width="201" height="21" fill="black"></rect>
 </mask><style type="text/css"><![CDATA[
 .text-bold {
 	font-family: "font-bold";
diff --git a/e2etests/testdata/stable/chaos1/dagre/board.exp.json b/e2etests/testdata/stable/chaos1/dagre/board.exp.json
index 12333e97c..6175434f5 100644
--- a/e2etests/testdata/stable/chaos1/dagre/board.exp.json
+++ b/e2etests/testdata/stable/chaos1/dagre/board.exp.json
@@ -9,7 +9,7 @@
         "x": 0,
         "y": 0
       },
-      "width": 283,
+      "width": 263,
       "height": 473,
       "opacity": 1,
       "strokeDash": 0,
@@ -86,7 +86,7 @@
       "id": "ddd",
       "type": "cylinder",
       "pos": {
-        "x": 334,
+        "x": 313,
         "y": 50
       },
       "width": 133,
@@ -126,7 +126,7 @@
       "id": "eee",
       "type": "document",
       "pos": {
-        "x": 334,
+        "x": 313,
         "y": 297
       },
       "width": 130,
@@ -166,7 +166,7 @@
       "id": "aaa.ccc",
       "type": "",
       "pos": {
-        "x": 89,
+        "x": 84,
         "y": 50
       },
       "width": 128,
@@ -230,11 +230,11 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 133.88056680161944,
+          "x": 131.67611336032388,
           "y": 176
         },
         {
-          "x": 119.57611336032389,
+          "x": 119.13522267206477,
           "y": 224.4
         },
         {
@@ -278,19 +278,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 334,
-          "y": 322
+          "x": 313,
+          "y": 320
         },
         {
-          "x": 218,
-          "y": 253.6
+          "x": 206.6,
+          "y": 253.2
         },
         {
-          "x": 185.4,
+          "x": 176.8,
           "y": 224.3
         },
         {
-          "x": 171,
+          "x": 164,
           "y": 175.5
         }
       ],
diff --git a/e2etests/testdata/stable/chaos1/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos1/dagre/sketch.exp.svg
index 9a1884c0f..cd29bb47a 100644
--- a/e2etests/testdata/stable/chaos1/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/chaos1/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="671" height="677" viewBox="-102 -102 671 677"><style type="text/css">
+width="650" height="677" viewBox="-102 -102 650 677"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,10 +39,10 @@ width="671" height="677" viewBox="-102 -102 671 677"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="aaa"><g class="shape" ><rect x="0" y="0" width="283" height="473" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="141.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">aaa</text></g><g id="ddd"><g class="shape" ><path d="M 334 74 C 334 50 393.85 50 400.5 50 C 407.15 50 467 50 467 74 V 152 C 467 176 407.15 176 400.5 176 C 393.85 176 334 176 334 152 V 74 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/><path d="M 334 74 C 334 98 393.85 98 400.5 98 C 407.15 98 467 98 467 74" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="400.500000" y="128.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ddd</text></g><g id="eee"><g class="shape" ><path d="M 334 405.5231 L 334 297 L 464 297 L 464 405.5231 C 442.3333 382.2206 420.6667 382.2206 399 405.5231 C 377.3333 428.8256 355.6667 428.8256 334 405.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="399.000000" y="363.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">eee</text></g><g id="aaa.bbb"><g class="shape" ><path d="M 50 297 V 378 H 116 V 423 L 146 378 H 182 V 297 H 50 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="116.000000" y="340.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">bbb</text></g><g id="aaa.ccc"><g class="shape" ><rect x="89" y="50" width="128" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="153.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ccc</text></g><g id="(aaa.ccc -- aaa)[0]"><path d="M 133.313712 177.917987 C 119.576113 224.400000 116.000000 248.600000 116.000000 295.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" mask="url(#136430979)"/><text class="text-italic" x="117.500000" y="241.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">111</text></g><g id="(eee &lt;- aaa.ccc)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><path d="M 330.554403 319.968286 C 218.000000 253.600000 185.400000 224.300000 171.566035 177.418230" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" mask="url(#136430979)"/><text class="text-italic" x="235.500000" y="269.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">222</text></g><mask id="136430979" maskUnits="userSpaceOnUse" x="-100" y="-100" width="671" height="677">
-<rect x="-100" y="-100" width="671" height="677" fill="white"></rect>
+]]></script><g id="aaa"><g class="shape" ><rect x="0" y="0" width="263" height="473" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="131.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">aaa</text></g><g id="ddd"><g class="shape" ><path d="M 313 74 C 313 50 372.85 50 379.5 50 C 386.15 50 446 50 446 74 V 152 C 446 176 386.15 176 379.5 176 C 372.85 176 313 176 313 152 V 74 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/><path d="M 313 74 C 313 98 372.85 98 379.5 98 C 386.15 98 446 98 446 74" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="379.500000" y="128.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ddd</text></g><g id="eee"><g class="shape" ><path d="M 313 405.5231 L 313 297 L 443 297 L 443 405.5231 C 421.3333 382.2206 399.6667 382.2206 378 405.5231 C 356.3333 428.8256 334.6667 428.8256 313 405.5231 Z" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="378.000000" y="363.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">eee</text></g><g id="aaa.bbb"><g class="shape" ><path d="M 50 297 V 378 H 116 V 423 L 146 378 H 182 V 297 H 50 Z" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="116.000000" y="340.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">bbb</text></g><g id="aaa.ccc"><g class="shape" ><rect x="84" y="50" width="128" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="148.000000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ccc</text></g><g id="(aaa.ccc -- aaa)[0]"><path d="M 131.174461 177.936064 C 119.135223 224.400000 116.000000 248.600000 116.000000 295.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" mask="url(#1809564108)"/><text class="text-italic" x="117.500000" y="241.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">111</text></g><g id="(eee &lt;- aaa.ccc)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><path d="M 309.612307 317.873140 C 206.600000 253.200000 176.800000 224.300000 164.507425 177.434559" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" mask="url(#1809564108)"/><text class="text-italic" x="220.500000" y="268.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">222</text></g><mask id="1809564108" maskUnits="userSpaceOnUse" x="-100" y="-100" width="650" height="677">
+<rect x="-100" y="-100" width="650" height="677" fill="white"></rect>
 <rect x="106.000000" y="225.000000" width="23" height="21" fill="black"></rect>
-<rect x="223.000000" y="253.000000" width="25" height="21" fill="black"></rect>
+<rect x="208.000000" y="252.000000" width="25" height="21" fill="black"></rect>
 </mask><style type="text/css"><![CDATA[
 .text {
 	font-family: "font-regular";
diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
index 90effe24f..12a1513a1 100644
--- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json
+++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json
@@ -9,7 +9,7 @@
         "x": 0,
         "y": 0
       },
-      "width": 1138,
+      "width": 1127,
       "height": 1735,
       "opacity": 1,
       "strokeDash": 0,
@@ -49,7 +49,7 @@
         "x": 40,
         "y": 50
       },
-      "width": 799,
+      "width": 788,
       "height": 1635,
       "opacity": 1,
       "strokeDash": 0,
@@ -89,7 +89,7 @@
         "x": 80,
         "y": 920
       },
-      "width": 533,
+      "width": 522,
       "height": 715,
       "opacity": 1,
       "strokeDash": 0,
@@ -129,7 +129,7 @@
         "x": 120,
         "y": 970
       },
-      "width": 377,
+      "width": 366,
       "height": 226,
       "opacity": 1,
       "strokeDash": 0,
@@ -166,7 +166,7 @@
       "id": "aa.bb.cc.dd.ee",
       "type": "text",
       "pos": {
-        "x": 246,
+        "x": 241,
         "y": 1073
       },
       "width": 16,
@@ -205,7 +205,7 @@
       "id": "aa.bb.cc.dd.ff",
       "type": "",
       "pos": {
-        "x": 331,
+        "x": 320,
         "y": 1020
       },
       "width": 117,
@@ -245,7 +245,7 @@
       "id": "aa.bb.cc.gg",
       "type": "text",
       "pos": {
-        "x": 436,
+        "x": 426,
         "y": 1317
       },
       "width": 17,
@@ -284,7 +284,7 @@
       "id": "aa.bb.cc.hh",
       "type": "",
       "pos": {
-        "x": 383,
+        "x": 373,
         "y": 1459
       },
       "width": 123,
@@ -327,7 +327,7 @@
         "x": 106,
         "y": 100
       },
-      "width": 420,
+      "width": 408,
       "height": 226,
       "opacity": 1,
       "strokeDash": 0,
@@ -364,7 +364,7 @@
       "id": "aa.bb.ii.jj",
       "type": "diamond",
       "pos": {
-        "x": 269,
+        "x": 263,
         "y": 150
       },
       "width": 115,
@@ -404,7 +404,7 @@
       "id": "aa.bb.kk",
       "type": "oval",
       "pos": {
-        "x": 663,
+        "x": 652,
         "y": 1459
       },
       "width": 126,
@@ -444,7 +444,7 @@
       "id": "aa.ll",
       "type": "",
       "pos": {
-        "x": 936,
+        "x": 925,
         "y": 673
       },
       "width": 114,
@@ -484,7 +484,7 @@
       "id": "aa.mm",
       "type": "cylinder",
       "pos": {
-        "x": 923,
+        "x": 912,
         "y": 447
       },
       "width": 131,
@@ -524,7 +524,7 @@
       "id": "aa.nn",
       "type": "text",
       "pos": {
-        "x": 889,
+        "x": 878,
         "y": 1512
       },
       "width": 16,
@@ -563,7 +563,7 @@
       "id": "aa.oo",
       "type": "",
       "pos": {
-        "x": 965,
+        "x": 954,
         "y": 1459
       },
       "width": 123,
@@ -627,19 +627,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 253.5,
+          "x": 248.5,
           "y": 1094.5
         },
         {
-          "x": 253.5,
+          "x": 248.5,
           "y": 1175.7
         },
         {
-          "x": 290.1,
+          "x": 284.1,
           "y": 1270.1
         },
         {
-          "x": 436.5,
+          "x": 426.5,
           "y": 1324.5
         }
       ],
@@ -675,19 +675,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 444.5,
+          "x": 434.5,
           "y": 1338
         },
         {
-          "x": 444.5,
+          "x": 434.5,
           "y": 1386.4
         },
         {
-          "x": 444.5,
+          "x": 434.5,
           "y": 1410.7
         },
         {
-          "x": 444.5,
+          "x": 434.5,
           "y": 1459.5
         }
       ],
@@ -819,20 +819,20 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 936,
-          "y": 745.3486055776892
+          "x": 925,
+          "y": 745.597137014315
         },
         {
-          "x": 858.4,
-          "y": 758.1486055776892
+          "x": 847.4,
+          "y": 758.3971370143149
         },
         {
-          "x": 916.6,
-          "y": 748.5486055776893
+          "x": 905.6,
+          "y": 748.797137014315
         },
         {
-          "x": 839,
-          "y": 761.3486055776892
+          "x": 828,
+          "y": 761.597137014315
         }
       ],
       "isCurve": true,
@@ -867,31 +867,31 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 923,
+          "x": 912,
           "y": 521
         },
         {
-          "x": 430.2,
+          "x": 420,
           "y": 602.6
         },
         {
-          "x": 307,
+          "x": 297,
           "y": 645.6
         },
         {
-          "x": 307,
+          "x": 297,
           "y": 679.5
         },
         {
-          "x": 307,
+          "x": 297,
           "y": 713.4
         },
         {
-          "x": 307,
+          "x": 297,
           "y": 871.7
         },
         {
-          "x": 307,
+          "x": 297,
           "y": 920.5
         }
       ],
@@ -927,19 +927,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 991,
+          "x": 980,
           "y": 573
         },
         {
-          "x": 992.6,
+          "x": 981.6,
           "y": 613
         },
         {
-          "x": 993,
+          "x": 982,
           "y": 633
         },
         {
-          "x": 993,
+          "x": 982,
           "y": 673
         }
       ],
@@ -975,20 +975,20 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 923,
+          "x": 912,
           "y": 522
         },
         {
-          "x": 856,
-          "y": 534.0162403572879
+          "x": 845,
+          "y": 533.8777110844337
         },
         {
-          "x": 906.25,
-          "y": 525.0040600893219
+          "x": 895.25,
+          "y": 524.9694277711085
         },
         {
-          "x": 839.25,
-          "y": 537.0203004466098
+          "x": 828.25,
+          "y": 536.8471388555422
         }
       ],
       "isCurve": true,
@@ -1023,68 +1023,68 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 936,
+          "x": 925,
           "y": 751.4544456641054
         },
         {
-          "x": 617.2,
+          "x": 606.2,
           "y": 837.890889132821
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 871.6
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 889.75
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 907.9
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 930
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 945
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 960
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 992.6
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 1026.5
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 1060.4
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 1105.6
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 1139.5
         },
         {
-          "x": 537.5,
+          "x": 526.5,
           "y": 1173.4
         },
         {
-          "x": 520.5,
-          "y": 1269.5
+          "x": 509.7,
+          "y": 1269.3
         },
         {
-          "x": 452.5,
-          "y": 1321.5
+          "x": 442.5,
+          "y": 1320.5
         }
       ],
       "isCurve": true,
@@ -1119,19 +1119,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 923,
+          "x": 912,
           "y": 495
         },
         {
-          "x": 547,
+          "x": 535.2,
           "y": 408.2
         },
         {
-          "x": 453,
+          "x": 441,
           "y": 374.4
         },
         {
-          "x": 453,
+          "x": 441,
           "y": 326
         }
       ],
@@ -1167,19 +1167,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 413,
+          "x": 401,
           "y": 920
         },
         {
-          "x": 413,
+          "x": 401,
           "y": 871.6
         },
         {
-          "x": 517.6,
+          "x": 505.8,
           "y": 837.3
         },
         {
-          "x": 936,
+          "x": 925,
           "y": 748.5
         }
       ],
@@ -1215,31 +1215,31 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 413,
+          "x": 393,
           "y": 326
         },
         {
-          "x": 413,
+          "x": 393,
           "y": 374.4
         },
         {
-          "x": 413,
+          "x": 393,
           "y": 411.2
         },
         {
-          "x": 413,
+          "x": 393,
           "y": 448.25
         },
         {
-          "x": 413,
+          "x": 393,
           "y": 485.3
         },
         {
-          "x": 517.6,
+          "x": 499.4,
           "y": 643.4
         },
         {
-          "x": 936,
+          "x": 925,
           "y": 725
         }
       ],
diff --git a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg
index fb5b5b84c..5631cb34a 100644
--- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="1342" height="1939" viewBox="-102 -102 1342 1939"><style type="text/css">
+width="1331" height="1939" viewBox="-102 -102 1331 1939"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -796,16 +796,16 @@ width="1342" height="1939" viewBox="-102 -102 1342 1939"><style type="text/css">
 .md .contains-task-list:dir(rtl) .task-list-item-checkbox {
   margin: 0 -1.6em 0.25em 0.2em;
 }
-</style><g id="aa"><g class="shape" ><rect x="0" y="0" width="1138" height="1735" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="569.000000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">aa</text></g><g id="aa.bb"><g class="shape" ><rect x="40" y="50" width="799" height="1635" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="439.500000" y="79.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">bb</text></g><g id="aa.ll"><g class="shape" ><rect x="936" y="673" width="114" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="993.000000" y="739.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ll</text></g><g id="aa.mm"><g class="shape" ><path d="M 923 471 C 923 447 981.95 447 988.5 447 C 995.05 447 1054 447 1054 471 V 549 C 1054 573 995.05 573 988.5 573 C 981.95 573 923 573 923 549 V 471 Z" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/><path d="M 923 471 C 923 495 981.95 495 988.5 495 C 995.05 495 1054 495 1054 471" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="988.500000" y="525.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">mm</text></g><g id="aa.nn"><g class="shape" ></g><text class="text" x="897.000000" y="1528.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">nn</text></g><g id="aa.oo"><g class="shape" ><rect x="965" y="1459" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1026.500000" y="1525.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">oo</text></g><g id="aa.bb.cc"><g class="shape" ><rect x="80" y="920" width="533" height="715" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="346.500000" y="945.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">cc</text></g><g id="aa.bb.ii"><g class="shape" ><path d="M 106 100 L 256 100 L 256 145.2 L 526 145.2 L 526 326 L 106 326 Z" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text" x="316.000000" y="125.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">ii</text></g><g id="aa.bb.kk"><g class="shape" ><ellipse class="shape" cx="726.000000" cy="1522.000000" rx="63.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="726.000000" y="1525.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">kk</text></g><g id="aa.bb.cc.dd"><g class="shape" ><rect x="120" y="970" width="377" height="226" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="308.500000" y="991.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">dd</text></g><g id="aa.bb.cc.gg"><g class="shape" ></g><text class="text" x="444.500000" y="1333.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">gg</text></g><g id="aa.bb.cc.hh"><g class="shape" ><rect x="383" y="1459" width="123" height="126" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="444.500000" y="1525.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">hh</text></g><g id="aa.bb.ii.jj"><g class="shape" ><path d="M 326.5 276 C 326.0519 276 325.7532 275.8362 325.4545 275.5085 L 269.4481 214.2289 C 268.8507 213.5735 268.8507 212.5904 269.4481 211.935 L 325.4545 150.4915 C 326.0519 149.8361 326.948 149.8361 327.5454 150.4915 L 383.5519 211.9349 C 384.1493 212.5903 384.1493 213.5734 383.5519 214.2288 L 327.5455 275.5085 C 327.2468 275.8362 326.9481 276 326.5 276 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="326.500000" y="216.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">jj</text></g><g id="aa.bb.cc.dd.ee"><g class="shape" ></g><text class="text" x="254.000000" y="1089.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ee</text></g><g id="aa.bb.cc.dd.ff"><g class="shape" ><rect x="331" y="1020" width="117" height="126" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="389.500000" y="1086.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ff</text></g><g id="aa.bb.cc.(dd.ee -- gg)[0]"><path d="M 253.500000 1096.500000 C 253.500000 1175.700000 290.100000 1270.100000 434.625245 1323.803370" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" mask="url(#3525624279)"/><text class="text-italic" x="285.500000" y="1263.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">11</text></g><g id="aa.bb.cc.(gg -- hh)[0]"><path d="M 444.500000 1340.000000 C 444.500000 1386.400000 444.500000 1410.700000 444.500000 1457.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" mask="url(#3525624279)"/><text class="text-italic" x="444.500000" y="1404.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">22</text></g><g id="aa.bb.(ii -&gt; cc.dd)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 200.000000 328.000000 C 200.000000 374.400000 200.000000 411.200000 200.000000 448.250000 C 200.000000 485.300000 200.000000 532.600000 200.000000 566.500000 C 200.000000 600.400000 200.000000 645.600000 200.000000 679.500000 C 200.000000 713.400000 200.000000 760.700000 200.000000 797.750000 C 200.000000 834.800000 200.000000 930.000000 200.000000 966.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3525624279)"/></g><g id="aa.(ll &lt;-&gt; bb)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><path d="M 932.053330 745.999603 C 858.400000 758.148606 916.600000 748.548606 842.946670 760.697608" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3525624279)"/><text class="text-italic" x="887.500000" y="759.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">33</text></g><g id="aa.(mm -&gt; bb.cc)[0]"><path d="M 921.026867 521.326720 C 430.200000 602.600000 307.000000 645.600000 307.000000 679.500000 C 307.000000 713.400000 307.000000 871.700000 307.000000 916.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3525624279)"/><text class="text-italic" x="477.000000" y="600.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">44</text></g><g id="aa.(mm -&gt; ll)[0]"><path d="M 991.079936 574.998402 C 992.600000 613.000000 993.000000 633.000000 993.000000 669.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3525624279)"/></g><g id="aa.(mm &lt;-&gt; bb)[0]"><path d="M 919.062819 522.706121 C 856.000000 534.016240 906.250000 525.004060 843.187181 536.314179" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3525624279)"/><text class="text-italic" x="881.000000" y="535.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">55</text></g><g id="aa.(ll &lt;-&gt; bb.cc.gg)[0]"><path d="M 932.139384 752.501177 C 617.200000 837.890889 537.500000 871.600000 537.500000 889.750000 C 537.500000 907.900000 537.500000 930.000000 537.500000 945.000000 C 537.500000 960.000000 537.500000 992.600000 537.500000 1026.500000 C 537.500000 1060.400000 537.500000 1105.600000 537.500000 1139.500000 C 537.500000 1173.400000 520.500000 1269.500000 455.677431 1319.070200" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3525624279)"/></g><g id="aa.(mm &lt;- bb.ii)[0]"><path d="M 919.102505 494.100259 C 547.000000 408.200000 453.000000 374.400000 453.000000 328.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" mask="url(#3525624279)"/><text class="text-italic" x="663.000000" y="440.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">66</text></g><g id="aa.(bb.cc &lt;- ll)[0]"><path d="M 413.000000 916.000000 C 413.000000 871.600000 517.600000 837.300000 934.043578 748.915225" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" mask="url(#3525624279)"/><text class="text-italic" x="649.000000" y="815.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">77</text></g><g id="aa.(bb.ii &lt;-&gt; ll)[0]"><path d="M 413.000000 330.000000 C 413.000000 374.400000 413.000000 411.200000 413.000000 448.250000 C 413.000000 485.300000 517.600000 643.400000 932.073969 724.234311" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3525624279)"/><text class="text-italic" x="556.000000" y="656.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">88</text></g><mask id="3525624279" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1342" height="1939">
-<rect x="-100" y="-100" width="1342" height="1939" fill="white"></rect>
-<rect x="278.000000" y="1247.000000" width="15" height="21" fill="black"></rect>
-<rect x="436.000000" y="1388.000000" width="17" height="21" fill="black"></rect>
-<rect x="879.000000" y="743.000000" width="17" height="21" fill="black"></rect>
-<rect x="469.000000" y="584.000000" width="16" height="21" fill="black"></rect>
-<rect x="873.000000" y="519.000000" width="16" height="21" fill="black"></rect>
-<rect x="655.000000" y="424.000000" width="16" height="21" fill="black"></rect>
-<rect x="641.000000" y="799.000000" width="16" height="21" fill="black"></rect>
-<rect x="548.000000" y="640.000000" width="16" height="21" fill="black"></rect>
+</style><g id="aa"><g class="shape" ><rect x="0" y="0" width="1127" height="1735" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="563.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">aa</text></g><g id="aa.bb"><g class="shape" ><rect x="40" y="50" width="788" height="1635" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="434.000000" y="79.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">bb</text></g><g id="aa.ll"><g class="shape" ><rect x="925" y="673" width="114" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="982.000000" y="739.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ll</text></g><g id="aa.mm"><g class="shape" ><path d="M 912 471 C 912 447 970.95 447 977.5 447 C 984.05 447 1043 447 1043 471 V 549 C 1043 573 984.05 573 977.5 573 C 970.95 573 912 573 912 549 V 471 Z" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/><path d="M 912 471 C 912 495 970.95 495 977.5 495 C 984.05 495 1043 495 1043 471" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="977.500000" y="525.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">mm</text></g><g id="aa.nn"><g class="shape" ></g><text class="text" x="886.000000" y="1528.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">nn</text></g><g id="aa.oo"><g class="shape" ><rect x="954" y="1459" width="123" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="1015.500000" y="1525.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">oo</text></g><g id="aa.bb.cc"><g class="shape" ><rect x="80" y="920" width="522" height="715" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="341.000000" y="945.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">cc</text></g><g id="aa.bb.ii"><g class="shape" ><path d="M 106 100 L 256 100 L 256 145.2 L 514 145.2 L 514 326 L 106 326 Z" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text" x="310.000000" y="125.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">ii</text></g><g id="aa.bb.kk"><g class="shape" ><ellipse class="shape" cx="715.000000" cy="1522.000000" rx="63.000000" ry="63.000000" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="715.000000" y="1525.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">kk</text></g><g id="aa.bb.cc.dd"><g class="shape" ><rect x="120" y="970" width="366" height="226" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="303.000000" y="991.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">dd</text></g><g id="aa.bb.cc.gg"><g class="shape" ></g><text class="text" x="434.500000" y="1333.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">gg</text></g><g id="aa.bb.cc.hh"><g class="shape" ><rect x="373" y="1459" width="123" height="126" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="434.500000" y="1525.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">hh</text></g><g id="aa.bb.ii.jj"><g class="shape" ><path d="M 320.5 276 C 320.0519 276 319.7532 275.8362 319.4545 275.5085 L 263.4481 214.2289 C 262.8507 213.5735 262.8507 212.5904 263.4481 211.935 L 319.4545 150.4915 C 320.0519 149.8361 320.948 149.8361 321.5454 150.4915 L 377.5519 211.9349 C 378.1493 212.5903 378.1493 213.5734 377.5519 214.2288 L 321.5455 275.5085 C 321.2468 275.8362 320.9481 276 320.5 276 Z" style="fill:#CFD2DD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;"/></g><text class="text-bold" x="320.500000" y="216.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">jj</text></g><g id="aa.bb.cc.dd.ee"><g class="shape" ></g><text class="text" x="249.000000" y="1089.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ee</text></g><g id="aa.bb.cc.dd.ff"><g class="shape" ><rect x="320" y="1020" width="117" height="126" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="378.500000" y="1086.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">ff</text></g><g id="aa.bb.cc.(dd.ee -- gg)[0]"><path d="M 248.500000 1096.500000 C 248.500000 1175.700000 284.100000 1270.100000 424.631690 1323.786264" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" mask="url(#3194477605)"/><text class="text-italic" x="278.500000" y="1262.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">11</text></g><g id="aa.bb.cc.(gg -- hh)[0]"><path d="M 434.500000 1340.000000 C 434.500000 1386.400000 434.500000 1410.700000 434.500000 1457.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" mask="url(#3194477605)"/><text class="text-italic" x="434.500000" y="1404.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">22</text></g><g id="aa.bb.(ii -&gt; cc.dd)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 200.000000 328.000000 C 200.000000 374.400000 200.000000 411.200000 200.000000 448.250000 C 200.000000 485.300000 200.000000 532.600000 200.000000 566.500000 C 200.000000 600.400000 200.000000 645.600000 200.000000 679.500000 C 200.000000 713.400000 200.000000 760.700000 200.000000 797.750000 C 200.000000 834.800000 200.000000 930.000000 200.000000 966.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3194477605)"/></g><g id="aa.(ll &lt;-&gt; bb)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><path d="M 921.053330 746.248134 C 847.400000 758.397137 905.600000 748.797137 831.946670 760.946140" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3194477605)"/><text class="text-italic" x="876.500000" y="759.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">33</text></g><g id="aa.(mm -&gt; bb.cc)[0]"><path d="M 910.026953 521.327237 C 420.000000 602.600000 297.000000 645.600000 297.000000 679.500000 C 297.000000 713.400000 297.000000 871.700000 297.000000 916.500000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3194477605)"/><text class="text-italic" x="466.000000" y="600.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">44</text></g><g id="aa.(mm -&gt; ll)[0]"><path d="M 980.079936 574.998402 C 981.600000 613.000000 982.000000 633.000000 982.000000 669.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3194477605)"/></g><g id="aa.(mm &lt;-&gt; bb)[0]"><path d="M 908.061412 522.698230 C 845.000000 533.877711 895.250000 524.969428 832.188588 536.148909" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3194477605)"/><text class="text-italic" x="870.000000" y="535.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">55</text></g><g id="aa.(ll &lt;-&gt; bb.cc.gg)[0]"><path d="M 921.139384 752.501177 C 606.200000 837.890889 526.500000 871.600000 526.500000 889.750000 C 526.500000 907.900000 526.500000 930.000000 526.500000 945.000000 C 526.500000 960.000000 526.500000 992.600000 526.500000 1026.500000 C 526.500000 1060.400000 526.500000 1105.600000 526.500000 1139.500000 C 526.500000 1173.400000 509.700000 1269.300000 445.681727 1318.075827" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3194477605)"/></g><g id="aa.(mm &lt;- bb.ii)[0]"><path d="M 908.102087 494.102073 C 535.200000 408.200000 441.000000 374.400000 441.000000 328.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" mask="url(#3194477605)"/><text class="text-italic" x="651.000000" y="440.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">66</text></g><g id="aa.(bb.cc &lt;- ll)[0]"><path d="M 401.000000 916.000000 C 401.000000 871.600000 505.800000 837.300000 923.043417 748.914467" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" mask="url(#3194477605)"/><text class="text-italic" x="638.000000" y="815.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">77</text></g><g id="aa.(bb.ii &lt;-&gt; ll)[0]"><path d="M 393.000000 330.000000 C 393.000000 374.400000 393.000000 411.200000 393.000000 448.250000 C 393.000000 485.300000 499.400000 643.400000 921.071553 724.246802" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3194477605)"/><text class="text-italic" x="540.000000" y="657.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">88</text></g><mask id="3194477605" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1331" height="1939">
+<rect x="-100" y="-100" width="1331" height="1939" fill="white"></rect>
+<rect x="271.000000" y="1246.000000" width="15" height="21" fill="black"></rect>
+<rect x="426.000000" y="1388.000000" width="17" height="21" fill="black"></rect>
+<rect x="868.000000" y="743.000000" width="17" height="21" fill="black"></rect>
+<rect x="458.000000" y="584.000000" width="16" height="21" fill="black"></rect>
+<rect x="862.000000" y="519.000000" width="16" height="21" fill="black"></rect>
+<rect x="643.000000" y="424.000000" width="16" height="21" fill="black"></rect>
+<rect x="630.000000" y="799.000000" width="16" height="21" fill="black"></rect>
+<rect x="532.000000" y="641.000000" width="16" height="21" fill="black"></rect>
 </mask><style type="text/css"><![CDATA[
 .text {
 	font-family: "font-regular";
diff --git a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json
index 39018fcb3..d64f023cc 100644
--- a/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json
+++ b/e2etests/testdata/stable/child_parent_edges/dagre/board.exp.json
@@ -9,7 +9,7 @@
         "x": 0,
         "y": 0
       },
-      "width": 524,
+      "width": 494,
       "height": 426,
       "opacity": 1,
       "strokeDash": 0,
@@ -49,7 +49,7 @@
         "x": 40,
         "y": 50
       },
-      "width": 444,
+      "width": 414,
       "height": 326,
       "opacity": 1,
       "strokeDash": 0,
@@ -89,7 +89,7 @@
         "x": 80,
         "y": 100
       },
-      "width": 364,
+      "width": 334,
       "height": 226,
       "opacity": 1,
       "strokeDash": 0,
@@ -191,55 +191,55 @@
       "route": [
         {
           "x": 244,
-          "y": 174.66192170818505
+          "y": 173.24723247232473
         },
         {
-          "x": 273.33333333333337,
-          "y": 154.932384341637
+          "x": 270.66666666666663,
+          "y": 154.64944649446494
         },
         {
-          "x": 282.5,
+          "x": 279,
           "y": 150
         },
         {
-          "x": 285.25,
+          "x": 281.5,
           "y": 150
         },
         {
-          "x": 288,
+          "x": 284,
           "y": 150
         },
         {
-          "x": 291.66666666666663,
+          "x": 287.33333333333337,
           "y": 162.6
         },
         {
-          "x": 294.41666666666663,
+          "x": 289.83333333333337,
           "y": 181.5
         },
         {
-          "x": 297.1666666666667,
+          "x": 292.3333333333333,
           "y": 200.4
         },
         {
-          "x": 297.1666666666667,
+          "x": 292.3333333333333,
           "y": 225.6
         },
         {
-          "x": 294.41666666666663,
+          "x": 289.83333333333337,
           "y": 244.5
         },
         {
-          "x": 291.66666666666663,
+          "x": 287.33333333333337,
           "y": 263.4
         },
         {
-          "x": 273.33333333333337,
-          "y": 271.06761565836297
+          "x": 270.66666666666663,
+          "y": 271.35055350553506
         },
         {
           "x": 244,
-          "y": 251.33807829181495
+          "y": 252.75276752767527
         }
       ],
       "isCurve": true,
@@ -275,55 +275,55 @@
       "route": [
         {
           "x": 244,
-          "y": 184.7244094488189
+          "y": 182.30769230769232
         },
         {
-          "x": 300,
-          "y": 156.9448818897638
+          "x": 292,
+          "y": 156.46153846153845
         },
         {
-          "x": 317.5,
+          "x": 307,
           "y": 150
         },
         {
-          "x": 322.75,
+          "x": 311.5,
           "y": 150
         },
         {
-          "x": 328,
+          "x": 316,
           "y": 150
         },
         {
-          "x": 335,
+          "x": 322,
           "y": 162.6
         },
         {
-          "x": 340.25,
+          "x": 326.5,
           "y": 181.5
         },
         {
-          "x": 345.5,
+          "x": 331,
           "y": 200.4
         },
         {
-          "x": 345.5,
+          "x": 331,
           "y": 225.6
         },
         {
-          "x": 340.25,
+          "x": 326.5,
           "y": 244.5
         },
         {
-          "x": 335,
+          "x": 322,
           "y": 263.4
         },
         {
-          "x": 300,
-          "y": 269.0551181102362
+          "x": 292,
+          "y": 269.53846153846155
         },
         {
           "x": 244,
-          "y": 241.2755905511811
+          "y": 243.69230769230768
         }
       ],
       "isCurve": true,
@@ -358,20 +358,20 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 244.33333333333331,
-          "y": 235
+          "x": 243.66666666666669,
+          "y": 238
         },
         {
-          "x": 244.06666666666666,
-          "y": 235.3176715176715
+          "x": 243.93333333333334,
+          "y": 237.99628770301624
         },
         {
-          "x": 244.26666666666665,
-          "y": 235.0794178794179
+          "x": 243.73333333333335,
+          "y": 237.99907192575407
         },
         {
           "x": 244,
-          "y": 235.3970893970894
+          "y": 237.9953596287703
         }
       ],
       "isCurve": true,
diff --git a/e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg
index 254a179f4..c157addac 100644
--- a/e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="728" height="630" viewBox="-102 -102 728 630"><style type="text/css">
+width="698" height="630" viewBox="-102 -102 698 630"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,8 +39,8 @@ width="728" height="630" viewBox="-102 -102 728 630"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="a"><g class="shape" ><rect x="0" y="0" width="524" height="426" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="262.000000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">a</text></g><g id="a.b"><g class="shape" ><rect x="40" y="50" width="444" height="326" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="262.000000" y="79.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">b</text></g><g id="a.b.c"><g class="shape" ><rect x="80" y="100" width="364" height="226" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="262.000000" y="125.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">c</text></g><g id="a.b.c.d"><g class="shape" ><rect x="130" y="150" width="114" height="126" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="187.000000" y="216.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">d</text></g><g id="(a.b -&gt; a)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 245.659544 173.545716 C 273.333333 154.932384 282.500000 150.000000 285.250000 150.000000 C 288.000000 150.000000 291.666667 162.600000 294.416667 181.500000 C 297.166667 200.400000 297.166667 225.600000 294.416667 244.500000 C 291.666667 263.400000 273.333333 271.067616 247.319087 253.570489" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3367121272)"/></g><g id="a.(b -&gt; b.c)[0]"><path d="M 245.791667 183.835630 C 300.000000 156.944882 317.500000 150.000000 322.750000 150.000000 C 328.000000 150.000000 335.000000 162.600000 340.250000 181.500000 C 345.500000 200.400000 345.500000 225.600000 340.250000 244.500000 C 335.000000 263.400000 300.000000 269.055118 247.583334 243.053150" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3367121272)"/></g><g id="a.(b.c.d -&gt; b)[0]"><path d="M 243.047451 236.531831 C 244.066667 235.317672 244.266667 235.079418 246.571765 232.333427" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3367121272)"/></g><mask id="3367121272" maskUnits="userSpaceOnUse" x="-100" y="-100" width="728" height="630">
-<rect x="-100" y="-100" width="728" height="630" fill="white"></rect>
+]]></script><g id="a"><g class="shape" ><rect x="0" y="0" width="494" height="426" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="247.000000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">a</text></g><g id="a.b"><g class="shape" ><rect x="40" y="50" width="414" height="326" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="247.000000" y="79.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">b</text></g><g id="a.b.c"><g class="shape" ><rect x="80" y="100" width="334" height="226" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="247.000000" y="125.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">c</text></g><g id="a.b.c.d"><g class="shape" ><rect x="130" y="150" width="114" height="126" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="187.000000" y="216.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">d</text></g><g id="(a.b -&gt; a)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 245.640452 172.103153 C 270.666667 154.649446 279.000000 150.000000 281.500000 150.000000 C 284.000000 150.000000 287.333333 162.600000 289.833333 181.500000 C 292.333333 200.400000 292.333333 225.600000 289.833333 244.500000 C 287.333333 263.400000 270.666667 271.350554 247.280904 255.040926" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3168013246)"/></g><g id="a.(b -&gt; b.c)[0]"><path d="M 245.760942 181.359493 C 292.000000 156.461538 307.000000 150.000000 311.500000 150.000000 C 316.000000 150.000000 322.000000 162.600000 326.500000 181.500000 C 331.000000 200.400000 331.000000 225.600000 326.500000 244.500000 C 322.000000 263.400000 292.000000 269.538462 247.521884 245.588707" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3168013246)"/></g><g id="a.(b.c.d -&gt; b)[0]"><path d="M 245.666473 237.972160 C 243.933333 237.996288 243.733333 237.999072 240.000388 238.051039" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3168013246)"/></g><mask id="3168013246" maskUnits="userSpaceOnUse" x="-100" y="-100" width="698" height="630">
+<rect x="-100" y="-100" width="698" height="630" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
 .text {
diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
index 7d9f83b4d..7e56e30a8 100644
--- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
+++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json
@@ -60,7 +60,7 @@
         "x": 0,
         "y": 254
       },
-      "width": 1113,
+      "width": 1112,
       "height": 1004,
       "opacity": 1,
       "strokeDash": 0,
diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg
index 4c635981e..ee92d064a 100644
--- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="1317" height="1462" viewBox="-102 -102 1317 1462"><style type="text/css">
+width="1316" height="1462" viewBox="-102 -102 1316 1462"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,8 +39,8 @@ width="1317" height="1462" viewBox="-102 -102 1317 1462"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="root"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="492" y="0" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="556.000000" y="149.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">root</text></g><g id="container"><g class="shape" ><rect x="0" y="254" width="1113" height="1004" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="556.500000" y="287.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">container</text></g><g id="container.root"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="492" y="304" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="556.000000" y="453.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">root</text></g><g id="container.left"><g class="shape" ><rect x="40" y="579" width="496" height="629" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="288.000000" y="608.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">left</text></g><g id="container.right"><g class="shape" ><rect x="576" y="579" width="496" height="629" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="824.000000" y="608.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">right</text></g><g id="container.left.root"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="224" y="629" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="288.000000" y="778.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">root</text></g><g id="container.left.inner"><g class="shape" ><rect x="80" y="904" width="416" height="254" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="288.000000" y="929.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">inner</text></g><g id="container.right.root"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="760" y="629" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="824.000000" y="778.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">root</text></g><g id="container.right.inner"><g class="shape" ><rect x="616" y="904" width="416" height="254" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="824.000000" y="929.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">inner</text></g><g id="container.left.inner.left"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="130" y="954" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="194.000000" y="1103.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">left</text></g><g id="container.left.inner.right"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="318" y="954" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="382.000000" y="1103.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">right</text></g><g id="container.right.inner.left"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="666" y="954" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="730.000000" y="1103.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">left</text></g><g id="container.right.inner.right"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="854" y="954" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="918.000000" y="1103.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">right</text></g><g id="(root -&gt; container.root)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 556.000000 156.000000 C 556.000000 194.000000 556.000000 264.000000 556.000000 300.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3226237976)"/></g><g id="container.left.(root -&gt; inner.left)[0]"><path d="M 234.231278 784.651056 C 202.272000 831.400000 194.000000 914.000000 194.000000 950.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3226237976)"/><text class="text-italic" x="199.000000" y="869.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to inner left</text></g><g id="container.left.(root -&gt; inner.right)[0]"><path d="M 341.768722 784.651056 C 373.728000 831.400000 382.000000 914.000000 382.000000 950.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3226237976)"/><text class="text-italic" x="377.000000" y="869.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to inner right</text></g><g id="container.right.(root -&gt; inner.left)[0]"><path d="M 770.231278 784.651056 C 738.272000 831.400000 730.000000 914.000000 730.000000 950.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3226237976)"/><text class="text-italic" x="735.000000" y="869.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to inner left</text></g><g id="container.right.(root -&gt; inner.right)[0]"><path d="M 877.768722 784.651056 C 909.728000 831.400000 918.000000 914.000000 918.000000 950.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3226237976)"/><text class="text-italic" x="913.000000" y="869.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to inner right</text></g><g id="container.(root -&gt; left.root)[0]"><path d="M 490.220538 414.748791 C 328.800000 497.567164 288.000000 589.000000 288.000000 625.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3226237976)"/><text class="text-italic" x="348.000000" y="493.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to left container root</text></g><g id="container.(root -&gt; right.root)[0]"><path d="M 621.779462 414.748791 C 783.200000 497.567164 824.000000 589.000000 824.000000 625.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3226237976)"/><text class="text-italic" x="764.000000" y="493.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to right container root</text></g><mask id="3226237976" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1317" height="1462">
-<rect x="-100" y="-100" width="1317" height="1462" fill="white"></rect>
+]]></script><g id="root"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="492" y="0" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="556.000000" y="149.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">root</text></g><g id="container"><g class="shape" ><rect x="0" y="254" width="1112" height="1004" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="556.000000" y="287.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">container</text></g><g id="container.root"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="492" y="304" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="556.000000" y="453.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">root</text></g><g id="container.left"><g class="shape" ><rect x="40" y="579" width="496" height="629" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="288.000000" y="608.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">left</text></g><g id="container.right"><g class="shape" ><rect x="576" y="579" width="496" height="629" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="824.000000" y="608.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">right</text></g><g id="container.left.root"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="224" y="629" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="288.000000" y="778.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">root</text></g><g id="container.left.inner"><g class="shape" ><rect x="80" y="904" width="416" height="254" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="288.000000" y="929.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">inner</text></g><g id="container.right.root"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="760" y="629" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="824.000000" y="778.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">root</text></g><g id="container.right.inner"><g class="shape" ><rect x="616" y="904" width="416" height="254" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="824.000000" y="929.000000" style="text-anchor:middle;font-size:20px;fill:#0A0F25">inner</text></g><g id="container.left.inner.left"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="130" y="954" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="194.000000" y="1103.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">left</text></g><g id="container.left.inner.right"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="318" y="954" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="382.000000" y="1103.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">right</text></g><g id="container.right.inner.left"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="666" y="954" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="730.000000" y="1103.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">left</text></g><g id="container.right.inner.right"><g class="shape" ><image href="https://icons.terrastruct.com/essentials/004-picture.svg" x="854" y="954" width="128" height="128" style="fill:#FFFFFF;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="918.000000" y="1103.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">right</text></g><g id="(root -&gt; container.root)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 556.000000 156.000000 C 556.000000 194.000000 556.000000 264.000000 556.000000 300.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2508837199)"/></g><g id="container.left.(root -&gt; inner.left)[0]"><path d="M 234.231278 784.651056 C 202.272000 831.400000 194.000000 914.000000 194.000000 950.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2508837199)"/><text class="text-italic" x="199.000000" y="869.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to inner left</text></g><g id="container.left.(root -&gt; inner.right)[0]"><path d="M 341.768722 784.651056 C 373.728000 831.400000 382.000000 914.000000 382.000000 950.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2508837199)"/><text class="text-italic" x="377.000000" y="869.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to inner right</text></g><g id="container.right.(root -&gt; inner.left)[0]"><path d="M 770.231278 784.651056 C 738.272000 831.400000 730.000000 914.000000 730.000000 950.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2508837199)"/><text class="text-italic" x="735.000000" y="869.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to inner left</text></g><g id="container.right.(root -&gt; inner.right)[0]"><path d="M 877.768722 784.651056 C 909.728000 831.400000 918.000000 914.000000 918.000000 950.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2508837199)"/><text class="text-italic" x="913.000000" y="869.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to inner right</text></g><g id="container.(root -&gt; left.root)[0]"><path d="M 490.220538 414.748791 C 328.800000 497.567164 288.000000 589.000000 288.000000 625.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2508837199)"/><text class="text-italic" x="348.000000" y="493.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to left container root</text></g><g id="container.(root -&gt; right.root)[0]"><path d="M 621.779462 414.748791 C 783.200000 497.567164 824.000000 589.000000 824.000000 625.000000" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2508837199)"/><text class="text-italic" x="764.000000" y="493.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">to right container root</text></g><mask id="2508837199" maskUnits="userSpaceOnUse" x="-100" y="-100" width="1316" height="1462">
+<rect x="-100" y="-100" width="1316" height="1462" fill="white"></rect>
 <rect x="161.000000" y="853.000000" width="76" height="21" fill="black"></rect>
 <rect x="334.000000" y="853.000000" width="86" height="21" fill="black"></rect>
 <rect x="697.000000" y="853.000000" width="76" height="21" fill="black"></rect>
diff --git a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
index f62921733..2b7fb17aa 100644
--- a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
+++ b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json
@@ -46,7 +46,7 @@
       "id": "y",
       "type": "",
       "pos": {
-        "x": 136,
+        "x": 126,
         "y": 226
       },
       "width": 114,
@@ -86,7 +86,7 @@
       "id": "z",
       "type": "",
       "pos": {
-        "x": 273,
+        "x": 253,
         "y": 0
       },
       "width": 112,
@@ -151,55 +151,55 @@
       "route": [
         {
           "x": 113,
-          "y": 24.794275491949918
+          "y": 23.37662337662337
         },
         {
-          "x": 142.33333333333334,
-          "y": 4.958855098389982
+          "x": 139.66666666666666,
+          "y": 4.675324675324674
         },
         {
-          "x": 151.5,
+          "x": 148,
           "y": 0
         },
         {
-          "x": 154.25,
+          "x": 150.5,
           "y": 0
         },
         {
-          "x": 157,
+          "x": 153,
           "y": 0
         },
         {
-          "x": 160.66666666666666,
+          "x": 156.33333333333334,
           "y": 12.600000000000001
         },
         {
-          "x": 163.41666666666666,
+          "x": 158.83333333333334,
           "y": 31.5
         },
         {
-          "x": 166.16666666666666,
+          "x": 161.33333333333334,
           "y": 50.400000000000006
         },
         {
-          "x": 166.16666666666666,
+          "x": 161.33333333333334,
           "y": 75.6
         },
         {
-          "x": 163.41666666666666,
+          "x": 158.83333333333334,
           "y": 94.5
         },
         {
-          "x": 160.66666666666666,
+          "x": 156.33333333333334,
           "y": 113.4
         },
         {
-          "x": 142.33333333333334,
-          "y": 121.04114490161001
+          "x": 139.66666666666666,
+          "y": 121.32467532467533
         },
         {
           "x": 113,
-          "y": 101.20572450805008
+          "y": 102.62337662337663
         }
       ],
       "isCurve": true,
@@ -235,55 +235,55 @@
       "route": [
         {
           "x": 113,
-          "y": 34.86166007905138
+          "y": 32.44635193133047
         },
         {
-          "x": 169,
-          "y": 6.972332015810274
+          "x": 161,
+          "y": 6.489270386266092
         },
         {
-          "x": 186.5,
+          "x": 176,
           "y": 0
         },
         {
-          "x": 191.75,
+          "x": 180.5,
           "y": 0
         },
         {
-          "x": 197,
+          "x": 185,
           "y": 0
         },
         {
-          "x": 204,
+          "x": 191,
           "y": 12.600000000000001
         },
         {
-          "x": 209.25,
+          "x": 195.5,
           "y": 31.5
         },
         {
-          "x": 214.5,
+          "x": 200,
           "y": 50.400000000000006
         },
         {
-          "x": 214.5,
+          "x": 200,
           "y": 75.6
         },
         {
-          "x": 209.25,
+          "x": 195.5,
           "y": 94.5
         },
         {
-          "x": 204,
+          "x": 191,
           "y": 113.4
         },
         {
-          "x": 169,
-          "y": 119.02766798418972
+          "x": 161,
+          "y": 119.5107296137339
         },
         {
           "x": 113,
-          "y": 91.13833992094862
+          "y": 93.55364806866953
         }
       ],
       "isCurve": true,
@@ -326,12 +326,12 @@
           "y": 166
         },
         {
-          "x": 72.35,
-          "y": 189.14532110091744
+          "x": 70.35,
+          "y": 188.39643564356436
         },
         {
-          "x": 135.75,
-          "y": 241.72660550458716
+          "x": 125.75,
+          "y": 237.9821782178218
         }
       ],
       "isCurve": true,
@@ -366,20 +366,20 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 329,
+          "x": 309,
           "y": 126
         },
         {
-          "x": 329,
+          "x": 309,
           "y": 166
         },
         {
-          "x": 313.2,
-          "y": 189.2
+          "x": 295.2,
+          "y": 188.4
         },
         {
-          "x": 250,
-          "y": 242
+          "x": 240,
+          "y": 238
         }
       ],
       "isCurve": true,
@@ -414,56 +414,56 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 385,
-          "y": 28.96784565916399
+          "x": 365,
+          "y": 27.837209302325576
         },
         {
-          "x": 423.1333333333333,
-          "y": 5.793569131832797
+          "x": 400.46666666666664,
+          "y": 5.567441860465113
         },
         {
-          "x": 435.05,
+          "x": 411.55,
           "y": 0
         },
         {
-          "x": 438.625,
+          "x": 414.875,
           "y": 0
         },
         {
-          "x": 442.2,
+          "x": 418.2,
           "y": 0
         },
         {
-          "x": 446.96666666666664,
+          "x": 422.6333333333333,
           "y": 12.600000000000001
         },
         {
-          "x": 450.54166666666663,
+          "x": 425.95833333333337,
           "y": 31.5
         },
         {
-          "x": 454.1166666666667,
+          "x": 429.28333333333336,
           "y": 50.400000000000006
         },
         {
-          "x": 454.1166666666667,
+          "x": 429.28333333333336,
           "y": 75.6
         },
         {
-          "x": 450.54166666666663,
+          "x": 425.95833333333337,
           "y": 94.5
         },
         {
-          "x": 446.96666666666664,
+          "x": 422.6333333333333,
           "y": 113.4
         },
         {
-          "x": 423.1333333333333,
-          "y": 120.2064308681672
+          "x": 400.46666666666664,
+          "y": 120.43255813953489
         },
         {
-          "x": 385,
-          "y": 97.032154340836
+          "x": 365,
+          "y": 98.16279069767442
         }
       ],
       "isCurve": true,
diff --git a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg
index 1608421ad..cb9bb4386 100644
--- a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="672" height="556" viewBox="-102 -102 672 556"><style type="text/css">
+width="647" height="556" viewBox="-102 -102 647 556"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,9 +39,9 @@ width="672" height="556" viewBox="-102 -102 672 556"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="x"><g class="shape" ><rect x="0" y="0" width="113" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="56.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text></g><g id="y"><g class="shape" ><rect x="136" y="226" width="114" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="193.000000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text></g><g id="z"><g class="shape" ><rect x="273" y="0" width="112" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="329.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">z</text></g><g id="(x -&gt; x)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 114.656769 23.673956 C 142.333333 4.958855 151.500000 0.000000 154.250000 0.000000 C 157.000000 0.000000 160.666667 12.600000 163.416667 31.500000 C 166.166667 50.400000 166.166667 75.600000 163.416667 94.500000 C 160.666667 113.400000 142.333333 121.041145 116.313538 103.446364" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#229611323)"/></g><g id="(x -&gt; x)[1]"><path d="M 114.790267 33.970064 C 169.000000 6.972332 186.500000 0.000000 191.750000 0.000000 C 197.000000 0.000000 204.000000 12.600000 209.250000 31.500000 C 214.500000 50.400000 214.500000 75.600000 209.250000 94.500000 C 204.000000 113.400000 169.000000 119.027668 116.580535 92.921531" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#229611323)"/></g><g id="(x -&gt; y)[0]"><path d="M 56.500000 128.000000 C 56.500000 166.000000 72.350000 189.145321 132.671104 239.173099" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#229611323)"/></g><g id="(z -&gt; y)[0]"><path d="M 329.000000 128.000000 C 329.000000 166.000000 313.200000 189.200000 253.069698 239.435442" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#229611323)"/></g><g id="(z -&gt; z)[0]"><path d="M 386.709140 27.929172 C 423.133333 5.793569 435.050000 0.000000 438.625000 0.000000 C 442.200000 0.000000 446.966667 12.600000 450.541667 31.500000 C 454.116667 50.400000 454.116667 75.600000 450.541667 94.500000 C 446.966667 113.400000 423.133333 120.206431 388.418279 99.109501" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#229611323)"/><text class="text-italic" x="454.500000" y="64.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">hello</text></g><mask id="229611323" maskUnits="userSpaceOnUse" x="-100" y="-100" width="672" height="556">
-<rect x="-100" y="-100" width="672" height="556" fill="white"></rect>
-<rect x="438.000000" y="48.000000" width="33" height="21" fill="black"></rect>
+]]></script><g id="x"><g class="shape" ><rect x="0" y="0" width="113" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="56.500000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text></g><g id="y"><g class="shape" ><rect x="126" y="226" width="114" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="183.000000" y="292.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text></g><g id="z"><g class="shape" ><rect x="253" y="0" width="112" height="126" style="fill:#F7F8FE;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="309.000000" y="66.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">z</text></g><g id="(x -&gt; x)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 114.637464 22.228272 C 139.666667 4.675325 148.000000 0.000000 150.500000 0.000000 C 153.000000 0.000000 156.333333 12.600000 158.833333 31.500000 C 161.333333 50.400000 161.333333 75.600000 158.833333 94.500000 C 156.333333 113.400000 139.666667 121.324675 116.274928 104.920080" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2860337933)"/></g><g id="(x -&gt; x)[1]"><path d="M 114.759242 31.495002 C 161.000000 6.489270 176.000000 0.000000 180.500000 0.000000 C 185.000000 0.000000 191.000000 12.600000 195.500000 31.500000 C 200.000000 50.400000 200.000000 75.600000 195.500000 94.500000 C 191.000000 113.400000 161.000000 119.510730 116.518485 95.456348" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2860337933)"/></g><g id="(x -&gt; y)[0]"><path d="M 56.500000 128.000000 C 56.500000 166.000000 70.350000 188.396436 122.769498 235.314481" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2860337933)"/></g><g id="(z -&gt; y)[0]"><path d="M 309.000000 128.000000 C 309.000000 166.000000 295.200000 188.400000 242.975320 235.326524" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2860337933)"/></g><g id="(z -&gt; z)[0]"><path d="M 366.693780 26.773673 C 400.466667 5.567442 411.550000 0.000000 414.875000 0.000000 C 418.200000 0.000000 422.633333 12.600000 425.958333 31.500000 C 429.283333 50.400000 429.283333 75.600000 425.958333 94.500000 C 422.633333 113.400000 400.466667 120.432558 368.387560 100.289863" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2860337933)"/><text class="text-italic" x="429.500000" y="64.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">hello</text></g><mask id="2860337933" maskUnits="userSpaceOnUse" x="-100" y="-100" width="647" height="556">
+<rect x="-100" y="-100" width="647" height="556" fill="white"></rect>
+<rect x="413.000000" y="48.000000" width="33" height="21" fill="black"></rect>
 </mask><style type="text/css"><![CDATA[
 .text-bold {
 	font-family: "font-bold";
diff --git a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json
index 3cd73f29e..136c4db98 100644
--- a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json
+++ b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json
@@ -9,7 +9,7 @@
         "x": 0,
         "y": 0
       },
-      "width": 269,
+      "width": 255,
       "height": 473,
       "opacity": 1,
       "strokeDash": 0,
@@ -150,19 +150,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 105.1821862348178,
+          "x": 108.88056680161944,
           "y": 176
         },
         {
-          "x": 88.03643724696356,
+          "x": 94.57611336032389,
           "y": 224.4
         },
         {
-          "x": 87.95,
+          "x": 94.6,
           "y": 248.7
         },
         {
-          "x": 104.75,
+          "x": 109,
           "y": 297.5
         }
       ],
@@ -198,19 +198,19 @@
       "labelPercentage": 0,
       "route": [
         {
-          "x": 147.6497975708502,
+          "x": 146.24696356275302,
           "y": 176
         },
         {
-          "x": 163.12995951417005,
+          "x": 160.6493927125506,
           "y": 224.4
         },
         {
-          "x": 163.2,
+          "x": 160.65,
           "y": 248.7
         },
         {
-          "x": 148,
+          "x": 146.25,
           "y": 297.5
         }
       ],
diff --git a/e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg
index 31520fa40..610ad9b05 100644
--- a/e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg
+++ b/e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg
@@ -3,7 +3,7 @@
 id="d2-svg"
 style="background: white;"
 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-width="473" height="677" viewBox="-102 -102 473 677"><style type="text/css">
+width="459" height="677" viewBox="-102 -102 459 677"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -39,10 +39,10 @@ width="473" height="677" viewBox="-102 -102 473 677"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="container"><g class="shape" ><rect x="0" y="0" width="269" height="473" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="134.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">container</text></g><g id="container.first"><g class="shape" ><rect x="60" y="50" width="135" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="127.500000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">first</text></g><g id="container.second"><g class="shape" ><rect x="50" y="297" width="155" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="127.500000" y="363.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">second</text></g><g id="container.(first -&gt; second)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 104.514351 177.885204 C 88.036437 224.400000 87.950000 248.700000 103.447948 293.717850" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3006076853)"/><text class="text-italic" x="87.500000" y="242.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">1-&gt;2</text></g><g id="(container -&gt; container.second)[0]"><path d="M 148.259069 177.904938 C 163.129960 224.400000 163.200000 248.700000 149.189535 293.680968" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3006076853)"/><text class="text-italic" x="163.000000" y="242.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">c-&gt;2</text></g><mask id="3006076853" maskUnits="userSpaceOnUse" x="-100" y="-100" width="473" height="677">
-<rect x="-100" y="-100" width="473" height="677" fill="white"></rect>
-<rect x="73.000000" y="226.000000" width="29" height="21" fill="black"></rect>
-<rect x="149.000000" y="226.000000" width="28" height="21" fill="black"></rect>
+]]></script><g id="container"><g class="shape" ><rect x="0" y="0" width="255" height="473" style="fill:#E3E9FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text" x="127.500000" y="33.000000" style="text-anchor:middle;font-size:28px;fill:#0A0F25">container</text></g><g id="container.first"><g class="shape" ><rect x="60" y="50" width="135" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="127.500000" y="116.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">first</text></g><g id="container.second"><g class="shape" ><rect x="50" y="297" width="155" height="126" style="fill:#EDF0FD;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" /></g><text class="text-bold" x="127.500000" y="363.000000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">second</text></g><g id="container.(first -&gt; second)[0]"><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 108.313712 177.917987 C 94.576113 224.400000 94.600000 248.700000 107.867930 293.663541" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2995070490)"/><text class="text-italic" x="94.500000" y="242.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">1-&gt;2</text></g><g id="(container -&gt; container.second)[0]"><path d="M 146.817386 177.916929 C 160.649393 224.400000 160.650000 248.700000 147.382070 293.663541" class="connection" style="fill:none;stroke:#0D32B2;opacity:1.000000;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2995070490)"/><text class="text-italic" x="161.000000" y="242.000000" style="text-anchor:middle;font-size:16px;fill:#676C7E">c-&gt;2</text></g><mask id="2995070490" maskUnits="userSpaceOnUse" x="-100" y="-100" width="459" height="677">
+<rect x="-100" y="-100" width="459" height="677" fill="white"></rect>
+<rect x="80.000000" y="226.000000" width="29" height="21" fill="black"></rect>
+<rect x="147.000000" y="226.000000" width="28" height="21" fill="black"></rect>
 </mask><style type="text/css"><![CDATA[
 .text {
 	font-family: "font-regular";