diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
index c411b8871..e63b84c10 100644
--- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json
@@ -265,10 +265,10 @@
       "id": "code",
       "type": "code",
       "pos": {
-        "x": 113,
+        "x": 116,
         "y": 1224
       },
-      "width": 196,
+      "width": 191,
       "height": 512,
       "opacity": 1,
       "strokeDash": 0,
diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg
index fe2a48f45..6c4774283 100644
--- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg
@@ -61,9 +61,9 @@ width="626" height="2752" viewBox="-102 -102 626 2752"><style type="text/css">
 <text class="text" x="218.000000" y="1001.000000" style="text-anchor:start;font-size:20px;fill:#676C7E">string</text>
 <text class="text" x="295.000000" y="1001.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="107.000000" y1="1038.666667" x2="315.000000" y2="1038.666667" style="stroke-width:2;stroke:#0A0F25" /><text class="text" x="117.000000" y="1086.333333" style="text-anchor:start;font-size:20px;fill:#0D32B2">last_login</text>
 <text class="text" x="218.000000" y="1086.333333" style="text-anchor:start;font-size:20px;fill:#676C7E">datetime</text>
-<text class="text" x="295.000000" y="1086.333333" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="107.000000" y1="1124.000000" x2="315.000000" y2="1124.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="code"><g class="shape" ></g><g transform="translate(113.000000 1224.000000)"><rect class="shape" width="196" height="512" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
+<text class="text" x="295.000000" y="1086.333333" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="107.000000" y1="1124.000000" x2="315.000000" y2="1124.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="code"><g class="shape" ></g><g transform="translate(116.000000 1224.000000)"><rect class="shape" width="191" height="512" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" font-weight="bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="package"><g class="shape" ><path d="M 161 1836 L 211 1836 L 211 1891 L 261 1891 L 261 2348 L 161 2348 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g></g><g id="no height"><g class="shape" ><rect x="161" y="2448" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><g id="(class -&gt; users)[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 211.000000 514.000000 C 211.000000 552.000000 211.000000 572.000000 211.000000 608.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2638010024)"/></g><g id="(users -&gt; code)[0]"><path d="M 211.000000 1126.000000 C 211.000000 1164.000000 211.000000 1184.000000 211.000000 1220.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2638010024)"/></g><g id="(code -&gt; package)[0]"><path d="M 211.000000 1738.000000 C 211.000000 1776.000000 211.000000 1796.000000 211.000000 1832.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2638010024)"/></g><g id="(package -&gt; no height)[0]"><path d="M 211.000000 2350.000000 C 211.000000 2388.000000 211.000000 2408.000000 211.000000 2444.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2638010024)"/></g><mask id="2638010024" maskUnits="userSpaceOnUse" x="-100" y="-100" width="626" height="2752">
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="package"><g class="shape" ><path d="M 161 1836 L 211 1836 L 211 1891 L 261 1891 L 261 2348 L 161 2348 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g></g><g id="no height"><g class="shape" ><rect x="161" y="2448" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><g id="(class -&gt; users)[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 211.000000 514.000000 C 211.000000 552.000000 211.000000 572.000000 211.000000 608.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2029593974)"/></g><g id="(users -&gt; code)[0]"><path d="M 211.000000 1126.000000 C 211.000000 1164.000000 211.000000 1184.000000 211.000000 1220.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2029593974)"/></g><g id="(code -&gt; package)[0]"><path d="M 211.000000 1738.000000 C 211.000000 1776.000000 211.000000 1796.000000 211.000000 1832.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2029593974)"/></g><g id="(package -&gt; no height)[0]"><path d="M 211.000000 2350.000000 C 211.000000 2388.000000 211.000000 2408.000000 211.000000 2444.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2029593974)"/></g><mask id="2029593974" maskUnits="userSpaceOnUse" x="-100" y="-100" width="626" height="2752">
 <rect x="-100" y="-100" width="626" height="2752" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
index df8aa27d7..655a6773d 100644
--- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json
@@ -265,10 +265,10 @@
       "id": "code",
       "type": "code",
       "pos": {
-        "x": 125,
+        "x": 127,
         "y": 1236
       },
-      "width": 196,
+      "width": 191,
       "height": 512,
       "opacity": 1,
       "strokeDash": 0,
diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg
index ef3feef4c..ac9ef8f64 100644
--- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg
@@ -61,9 +61,9 @@ width="626" height="2752" viewBox="-90 -90 626 2752"><style type="text/css">
 <text class="text" x="230.000000" y="1013.000000" style="text-anchor:start;font-size:20px;fill:#676C7E">string</text>
 <text class="text" x="307.000000" y="1013.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="119.000000" y1="1050.666667" x2="327.000000" y2="1050.666667" style="stroke-width:2;stroke:#0A0F25" /><text class="text" x="129.000000" y="1098.333333" style="text-anchor:start;font-size:20px;fill:#0D32B2">last_login</text>
 <text class="text" x="230.000000" y="1098.333333" style="text-anchor:start;font-size:20px;fill:#676C7E">datetime</text>
-<text class="text" x="307.000000" y="1098.333333" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="119.000000" y1="1136.000000" x2="327.000000" y2="1136.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="code"><g class="shape" ></g><g transform="translate(125.000000 1236.000000)"><rect class="shape" width="196" height="512" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
+<text class="text" x="307.000000" y="1098.333333" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="119.000000" y1="1136.000000" x2="327.000000" y2="1136.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="code"><g class="shape" ></g><g transform="translate(127.000000 1236.000000)"><rect class="shape" width="191" height="512" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" font-weight="bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="package"><g class="shape" ><path d="M 173 1848 L 223 1848 L 223 1903 L 273 1903 L 273 2360 L 173 2360 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g></g><g id="no height"><g class="shape" ><rect x="173" y="2460" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><g id="(class -&gt; users)[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 223.000000 526.000000 L 223.000000 620.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#232039136)"/></g><g id="(users -&gt; code)[0]"><path d="M 223.000000 1138.000000 L 223.000000 1232.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#232039136)"/></g><g id="(code -&gt; package)[0]"><path d="M 223.000000 1750.000000 L 223.000000 1844.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#232039136)"/></g><g id="(package -&gt; no height)[0]"><path d="M 223.000000 2362.000000 L 223.000000 2456.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#232039136)"/></g><mask id="232039136" maskUnits="userSpaceOnUse" x="-100" y="-100" width="626" height="2752">
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="package"><g class="shape" ><path d="M 173 1848 L 223 1848 L 223 1903 L 273 1903 L 273 2360 L 173 2360 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g></g><g id="no height"><g class="shape" ><rect x="173" y="2460" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><g id="(class -&gt; users)[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 223.000000 526.000000 L 223.000000 620.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2736311715)"/></g><g id="(users -&gt; code)[0]"><path d="M 223.000000 1138.000000 L 223.000000 1232.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2736311715)"/></g><g id="(code -&gt; package)[0]"><path d="M 223.000000 1750.000000 L 223.000000 1844.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2736311715)"/></g><g id="(package -&gt; no height)[0]"><path d="M 223.000000 2362.000000 L 223.000000 2456.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2736311715)"/></g><mask id="2736311715" maskUnits="userSpaceOnUse" x="-100" y="-100" width="626" height="2752">
 <rect x="-100" y="-100" width="626" height="2752" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
index 619978f27..c8f7fa91a 100644
--- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json
@@ -269,7 +269,7 @@
         "y": 754
       },
       "width": 512,
-      "height": 70,
+      "height": 65,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -306,7 +306,7 @@
       "type": "package",
       "pos": {
         "x": 0,
-        "y": 924
+        "y": 919
       },
       "width": 512,
       "height": 100,
@@ -346,7 +346,7 @@
       "type": "",
       "pos": {
         "x": 206,
-        "y": 1124
+        "y": 1119
       },
       "width": 100,
       "height": 100,
@@ -506,19 +506,19 @@
       "route": [
         {
           "x": 256,
-          "y": 824
+          "y": 819
         },
         {
           "x": 256,
-          "y": 864
+          "y": 859
         },
         {
           "x": 256,
-          "y": 888
+          "y": 883
         },
         {
           "x": 256,
-          "y": 944
+          "y": 939
         }
       ],
       "isCurve": true,
@@ -554,19 +554,19 @@
       "route": [
         {
           "x": 256,
-          "y": 1024
+          "y": 1019
         },
         {
           "x": 256,
-          "y": 1064
+          "y": 1059
         },
         {
           "x": 256,
-          "y": 1084
+          "y": 1079
         },
         {
           "x": 256,
-          "y": 1124
+          "y": 1119
         }
       ],
       "isCurve": true,
diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg
index 8d5a523b3..4b99739ab 100644
--- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/unnamed_only_width/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="716" height="1428" viewBox="-102 -102 716 1428"><style type="text/css">
+width="716" height="1423" viewBox="-102 -102 716 1423"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -61,10 +61,10 @@ width="716" height="1428" viewBox="-102 -102 716 1428"><style type="text/css">
 <text class="text" x="111.000000" y="612.500000" style="text-anchor:start;font-size:20px;fill:#676C7E">string</text>
 <text class="text" x="492.000000" y="612.500000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="0.000000" y1="623.000000" x2="512.000000" y2="623.000000" style="stroke-width:2;stroke:#0A0F25" /><text class="text" x="10.000000" y="643.500000" style="text-anchor:start;font-size:20px;fill:#0D32B2">last_login</text>
 <text class="text" x="111.000000" y="643.500000" style="text-anchor:start;font-size:20px;fill:#676C7E">datetime</text>
-<text class="text" x="492.000000" y="643.500000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="0.000000" y1="654.000000" x2="512.000000" y2="654.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="code"><g class="shape" ></g><g transform="translate(0.000000 754.000000)"><rect class="shape" width="512" height="70" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
+<text class="text" x="492.000000" y="643.500000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="0.000000" y1="654.000000" x2="512.000000" y2="654.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="code"><g class="shape" ></g><g transform="translate(0.000000 754.000000)"><rect class="shape" width="512" height="65" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" font-weight="bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="package"><g class="shape" ><path d="M 0 924 L 150 924 L 150 944 L 512 944 L 512 1024 L 0 1024 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g></g><g id="no width"><g class="shape" ><rect x="206" y="1124" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><g id="(class -&gt; users)[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 256.000000 370.000000 C 256.000000 408.000000 256.000000 428.000000 256.000000 464.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#962049094)"/></g><g id="(users -&gt; code)[0]"><path d="M 256.000000 656.000000 C 256.000000 694.000000 256.000000 714.000000 256.000000 750.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#962049094)"/></g><g id="(code -&gt; package)[0]"><path d="M 256.000000 826.000000 C 256.000000 864.000000 256.000000 888.000000 256.000000 940.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#962049094)"/></g><g id="(package -&gt; no width)[0]"><path d="M 256.000000 1026.000000 C 256.000000 1064.000000 256.000000 1084.000000 256.000000 1120.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#962049094)"/></g><mask id="962049094" maskUnits="userSpaceOnUse" x="-100" y="-100" width="716" height="1428">
-<rect x="-100" y="-100" width="716" height="1428" fill="white"></rect>
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="package"><g class="shape" ><path d="M 0 919 L 150 919 L 150 939 L 512 939 L 512 1019 L 0 1019 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g></g><g id="no width"><g class="shape" ><rect x="206" y="1119" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><g id="(class -&gt; users)[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 256.000000 370.000000 C 256.000000 408.000000 256.000000 428.000000 256.000000 464.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#917937279)"/></g><g id="(users -&gt; code)[0]"><path d="M 256.000000 656.000000 C 256.000000 694.000000 256.000000 714.000000 256.000000 750.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#917937279)"/></g><g id="(code -&gt; package)[0]"><path d="M 256.000000 821.000000 C 256.000000 859.000000 256.000000 883.000000 256.000000 935.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#917937279)"/></g><g id="(package -&gt; no width)[0]"><path d="M 256.000000 1021.000000 C 256.000000 1059.000000 256.000000 1079.000000 256.000000 1115.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#917937279)"/></g><mask id="917937279" maskUnits="userSpaceOnUse" x="-100" y="-100" width="716" height="1423">
+<rect x="-100" y="-100" width="716" height="1423" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
 .text {
diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
index e24e1e3a8..e42a26e30 100644
--- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
+++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json
@@ -269,7 +269,7 @@
         "y": 766
       },
       "width": 512,
-      "height": 70,
+      "height": 65,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -306,7 +306,7 @@
       "type": "package",
       "pos": {
         "x": 12,
-        "y": 936
+        "y": 931
       },
       "width": 512,
       "height": 100,
@@ -346,7 +346,7 @@
       "type": "",
       "pos": {
         "x": 218,
-        "y": 1136
+        "y": 1131
       },
       "width": 100,
       "height": 100,
@@ -488,11 +488,11 @@
       "route": [
         {
           "x": 268,
-          "y": 836
+          "y": 831
         },
         {
           "x": 268,
-          "y": 956
+          "y": 951
         }
       ],
       "animated": false,
@@ -527,11 +527,11 @@
       "route": [
         {
           "x": 268,
-          "y": 1036
+          "y": 1031
         },
         {
           "x": 268,
-          "y": 1136
+          "y": 1131
         }
       ],
       "animated": false,
diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg
index 412c2f0f1..f953fa9e3 100644
--- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/unnamed_only_width/elk/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="716" height="1428" viewBox="-90 -90 716 1428"><style type="text/css">
+width="716" height="1423" viewBox="-90 -90 716 1423"><style type="text/css">
 <![CDATA[
 .shape {
   shape-rendering: geometricPrecision;
@@ -61,10 +61,10 @@ width="716" height="1428" viewBox="-90 -90 716 1428"><style type="text/css">
 <text class="text" x="123.000000" y="624.500000" style="text-anchor:start;font-size:20px;fill:#676C7E">string</text>
 <text class="text" x="504.000000" y="624.500000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="12.000000" y1="635.000000" x2="524.000000" y2="635.000000" style="stroke-width:2;stroke:#0A0F25" /><text class="text" x="22.000000" y="655.500000" style="text-anchor:start;font-size:20px;fill:#0D32B2">last_login</text>
 <text class="text" x="123.000000" y="655.500000" style="text-anchor:start;font-size:20px;fill:#676C7E">datetime</text>
-<text class="text" x="504.000000" y="655.500000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="12.000000" y1="666.000000" x2="524.000000" y2="666.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="code"><g class="shape" ></g><g transform="translate(12.000000 766.000000)"><rect class="shape" width="512" height="70" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
+<text class="text" x="504.000000" y="655.500000" style="text-anchor:end;font-size:20px;fill:#4A6FF3;letter-spacing:2px;"></text><line x1="12.000000" y1="666.000000" x2="524.000000" y2="666.000000" style="stroke-width:2;stroke:#0A0F25" /></g></g><g id="code"><g class="shape" ></g><g transform="translate(12.000000 766.000000)"><rect class="shape" width="512" height="65" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" font-weight="bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="package"><g class="shape" ><path d="M 12 936 L 162 936 L 162 956 L 524 956 L 524 1036 L 12 1036 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g></g><g id="no width"><g class="shape" ><rect x="218" y="1136" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><g id="(class -&gt; users)[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 268.000000 382.000000 L 268.000000 476.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2635228386)"/></g><g id="(users -&gt; code)[0]"><path d="M 268.000000 668.000000 L 268.000000 762.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2635228386)"/></g><g id="(code -&gt; package)[0]"><path d="M 268.000000 838.000000 L 268.000000 952.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2635228386)"/></g><g id="(package -&gt; no width)[0]"><path d="M 268.000000 1038.000000 L 268.000000 1132.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2635228386)"/></g><mask id="2635228386" maskUnits="userSpaceOnUse" x="-100" y="-100" width="716" height="1428">
-<rect x="-100" y="-100" width="716" height="1428" fill="white"></rect>
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="package"><g class="shape" ><path d="M 12 931 L 162 931 L 162 951 L 524 951 L 524 1031 L 12 1031 Z" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;"/></g></g><g id="no width"><g class="shape" ><rect x="218" y="1131" width="100" height="100" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g></g><g id="(class -&gt; users)[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 268.000000 382.000000 L 268.000000 476.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3311369396)"/></g><g id="(users -&gt; code)[0]"><path d="M 268.000000 668.000000 L 268.000000 762.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3311369396)"/></g><g id="(code -&gt; package)[0]"><path d="M 268.000000 833.000000 L 268.000000 947.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3311369396)"/></g><g id="(package -&gt; no width)[0]"><path d="M 268.000000 1033.000000 L 268.000000 1127.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3311369396)"/></g><mask id="3311369396" maskUnits="userSpaceOnUse" x="-100" y="-100" width="716" height="1423">
+<rect x="-100" y="-100" width="716" height="1423" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
 .text {
diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
index c76b3f0a7..38b877691 100644
--- a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
+++ b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json
@@ -797,11 +797,11 @@
       "id": "small code",
       "type": "code",
       "pos": {
-        "x": 1980,
-        "y": 2233
+        "x": 1983,
+        "y": 2236
       },
-      "width": 196,
-      "height": 70,
+      "width": 191,
+      "height": 65,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
@@ -1175,11 +1175,11 @@
         },
         {
           "x": 2078,
-          "y": 2061
+          "y": 2061.5
         },
         {
           "x": 2078,
-          "y": 2233
+          "y": 2235.5
         }
       ],
       "isCurve": true,
diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg
index 76849246e..0c5c7c93f 100644
--- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg
+++ b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg
@@ -63,9 +63,9 @@ width="2482" height="2672" viewBox="-102 -102 2482 2672"><style type="text/css">
 <text class="text-mono" x="1048.000000" y="1136.000000" style="text-anchor:start;font-size:20px;fill:#0A0F25">setTimeout(seconds int)</text>
 <text class="text-mono" x="1798.000000" y="1136.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3">void</text></g></g><g id="text"><g class="shape" ><rect x="1878" y="556" width="400" height="800" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="2078.000000" y="961.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">markdown text expanded to 800x400</text></g><g id="code"><g class="shape" ></g><g transform="translate(1878.000000 1562.000000)"><rect class="shape" width="400" height="300" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" font-weight="bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="small code"><g class="shape" ></g><g transform="translate(1980.000000 2233.000000)"><rect class="shape" width="196" height="70" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="small code"><g class="shape" ></g><g transform="translate(1983.000000 2236.000000)"><rect class="shape" width="191" height="65" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" font-weight="bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="container"><g class="shape" ><rect x="2021" y="195" width="114" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="2078.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">container</text></g><g id="containers.circle container"><g class="shape" ><ellipse class="shape" cx="154.000000" cy="228.000000" rx="114.000000" ry="178.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="154.000000" y="132.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">circle container</text></g><g id="containers.diamond container"><g class="shape" ><path d="M 422 406 C 421 406 421 406 420 405 L 309 231 C 308 229 308 226 309 225 L 420 51 C 421 49 423 49 424 51 L 535 225 C 536 227 536 230 535 231 L 424 405 C 423 406 423 406 422 406 Z" style="fill:#CFD2DD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="422.000000" y="168.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">diamond container</text></g><g id="containers.oval container"><g class="shape" ><ellipse class="shape" cx="690.000000" cy="228.000000" rx="114.000000" ry="178.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="690.000000" y="132.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">oval container</text></g><g id="containers.hexagon container"><g class="shape" ><path d="M 901 50 L 844 228 L 901 406 L 1015 406 L 1072 228 L 1015 50 Z" style="fill:#DEE1EB;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="958.000000" y="138.333333" style="text-anchor:middle;font-size:24px;fill:#0A0F25">hexagon container</text></g><g id="containers.circle container.diamond"><g class="shape" ><path d="M 154 260 C 154 260 153 260 153 260 L 90 229 C 89 229 89 228 90 228 L 153 196 C 154 196 155 196 155 196 L 217 227 C 218 227 218 228 217 228 L 155 260 C 155 260 154 260 154 260 Z" style="fill:#CFD2DD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text-bold" x="154.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">diamond</text></g><g id="containers.diamond container.circle"><g class="shape" ><ellipse class="shape" cx="422.000000" cy="228.000000" rx="64.000000" ry="64.000000" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="422.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">circle</text></g><g id="containers.oval container.hexagon"><g class="shape" ><path d="M 658 196 L 626 228 L 658 260 L 722 260 L 754 228 L 722 196 Z" style="fill:#DEE1EB;stroke:#0D32B2;stroke-width:2;"/></g><text class="text-bold" x="690.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">hexagon</text></g><g id="containers.hexagon container.oval"><g class="shape" ><ellipse class="shape" cx="958.000000" cy="228.000000" rx="64.000000" ry="32.000000" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="958.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">oval</text></g><g id="(cloud -&gt; class)[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 1418.000000 357.000000 C 1418.000000 395.800000 1418.000000 416.000000 1418.000000 431.000000 C 1418.000000 446.000000 1418.000000 556.000000 1418.000000 752.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1126805937)"/></g><g id="(class -&gt; tall cylinder)[0]"><path d="M 1418.000000 1158.000000 C 1418.000000 1356.000000 1418.000000 1416.000000 1418.000000 1452.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1126805937)"/></g><g id="(tall cylinder -&gt; users)[0]"><path d="M 1418.000000 1970.000000 C 1418.000000 2008.000000 1418.000000 2028.000000 1418.000000 2064.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1126805937)"/></g><g id="(container -&gt; text)[0]"><path d="M 2078.000000 263.000000 C 2078.000000 377.000000 2078.000000 416.000000 2078.000000 431.000000 C 2078.000000 446.000000 2078.000000 516.000000 2078.000000 552.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1126805937)"/></g><g id="(text -&gt; code)[0]"><path d="M 2078.000000 1358.000000 C 2078.000000 1396.000000 2078.000000 1437.200000 2078.000000 1558.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1126805937)"/></g><g id="(code -&gt; small code)[0]"><path d="M 2078.000000 1864.000000 C 2078.000000 1986.800000 2078.000000 2061.000000 2078.000000 2229.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#1126805937)"/></g><mask id="1126805937" maskUnits="userSpaceOnUse" x="-100" y="-100" width="2482" height="2672">
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="container"><g class="shape" ><rect x="2021" y="195" width="114" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="2078.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">container</text></g><g id="containers.circle container"><g class="shape" ><ellipse class="shape" cx="154.000000" cy="228.000000" rx="114.000000" ry="178.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="154.000000" y="132.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">circle container</text></g><g id="containers.diamond container"><g class="shape" ><path d="M 422 406 C 421 406 421 406 420 405 L 309 231 C 308 229 308 226 309 225 L 420 51 C 421 49 423 49 424 51 L 535 225 C 536 227 536 230 535 231 L 424 405 C 423 406 423 406 422 406 Z" style="fill:#CFD2DD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="422.000000" y="168.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">diamond container</text></g><g id="containers.oval container"><g class="shape" ><ellipse class="shape" cx="690.000000" cy="228.000000" rx="114.000000" ry="178.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="690.000000" y="132.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">oval container</text></g><g id="containers.hexagon container"><g class="shape" ><path d="M 901 50 L 844 228 L 901 406 L 1015 406 L 1072 228 L 1015 50 Z" style="fill:#DEE1EB;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="958.000000" y="138.333333" style="text-anchor:middle;font-size:24px;fill:#0A0F25">hexagon container</text></g><g id="containers.circle container.diamond"><g class="shape" ><path d="M 154 260 C 154 260 153 260 153 260 L 90 229 C 89 229 89 228 90 228 L 153 196 C 154 196 155 196 155 196 L 217 227 C 218 227 218 228 217 228 L 155 260 C 155 260 154 260 154 260 Z" style="fill:#CFD2DD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text-bold" x="154.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">diamond</text></g><g id="containers.diamond container.circle"><g class="shape" ><ellipse class="shape" cx="422.000000" cy="228.000000" rx="64.000000" ry="64.000000" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="422.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">circle</text></g><g id="containers.oval container.hexagon"><g class="shape" ><path d="M 658 196 L 626 228 L 658 260 L 722 260 L 754 228 L 722 196 Z" style="fill:#DEE1EB;stroke:#0D32B2;stroke-width:2;"/></g><text class="text-bold" x="690.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">hexagon</text></g><g id="containers.hexagon container.oval"><g class="shape" ><ellipse class="shape" cx="958.000000" cy="228.000000" rx="64.000000" ry="32.000000" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="958.000000" y="233.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">oval</text></g><g id="(cloud -&gt; class)[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 1418.000000 357.000000 C 1418.000000 395.800000 1418.000000 416.000000 1418.000000 431.000000 C 1418.000000 446.000000 1418.000000 556.000000 1418.000000 752.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3742132730)"/></g><g id="(class -&gt; tall cylinder)[0]"><path d="M 1418.000000 1158.000000 C 1418.000000 1356.000000 1418.000000 1416.000000 1418.000000 1452.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3742132730)"/></g><g id="(tall cylinder -&gt; users)[0]"><path d="M 1418.000000 1970.000000 C 1418.000000 2008.000000 1418.000000 2028.000000 1418.000000 2064.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3742132730)"/></g><g id="(container -&gt; text)[0]"><path d="M 2078.000000 263.000000 C 2078.000000 377.000000 2078.000000 416.000000 2078.000000 431.000000 C 2078.000000 446.000000 2078.000000 516.000000 2078.000000 552.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3742132730)"/></g><g id="(text -&gt; code)[0]"><path d="M 2078.000000 1358.000000 C 2078.000000 1396.000000 2078.000000 1437.200000 2078.000000 1558.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3742132730)"/></g><g id="(code -&gt; small code)[0]"><path d="M 2078.000000 1864.000000 C 2078.000000 1986.800000 2078.000000 2061.500000 2078.000000 2231.500000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#3742132730)"/></g><mask id="3742132730" maskUnits="userSpaceOnUse" x="-100" y="-100" width="2482" height="2672">
 <rect x="-100" y="-100" width="2482" height="2672" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json
index 20cd15deb..6646c872d 100644
--- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json
+++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json
@@ -797,11 +797,11 @@
       "id": "small code",
       "type": "code",
       "pos": {
-        "x": 2132,
+        "x": 2134,
         "y": 2052
       },
-      "width": 196,
-      "height": 70,
+      "width": 191,
+      "height": 65,
       "opacity": 1,
       "strokeDash": 0,
       "strokeWidth": 2,
diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg
index d838a35ce..76389c316 100644
--- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg
+++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg
@@ -63,9 +63,9 @@ width="2622" height="2644" viewBox="-90 -90 2622 2644"><style type="text/css">
 <text class="text-mono" x="1240.000000" y="1120.000000" style="text-anchor:start;font-size:20px;fill:#0A0F25">setTimeout(seconds int)</text>
 <text class="text-mono" x="1990.000000" y="1120.000000" style="text-anchor:end;font-size:20px;fill:#4A6FF3">void</text></g></g><g id="text"><g class="shape" ><rect x="2030" y="540" width="400" height="800" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="2230.000000" y="945.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">markdown text expanded to 800x400</text></g><g id="code"><g class="shape" ></g><g transform="translate(2030.000000 1546.000000)"><rect class="shape" width="400" height="300" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" font-weight="bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="small code"><g class="shape" ></g><g transform="translate(2132.000000 2052.000000)"><rect class="shape" width="196" height="70" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="small code"><g class="shape" ></g><g transform="translate(2134.000000 2052.000000)"><rect class="shape" width="191" height="65" style="stroke: #0A0F25;fill:#ffffff" /><g transform="translate(6 6)"><text class="text-mono" x="0" y="1.000000em" xml:space="preserve">a&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;<tspan fill="#009999">5</tspan>
 </text><text class="text-mono" x="0" y="2.000000em" xml:space="preserve">b&#160;<tspan fill="#000000" font-weight="bold">:=</tspan>&#160;a&#160;<tspan fill="#000000" font-weight="bold">+</tspan>&#160;<tspan fill="#009999">7</tspan>
-</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="container"><g class="shape" ><rect x="2173" y="374" width="114" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="2230.000000" y="412.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">container</text></g><g id="containers.circle container"><g class="shape" ><ellipse class="shape" cx="226.000000" cy="226.000000" rx="139.000000" ry="107.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="226.000000" y="180.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">circle container</text></g><g id="containers.diamond container"><g class="shape" ><path d="M 524 365 C 523 365 522 365 521 364 L 386 229 C 385 228 385 225 386 224 L 521 88 C 522 87 525 87 526 88 L 661 224 C 662 225 662 228 661 229 L 527 364 C 526 365 525 365 524 365 Z" style="fill:#CFD2DD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="524.000000" y="185.500000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">diamond container</text></g><g id="containers.oval container"><g class="shape" ><ellipse class="shape" cx="822.000000" cy="226.000000" rx="139.000000" ry="107.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="822.000000" y="180.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">oval container</text></g><g id="containers.hexagon container"><g class="shape" ><path d="M 1051 119 L 981 226 L 1051 333 L 1190 333 L 1259 226 L 1190 119 Z" style="fill:#DEE1EB;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1120.000000" y="183.666667" style="text-anchor:middle;font-size:24px;fill:#0A0F25">hexagon container</text></g><g id="containers.circle container.diamond"><g class="shape" ><path d="M 226 258 C 226 258 225 258 225 258 L 162 227 C 161 227 161 226 162 226 L 225 194 C 226 194 227 194 227 194 L 289 225 C 290 225 290 226 289 226 L 227 258 C 227 258 226 258 226 258 Z" style="fill:#CFD2DD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text-bold" x="226.000000" y="231.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">diamond</text></g><g id="containers.diamond container.circle"><g class="shape" ><ellipse class="shape" cx="524.000000" cy="226.000000" rx="64.000000" ry="64.000000" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="524.000000" y="231.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">circle</text></g><g id="containers.oval container.hexagon"><g class="shape" ><path d="M 790 194 L 758 226 L 790 258 L 854 258 L 886 226 L 854 194 Z" style="fill:#DEE1EB;stroke:#0D32B2;stroke-width:2;"/></g><text class="text-bold" x="822.000000" y="231.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">hexagon</text></g><g id="containers.hexagon container.oval"><g class="shape" ><ellipse class="shape" cx="1120.000000" cy="226.000000" rx="64.000000" ry="32.000000" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="1120.000000" y="231.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">oval</text></g><g id="(cloud -&gt; class)[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 1610.000000 441.000000 L 1610.000000 736.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2302857114)"/></g><g id="(class -&gt; tall cylinder)[0]"><path d="M 1610.000000 1142.000000 L 1610.000000 1436.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2302857114)"/></g><g id="(tall cylinder -&gt; users)[0]"><path d="M 1610.000000 1954.000000 L 1610.000000 2048.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2302857114)"/></g><g id="(container -&gt; text)[0]"><path d="M 2230.000000 442.000000 L 2230.000000 536.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2302857114)"/></g><g id="(text -&gt; code)[0]"><path d="M 2230.000000 1342.000000 L 2230.000000 1542.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2302857114)"/></g><g id="(code -&gt; small code)[0]"><path d="M 2230.000000 1848.000000 L 2230.000000 2048.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2302857114)"/></g><mask id="2302857114" maskUnits="userSpaceOnUse" x="-100" y="-100" width="2622" height="2644">
+</text><text class="text-mono" x="0" y="3.000000em" xml:space="preserve">fmt.<tspan fill="#990000" font-weight="bold">Printf</tspan>(<tspan fill="#dd1144">&quot;%d&quot;</tspan>,&#160;b)</text></g></g></g><g id="container"><g class="shape" ><rect x="2173" y="374" width="114" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="2230.000000" y="412.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">container</text></g><g id="containers.circle container"><g class="shape" ><ellipse class="shape" cx="226.000000" cy="226.000000" rx="139.000000" ry="107.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="226.000000" y="180.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">circle container</text></g><g id="containers.diamond container"><g class="shape" ><path d="M 524 365 C 523 365 522 365 521 364 L 386 229 C 385 228 385 225 386 224 L 521 88 C 522 87 525 87 526 88 L 661 224 C 662 225 662 228 661 229 L 527 364 C 526 365 525 365 524 365 Z" style="fill:#CFD2DD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="524.000000" y="185.500000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">diamond container</text></g><g id="containers.oval container"><g class="shape" ><ellipse class="shape" cx="822.000000" cy="226.000000" rx="139.000000" ry="107.000000" style="fill:#EDF0FD;stroke:#0D32B2;stroke-width:2;" /></g><text class="text" x="822.000000" y="180.000000" style="text-anchor:middle;font-size:24px;fill:#0A0F25">oval container</text></g><g id="containers.hexagon container"><g class="shape" ><path d="M 1051 119 L 981 226 L 1051 333 L 1190 333 L 1259 226 L 1190 119 Z" style="fill:#DEE1EB;stroke:#0D32B2;stroke-width:2;"/></g><text class="text" x="1120.000000" y="183.666667" style="text-anchor:middle;font-size:24px;fill:#0A0F25">hexagon container</text></g><g id="containers.circle container.diamond"><g class="shape" ><path d="M 226 258 C 226 258 225 258 225 258 L 162 227 C 161 227 161 226 162 226 L 225 194 C 226 194 227 194 227 194 L 289 225 C 290 225 290 226 289 226 L 227 258 C 227 258 226 258 226 258 Z" style="fill:#CFD2DD;stroke:#0D32B2;stroke-width:2;"/></g><text class="text-bold" x="226.000000" y="231.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">diamond</text></g><g id="containers.diamond container.circle"><g class="shape" ><ellipse class="shape" cx="524.000000" cy="226.000000" rx="64.000000" ry="64.000000" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="524.000000" y="231.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">circle</text></g><g id="containers.oval container.hexagon"><g class="shape" ><path d="M 790 194 L 758 226 L 790 258 L 854 258 L 886 226 L 854 194 Z" style="fill:#DEE1EB;stroke:#0D32B2;stroke-width:2;"/></g><text class="text-bold" x="822.000000" y="231.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">hexagon</text></g><g id="containers.hexagon container.oval"><g class="shape" ><ellipse class="shape" cx="1120.000000" cy="226.000000" rx="64.000000" ry="32.000000" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;" /></g><text class="text-bold" x="1120.000000" y="231.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">oval</text></g><g id="(cloud -&gt; class)[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 1610.000000 441.000000 L 1610.000000 736.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2803119965)"/></g><g id="(class -&gt; tall cylinder)[0]"><path d="M 1610.000000 1142.000000 L 1610.000000 1436.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2803119965)"/></g><g id="(tall cylinder -&gt; users)[0]"><path d="M 1610.000000 1954.000000 L 1610.000000 2048.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2803119965)"/></g><g id="(container -&gt; text)[0]"><path d="M 2230.000000 442.000000 L 2230.000000 536.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2803119965)"/></g><g id="(text -&gt; code)[0]"><path d="M 2230.000000 1342.000000 L 2230.000000 1542.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2803119965)"/></g><g id="(code -&gt; small code)[0]"><path d="M 2230.000000 1848.000000 L 2230.000000 2048.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-end="url(#mk-3990223579)" mask="url(#2803119965)"/></g><mask id="2803119965" maskUnits="userSpaceOnUse" x="-100" y="-100" width="2622" height="2644">
 <rect x="-100" y="-100" width="2622" height="2644" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[