diff --git a/changes/unreleased/drawio-grid-gap.fixed.md b/changes/unreleased/drawio-grid-gap.fixed.md
new file mode 100644
index 0000000000..dc40b90c93
--- /dev/null
+++ b/changes/unreleased/drawio-grid-gap.fixed.md
@@ -0,0 +1 @@
+- The `drawio` rendering form lays unplaced nodes, and the members inside a container, out with a corridor between neighbours that the edge router can use: twice its clearance, the two half port squares, and one nudging lane (50 px instead of 40), so two parts with ports on their facing sides route instead of being left for draw.io to route under a notice.
diff --git a/docs/project/view-rendering-forms.md b/docs/project/view-rendering-forms.md
index 1a90df2334..19d4b1b043 100644
--- a/docs/project/view-rendering-forms.md
+++ b/docs/project/view-rendering-forms.md
@@ -1463,7 +1463,8 @@ obstacles and the ancestors an end lies in reduced to their headers; an edge fro
 its own member leaves the header's underside above the member. Containers are padded by more than
 twice the clearance so a path fits between neighbours. A stated `Route` is never re-routed, and
 an edge the router finds no path for (two boxes nearer than twice the clearance plus their
-port squares, as the default layout's 40 px between siblings can be) is written without
+port squares; the grid and the members of a container keep that distance plus a nudging lane,
+50 px) is written without
 waypoints under `edgeStyle=orthogonalEdgeStyle`, for draw.io to route as before, under a notice
 naming the edge and its cells; an end at a port keeps its face as the anchor, the inner face when
 the edge leads into the port's owner. A member drawn outside its container is routed in the
diff --git a/internal/ir/view/drawio.go b/internal/ir/view/drawio.go
index 81799f388e..be1be71e2a 100644
--- a/internal/ir/view/drawio.go
+++ b/internal/ir/view/drawio.go
@@ -118,10 +118,12 @@ func (b drawioBox) contains(o drawioBox) bool {
 // The spacing the grid lays unplaced nodes out with, and the padding a
 // container keeps about its nested children, in draw.io pixels.
 const (
-	drawioGridGap = 40
-	// drawioNestedGap also parts a header from its members: more than twice
-	// the router's clearance, so a path can pass between neighbours.
-	drawioNestedGap   = 2*route.Clearance + 8
+	// drawioGridGap leaves a corridor between neighbours for the router: its
+	// clearance on both sides, the two half port squares, and one nudging lane.
+	drawioGridGap = 2*route.Clearance + route.PortSize + route.Nudging
+	// drawioNestedGap parts nested members from each other and from their
+	// header by the same corridor.
+	drawioNestedGap   = drawioGridGap
 	drawioNestedPad   = 16
 	drawioPortSize    = 12
 	drawioMinWidth    = 100
diff --git a/internal/ir/view/testdata/abstract-interconnection.drawio.golden b/internal/ir/view/testdata/abstract-interconnection.drawio.golden
index 92af23a474..561e847eac 100644
--- a/internal/ir/view/testdata/abstract-interconnection.drawio.golden
+++ b/internal/ir/view/testdata/abstract-interconnection.drawio.golden
@@ -9,36 +9,36 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«abstract part»&#xA;vehicleFamily" fqn="AbstractViews::vehicleFamily" kind="abstract part" view="AbstractViews::familyLinks" link="abstract.sysml:14">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="284" height="212" as="geometry"/>
+            <mxGeometry x="50" y="50" width="294" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«abstract port»&#xA;fuel" fqn="AbstractViews::vehicleFamily::fuel" kind="abstract port" view="AbstractViews::familyLinks" link="abstract.sysml:15">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«abstract part»&#xA;engine" fqn="AbstractViews::vehicleFamily::engine" kind="abstract part" view="AbstractViews::familyLinks" link="abstract.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="162" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="172" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«part»&#xA;chassis" fqn="AbstractViews::vehicleFamily::chassis" kind="part" view="AbstractViews::familyLinks" link="abstract.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="159" width="81" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«attribute»&#xA;^mass" fqn="AbstractViews::Vehicle::mass" kind="attribute" view="AbstractViews::familyLinks" link="abstract.sysml:8">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="137" y="159" width="82" height="37" as="geometry"/>
+            <mxGeometry x="147" y="179" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="connection" view="AbstractViews::familyLinks" link="abstract.sysml:18">
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n2" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="255" y="179"/>
-                <mxPoint x="157" y="179"/>
-                <mxPoint x="157" y="208"/>
+                <mxPoint x="275" y="204"/>
+                <mxPoint x="172" y="204"/>
+                <mxPoint x="172" y="238"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/abstract-mixed.drawio.golden b/internal/ir/view/testdata/abstract-mixed.drawio.golden
index 53b6e2ec63..7514d82d36 100644
--- a/internal/ir/view/testdata/abstract-mixed.drawio.golden
+++ b/internal/ir/view/testdata/abstract-mixed.drawio.golden
@@ -9,59 +9,59 @@
         <mxCell id="1" parent="0"/>
         <object id="n1" label="«abstract part def»&#xA;Vehicle" fqn="AbstractViews::Vehicle" kind="abstract part def" view="AbstractViews::familyMixed" link="abstract.sysml:7">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="307" height="135" as="geometry"/>
+            <mxGeometry x="50" y="50" width="307" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n0" label="«attribute»&#xA;AbstractViews::Vehicle::mass" fqn="AbstractViews::Vehicle::mass" kind="attribute" view="AbstractViews::familyMixed" link="abstract.sysml:8">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="347" width="275" height="37" as="geometry"/>
+            <mxGeometry x="357" width="275" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«abstract part»&#xA;vehicleFamily" fqn="AbstractViews::vehicleFamily" kind="abstract part" view="AbstractViews::familyMixed" link="abstract.sysml:14">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="215" width="284" height="212" as="geometry"/>
+            <mxGeometry x="50" y="245" width="294" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«abstract port»&#xA;fuel" fqn="AbstractViews::vehicleFamily::fuel" kind="abstract port" view="AbstractViews::familyMixed" link="abstract.sysml:15">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«abstract part»&#xA;engine" fqn="AbstractViews::vehicleFamily::engine" kind="abstract part" view="AbstractViews::familyMixed" link="abstract.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="162" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="172" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«part»&#xA;chassis" fqn="AbstractViews::vehicleFamily::chassis" kind="part" view="AbstractViews::familyMixed" link="abstract.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="159" width="81" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«variation part def»&#xA;Models" fqn="AbstractViews::Models" kind="variation part def" view="AbstractViews::familyMixed" link="abstract.sysml:21">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="364" y="215" width="300" height="233" as="geometry"/>
+            <mxGeometry x="394" y="245" width="310" height="253" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«variant»&#xA;sedan" fqn="AbstractViews::Models::sedan" kind="variant" view="AbstractViews::familyMixed" link="abstract.sysml:22">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n6">
-            <mxGeometry x="16" y="82" width="268" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="278" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«abstract part»&#xA;^engine" fqn="AbstractViews::vehicleFamily::engine" kind="abstract part" view="AbstractViews::familyMixed" link="abstract.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n7">
-            <mxGeometry x="16" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«part»&#xA;^chassis" fqn="AbstractViews::vehicleFamily::chassis" kind="part" view="AbstractViews::familyMixed" link="abstract.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n7">
-            <mxGeometry x="162" y="82" width="90" height="37" as="geometry"/>
+            <mxGeometry x="172" y="92" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="connection" view="AbstractViews::familyMixed" link="abstract.sysml:18">
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.5135;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n4" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="255" y="393"/>
+                <mxPoint x="275" y="443"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -72,58 +72,57 @@
           </mxCell>
         </object>
         <object id="e2" label="" kind="reference" view="AbstractViews::familyMixed" link="abstract.sysml:8">
-          <mxCell style="edgeStyle=none;exitX=1;exitY=0.1556;exitPerimeter=0;entryX=0;entryY=0.5135;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n0">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.1448;exitPerimeter=0;entryX=0;entryY=0.5135;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="367" y="61"/>
-                <mxPoint x="367" y="59"/>
+                <mxPoint x="382" y="71"/>
+                <mxPoint x="382" y="69"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e3" label="" kind="reference" view="AbstractViews::familyMixed" link="abstract.sysml:15">
-          <mxCell style="edgeStyle=none;exitX=0.243;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.2347;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n3">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="" kind="composition" view="AbstractViews::familyMixed" link="abstract.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0.757;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.7653;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e5" label="" kind="composition" view="AbstractViews::familyMixed" link="abstract.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.1989;exitY=0.1981;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.1922;exitY=0.181;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="96.5" y="277"/>
-                <mxPoint x="178" y="277"/>
-                <mxPoint x="178" y="383.25"/>
+                <mxPoint x="106.5" y="312"/>
+                <mxPoint x="188" y="312"/>
+                <mxPoint x="188" y="433.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e6" label="" kind="reference" view="AbstractViews::familyMixed" link="abstract.sysml:22">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.1803;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n6" target="n7">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.166;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n6" target="n7">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e7" label="" kind="typing" view="AbstractViews::familyMixed" link="abstract.sysml:14">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.5016;entryY=0.3111;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n2" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.5016;entryY=0.2897;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n2" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="182" y="149"/>
-                <mxPoint x="194" y="149"/>
+                <mxPoint x="197" y="169"/>
+                <mxPoint x="204" y="169"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e8" label="" kind="specialization" view="AbstractViews::familyMixed" link="abstract.sysml:21">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.237;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n6" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.502;exitPerimeter=0;entryX=1;entryY=0.2207;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n6" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="514" y="146"/>
-                <mxPoint x="367" y="146"/>
-                <mxPoint x="367" y="72"/>
+                <mxPoint x="376" y="372"/>
+                <mxPoint x="376" y="82"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/abstract-tree.drawio.golden b/internal/ir/view/testdata/abstract-tree.drawio.golden
index f7cb416f52..26f2861d31 100644
--- a/internal/ir/view/testdata/abstract-tree.drawio.golden
+++ b/internal/ir/view/testdata/abstract-tree.drawio.golden
@@ -9,122 +9,122 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«abstract part def»&#xA;Vehicle" fqn="AbstractViews::Vehicle" kind="abstract part def" view="AbstractViews::familyTree" link="abstract.sysml:7">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="130" height="135" as="geometry"/>
+            <mxGeometry x="50" y="50" width="130" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«attribute»&#xA;mass" fqn="AbstractViews::Vehicle::mass" kind="attribute" view="AbstractViews::familyTree" link="abstract.sysml:8">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«abstract part»&#xA;vehicleFamily" fqn="AbstractViews::vehicleFamily" kind="abstract part" view="AbstractViews::familyTree" link="abstract.sysml:14">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="210" y="40" width="405" height="212" as="geometry"/>
+            <mxGeometry x="230" y="50" width="425" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«abstract port»&#xA;fuel" fqn="AbstractViews::vehicleFamily::fuel" kind="abstract port" view="AbstractViews::familyTree" link="abstract.sysml:15">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«abstract part»&#xA;engine" fqn="AbstractViews::vehicleFamily::engine" kind="abstract part" view="AbstractViews::familyTree" link="abstract.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="162" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="172" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«part»&#xA;chassis" fqn="AbstractViews::vehicleFamily::chassis" kind="part" view="AbstractViews::familyTree" link="abstract.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="308" y="82" width="81" height="37" as="geometry"/>
+            <mxGeometry x="328" y="92" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="connect" kind="connect" view="AbstractViews::familyTree" link="abstract.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="159" width="81" height="36" as="geometry"/>
+            <mxGeometry x="16" y="179" width="81" height="36" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«attribute»&#xA;^mass" fqn="AbstractViews::Vehicle::mass" kind="attribute" view="AbstractViews::familyTree" link="abstract.sysml:8">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="137" y="159" width="82" height="37" as="geometry"/>
+            <mxGeometry x="147" y="179" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«variation part def»&#xA;Models" fqn="AbstractViews::Models" kind="variation part def" view="AbstractViews::familyTree" link="abstract.sysml:21">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="292" width="560" height="310" as="geometry"/>
+            <mxGeometry x="50" y="332" width="590" height="340" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«variant»&#xA;sedan" fqn="AbstractViews::Models::sedan" kind="variant" view="AbstractViews::familyTree" link="abstract.sysml:22">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n8">
-            <mxGeometry x="16" y="82" width="406" height="212" as="geometry"/>
+            <mxGeometry x="16" y="92" width="426" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«attribute»&#xA;^mass" fqn="AbstractViews::Vehicle::mass" kind="attribute" view="AbstractViews::familyTree" link="abstract.sysml:8">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n9">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«abstract port»&#xA;^fuel" fqn="AbstractViews::vehicleFamily::fuel" kind="abstract port" view="AbstractViews::familyTree" link="abstract.sysml:15">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n9">
-            <mxGeometry x="138" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="148" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="«abstract part»&#xA;^engine" fqn="AbstractViews::vehicleFamily::engine" kind="abstract part" view="AbstractViews::familyTree" link="abstract.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n9">
-            <mxGeometry x="284" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="304" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13" label="«part»&#xA;^chassis" fqn="AbstractViews::vehicleFamily::chassis" kind="part" view="AbstractViews::familyTree" link="abstract.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n9">
-            <mxGeometry x="16" y="159" width="90" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n14" label="connect" kind="connect" view="AbstractViews::familyTree" link="abstract.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n9">
-            <mxGeometry x="146" y="159" width="81" height="36" as="geometry"/>
+            <mxGeometry x="156" y="179" width="81" height="36" as="geometry"/>
           </mxCell>
         </object>
         <object id="n15" label="«attribute»&#xA;^mass" fqn="AbstractViews::Vehicle::mass" kind="attribute" view="AbstractViews::familyTree" link="abstract.sysml:8">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n8">
-            <mxGeometry x="462" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="492" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="reference" view="AbstractViews::familyTree" link="abstract.sysml:8">
-          <mxCell style="edgeStyle=none;exitX=0.4385;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.4385;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e1" label="" kind="typing" view="AbstractViews::familyTree" link="abstract.sysml:14">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=1;entryY=0.7481;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n2" target="n0">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=1;entryY=0.7517;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n2" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="198" y="146"/>
-                <mxPoint x="198" y="141"/>
+                <mxPoint x="213" y="166"/>
+                <mxPoint x="213" y="159"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e2" label="" kind="reference" view="AbstractViews::familyTree" link="abstract.sysml:15">
-          <mxCell style="edgeStyle=none;exitX=0.1704;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.1624;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n3">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e3" label="" kind="composition" view="AbstractViews::familyTree" link="abstract.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0.5309;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.5294;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="" kind="composition" view="AbstractViews::familyTree" link="abstract.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.8605;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.8671;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n5">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e5" label="" kind="reference" view="AbstractViews::familyTree" link="abstract.sysml:8">
-          <mxCell style="edgeStyle=none;exitX=0.4395;exitY=0.1981;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n7">
+          <mxCell style="edgeStyle=none;exitX=0.4424;exitY=0.181;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n7">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="388" y="102"/>
-                <mxPoint x="356" y="102"/>
-                <mxPoint x="356" y="179"/>
-                <mxPoint x="367.5" y="179"/>
+                <mxPoint x="418" y="117"/>
+                <mxPoint x="386" y="117"/>
+                <mxPoint x="386" y="204"/>
+                <mxPoint x="397.5" y="204"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -133,44 +133,44 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.7538;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n8" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="320" y="272"/>
-                <mxPoint x="138" y="272"/>
+                <mxPoint x="345" y="307"/>
+                <mxPoint x="148" y="307"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e7" label="" kind="reference" view="AbstractViews::familyTree" link="abstract.sysml:22">
-          <mxCell style="edgeStyle=none;exitX=0.3911;exitY=0.1355;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n8" target="n9">
+          <mxCell style="edgeStyle=none;exitX=0.3881;exitY=0.1235;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n8" target="n9">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e8" label="" kind="reference" view="AbstractViews::familyTree" link="abstract.sysml:8">
-          <mxCell style="edgeStyle=none;exitX=0.8982;exitY=0.1355;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n8" target="n15">
+          <mxCell style="edgeStyle=none;exitX=0.9034;exitY=0.1235;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n8" target="n15">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e9" label="" kind="reference" view="AbstractViews::familyTree" link="abstract.sysml:8">
-          <mxCell style="edgeStyle=none;exitX=0.1404;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n9" target="n10">
+          <mxCell style="edgeStyle=none;exitX=0.1338;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n9" target="n10">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e10" label="" kind="reference" view="AbstractViews::familyTree" link="abstract.sysml:15">
-          <mxCell style="edgeStyle=none;exitX=0.4704;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n9" target="n11">
+          <mxCell style="edgeStyle=none;exitX=0.4718;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n9" target="n11">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e11" label="" kind="composition" view="AbstractViews::familyTree" link="abstract.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0.83;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n9" target="n12">
+          <mxCell style="edgeStyle=none;exitX=0.838;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n9" target="n12">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e12" label="" kind="composition" view="AbstractViews::familyTree" link="abstract.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.1502;exitY=0.1981;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n9" target="n13">
+          <mxCell style="edgeStyle=none;exitX=0.1432;exitY=0.181;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n9" target="n13">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="117" y="436"/>
-                <mxPoint x="178" y="436"/>
-                <mxPoint x="178" y="542.25"/>
+                <mxPoint x="127" y="491"/>
+                <mxPoint x="188" y="491"/>
+                <mxPoint x="188" y="612.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/action.drawio.golden b/internal/ir/view/testdata/action.drawio.golden
index 0ccdc09d31..679437d4d0 100644
--- a/internal/ir/view/testdata/action.drawio.golden
+++ b/internal/ir/view/testdata/action.drawio.golden
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- FlowViews::driveView — action rendering (render asInterconnectionDiagram, view def ActionFlowView) -->
 <!-- 1 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
-<!-- notice: edge n2 -> n3 not routed: the router found no path at this layout; draw.io routes it when the file opens -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="FlowViews-driveView" name="FlowViews::driveView">
     <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
@@ -10,17 +9,17 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«action def»&#xA;Drive" fqn="Flows::Drive" kind="action def" view="FlowViews::driveView" link="action.sysml:11">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="416" height="407" as="geometry"/>
+            <mxGeometry x="50" y="50" width="436" height="447" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="initial" fqn="Flows::Drive::start" kind="initial" view="FlowViews::driveView" link="action.sysml:14">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«action»&#xA;provide&#xA;parameters&#xA;in ^fuel" fqn="Flows::Drive::provide" kind="action" view="FlowViews::driveView" link="action.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="76" y="82" width="81" height="37" as="geometry"/>
+            <mxGeometry x="86" y="92" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2:n2.0" label="^fuel" fqn="Flows::Provide::fuel" kind="parameter" view="FlowViews::driveView" link="action.sysml:7">
@@ -39,7 +38,7 @@
         </object>
         <object id="n3" label="«action»&#xA;monitor&#xA;own flow" fqn="Flows::Drive::monitor" kind="action" view="FlowViews::driveView" link="action.sysml:20">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=59;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="197" y="82" width="164" height="152" as="geometry"/>
+            <mxGeometry x="217" y="92" width="174" height="162" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3:n3.0" label="reading" fqn="Flows::Drive::monitor::reading" kind="parameter" view="FlowViews::driveView" link="action.sysml:21">
@@ -51,50 +50,50 @@
         </object>
         <object id="n4" label="initial" fqn="Flows::Drive::monitor::begin" kind="initial" view="FlowViews::driveView" link="action.sysml:22">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n3">
-            <mxGeometry x="16" y="99" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="109" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«action»&#xA;record" fqn="Flows::Drive::monitor::record" kind="action" view="FlowViews::driveView" link="action.sysml:23">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n3">
-            <mxGeometry x="76" y="99" width="72" height="37" as="geometry"/>
+            <mxGeometry x="86" y="109" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«action»&#xA;tally" fqn="Flows::Drive::tally" kind="action" view="FlowViews::driveView" link="action.sysml:29">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="274" width="64" height="37" as="geometry"/>
+            <mxGeometry x="16" y="304" width="64" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«fork»&#xA;split" fqn="Flows::Drive::split" kind="fork" view="FlowViews::driveView" link="action.sysml:33">
           <mxCell style="shape=line;html=0;strokeWidth=6;strokeColor=#000000;fillColor=#000000;verticalLabelPosition=bottom;verticalAlign=top;" vertex="1" parent="n0">
-            <mxGeometry x="120" y="274" width="120" height="10" as="geometry"/>
+            <mxGeometry x="130" y="304" width="120" height="10" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«join»&#xA;sync" fqn="Flows::Drive::sync" kind="join" view="FlowViews::driveView" link="action.sysml:34">
           <mxCell style="shape=line;html=0;strokeWidth=6;strokeColor=#000000;fillColor=#000000;verticalLabelPosition=bottom;verticalAlign=top;" vertex="1" parent="n0">
-            <mxGeometry x="280" y="274" width="120" height="10" as="geometry"/>
+            <mxGeometry x="300" y="304" width="120" height="10" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="final" kind="final" view="FlowViews::driveView" link="action.sysml:35">
           <mxCell style="ellipse;shape=endState;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="351" width="30" height="30" as="geometry"/>
+            <mxGeometry x="16" y="391" width="30" height="30" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«action»&#xA;park" fqn="Flows::Drive::park" kind="action" view="FlowViews::driveView" link="action.sysml:36">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="86" y="351" width="64" height="37" as="geometry"/>
+            <mxGeometry x="96" y="391" width="64" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«decision»&#xA;check" fqn="Flows::Drive::check" kind="decision" view="FlowViews::driveView" link="action.sysml:46">
           <mxCell style="rhombus;html=0;whiteSpace=wrap;verticalLabelPosition=bottom;verticalAlign=top;" vertex="1" parent="n0">
-            <mxGeometry x="190" y="351" width="40" height="40" as="geometry"/>
+            <mxGeometry x="210" y="391" width="40" height="40" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="succession" view="FlowViews::driveView" link="action.sysml:24">
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n4" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="293" y="231"/>
-                <mxPoint x="293" y="230"/>
+                <mxPoint x="328" y="261"/>
+                <mxPoint x="328" y="260"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -103,9 +102,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.3;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n1" target="n7">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="66" y="237"/>
-                <mxPoint x="143" y="237"/>
-                <mxPoint x="143" y="317"/>
+                <mxPoint x="76" y="267"/>
+                <mxPoint x="148" y="267"/>
+                <mxPoint x="148" y="357"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -114,24 +113,29 @@
           <mxCell style="edgeStyle=none;exitX=0.5062;exitY=1;exitPerimeter=0;entryX=0;entryY=0.5;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n2" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="157" y="294"/>
-                <mxPoint x="296" y="294"/>
-                <mxPoint x="296" y="319"/>
+                <mxPoint x="177" y="329"/>
+                <mxPoint x="321" y="329"/>
+                <mxPoint x="321" y="359"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e3" label="" kind="flow" view="FlowViews::driveView" link="action.sysml:52">
-          <mxCell style="edgeStyle=orthogonalEdgeStyle;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.5;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=1;" edge="1" parent="1" source="n2:n2.1" target="n3:n3.0">
-            <mxGeometry relative="1" as="geometry"/>
+          <mxCell style="edgeStyle=none;exitX=0.9167;exitY=0.5;exitPerimeter=0;entryX=0.0833;entryY=0.5;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=1;" edge="1" parent="1" source="n2:n2.1" target="n3:n3.0">
+            <mxGeometry relative="1" as="geometry">
+              <Array as="points">
+                <mxPoint x="242" y="160.5"/>
+                <mxPoint x="242" y="223"/>
+              </Array>
+            </mxGeometry>
           </mxCell>
         </object>
         <object id="e4" label="" kind="succession" view="FlowViews::driveView" link="action.sysml:42">
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n3" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="319" y="286"/>
-                <mxPoint x="350" y="286"/>
+                <mxPoint x="354" y="321"/>
+                <mxPoint x="380" y="321"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -140,9 +144,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.3;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n6" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="88" y="298"/>
-                <mxPoint x="304" y="298"/>
-                <mxPoint x="304" y="317"/>
+                <mxPoint x="98" y="338"/>
+                <mxPoint x="329" y="338"/>
+                <mxPoint x="329" y="357"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -151,17 +155,16 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=0.2469;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n7" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="136" y="319"/>
+                <mxPoint x="156" y="359"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e7" label="" kind="succession" view="FlowViews::driveView" link="action.sysml:40">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.25;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n7" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.7531;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n7" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="220" y="290"/>
-                <mxPoint x="278" y="290"/>
+                <mxPoint x="240" y="264"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -170,7 +173,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n7" target="n6">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="220" y="342"/>
+                <mxPoint x="240" y="382"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -179,7 +182,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n8" target="n11">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="380" y="401"/>
+                <mxPoint x="410" y="451"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -188,8 +191,8 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=1;entryY=0.5;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n10" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="106" y="410"/>
-                <mxPoint x="106" y="406"/>
+                <mxPoint x="121" y="460"/>
+                <mxPoint x="121" y="456"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -198,8 +201,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.7667;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n11" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="250" y="375"/>
-                <mxPoint x="79" y="375"/>
+                <mxPoint x="280" y="425"/>
+                <mxPoint x="89" y="425"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -208,8 +211,8 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=1;entryY=0.5135;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n11" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="210" y="411"/>
-                <mxPoint x="210" y="410"/>
+                <mxPoint x="235" y="461"/>
+                <mxPoint x="235" y="460"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/calc-parameter-definitions.drawio.golden b/internal/ir/view/testdata/calc-parameter-definitions.drawio.golden
index debb1f3447..9a4bd10353 100644
--- a/internal/ir/view/testdata/calc-parameter-definitions.drawio.golden
+++ b/internal/ir/view/testdata/calc-parameter-definitions.drawio.golden
@@ -9,7 +9,7 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«calc def»&#xA;Add" fqn="ParameterCalcs::Add" kind="calc def" view="ParameterCalcViews::definitions" link="calc-parameters.sysml:16">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="76" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n0:n0.0" label="x" fqn="ParameterCalcs::Add::x" kind="parameter" view="ParameterCalcViews::definitions" link="calc-parameters.sysml:17">
@@ -35,7 +35,7 @@
         </object>
         <object id="n1" label="«calc def»&#xA;Scale" fqn="ParameterCalcs::Scale" kind="calc def" view="ParameterCalcViews::definitions" link="calc-parameters.sysml:23">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="156" y="40" width="76" height="37" as="geometry"/>
+            <mxGeometry x="176" y="50" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1:n1.0" label="x" fqn="ParameterCalcs::Scale::x" kind="parameter" view="ParameterCalcViews::definitions" link="calc-parameters.sysml:24">
@@ -75,7 +75,7 @@
         </object>
         <object id="n2" label="«action def»&#xA;Heat" fqn="ParameterCalcs::Heat" kind="action def" view="ParameterCalcViews::definitions" link="calc-parameters.sysml:31">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="117" width="88" height="37" as="geometry"/>
+            <mxGeometry x="50" y="137" width="88" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2:n2.0" label="bread" fqn="ParameterCalcs::Heat::bread" kind="parameter" view="ParameterCalcViews::definitions" link="calc-parameters.sysml:32">
@@ -94,7 +94,7 @@
         </object>
         <object id="n3" label="«constraint def»&#xA;Between" fqn="ParameterCalcs::Between" kind="constraint def" view="ParameterCalcViews::definitions" link="calc-parameters.sysml:36">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="168" y="117" width="112" height="37" as="geometry"/>
+            <mxGeometry x="188" y="137" width="112" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3:n3.0" label="low" fqn="ParameterCalcs::Between::low" kind="parameter" view="ParameterCalcViews::definitions" link="calc-parameters.sysml:37">
diff --git a/internal/ir/view/testdata/calc-parameters.drawio.golden b/internal/ir/view/testdata/calc-parameters.drawio.golden
index 3416418106..8e6375f628 100644
--- a/internal/ir/view/testdata/calc-parameters.drawio.golden
+++ b/internal/ir/view/testdata/calc-parameters.drawio.golden
@@ -9,7 +9,7 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«calc»&#xA;add" fqn="ParameterCalcs::add" kind="calc" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:9">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="54" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="54" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n0:n0.0" label="x" fqn="ParameterCalcs::add::x" kind="parameter" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:10">
@@ -35,27 +35,27 @@
         </object>
         <object id="n1" label="«part def»&#xA;Sensor" fqn="ParameterCalcs::Sensor" kind="part def" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:42">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="134" y="40" width="358" height="212" as="geometry"/>
+            <mxGeometry x="154" y="50" width="378" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«attribute»&#xA;a" fqn="ParameterCalcs::Sensor::a" kind="attribute" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:43">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«attribute»&#xA;b" fqn="ParameterCalcs::Sensor::b" kind="attribute" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:44">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="138" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="148" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«attribute»&#xA;gain" fqn="ParameterCalcs::Sensor::gain" kind="attribute" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:45">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="260" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="280" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«calc»&#xA;sum" fqn="ParameterCalcs::Sensor::sum" kind="calc" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:46">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="16" y="159" width="54" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="54" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5:n5.0" label="x" fqn="ParameterCalcs::Sensor::sum::x" kind="parameter" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:46">
@@ -81,7 +81,7 @@
         </object>
         <object id="n6" label="«calc»&#xA;scaled" fqn="ParameterCalcs::Sensor::scaled" kind="calc" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:47">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="110" y="159" width="72" height="37" as="geometry"/>
+            <mxGeometry x="120" y="179" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6:n6.0" label="factor" fqn="ParameterCalcs::Sensor::scaled::factor" kind="parameter" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:47">
@@ -120,17 +120,17 @@
           </mxCell>
         </object>
         <object id="e0" label="" kind="reference" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:43">
-          <mxCell style="edgeStyle=none;exitX=0.1592;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.1508;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e1" label="" kind="reference" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:44">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n3">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e2" label="" kind="reference" view="ParameterCalcViews::calculations" link="calc-parameters.sysml:45">
-          <mxCell style="edgeStyle=none;exitX=0.8408;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.8492;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
diff --git a/internal/ir/view/testdata/case.drawio.golden b/internal/ir/view/testdata/case.drawio.golden
index 894753c1cb..fa78edb418 100644
--- a/internal/ir/view/testdata/case.drawio.golden
+++ b/internal/ir/view/testdata/case.drawio.golden
@@ -4,103 +4,103 @@
 <!-- notice: part def CaseExamples::Tool holds no case; a case rendering does not show it -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="CaseExamples-caseDiagram" name="CaseExamples::caseDiagram">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1132" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1192" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«use case»&#xA;&#39;Provide Transportation&#39;" fqn="CaseExamples::&#39;Provide Transportation&#39;" kind="use case" view="CaseExamples::caseDiagram" link="case.sysml:27">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="238" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="238" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«subject»&#xA;vehicle" fqn="CaseExamples::&#39;Provide Transportation&#39;::vehicle" kind="subject" view="CaseExamples::caseDiagram" link="case.sysml:28">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="318" y="40" width="81" height="37" as="geometry"/>
+            <mxGeometry x="338" y="50" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«actor»&#xA;driver" fqn="CaseExamples::&#39;Provide Transportation&#39;::driver" kind="actor" view="CaseExamples::caseDiagram" link="case.sysml:29">
           <mxCell style="shape=umlActor;html=0;whiteSpace=wrap;verticalLabelPosition=bottom;verticalAlign=top;" vertex="1" parent="1">
-            <mxGeometry x="439" y="40" width="72" height="37" as="geometry"/>
+            <mxGeometry x="469" y="50" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="objective&#xA;Transport the vehicle and its passengers safely." kind="objective" view="CaseExamples::caseDiagram" link="case.sysml:30">
           <mxCell style="shape=note;html=0;whiteSpace=wrap;size=14;align=left;verticalAlign=top;spacing=4;" vertex="1" parent="1">
-            <mxGeometry x="551" y="40" width="420" height="42" as="geometry"/>
+            <mxGeometry x="591" y="50" width="420" height="42" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«use case»&#xA;addFuel" fqn="CaseExamples::addFuel" kind="use case" view="CaseExamples::caseDiagram" link="case.sysml:25">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="1011" y="40" width="81" height="37" as="geometry"/>
+            <mxGeometry x="1061" y="50" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«actor»&#xA;^fueler" fqn="CaseExamples::&#39;Add Fuel&#39;::fueler" kind="actor" view="CaseExamples::caseDiagram" link="case.sysml:18">
           <mxCell style="shape=umlActor;html=0;whiteSpace=wrap;verticalLabelPosition=bottom;verticalAlign=top;" vertex="1" parent="1">
-            <mxGeometry x="40" y="122" width="81" height="37" as="geometry"/>
+            <mxGeometry x="50" y="142" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«subject»&#xA;^vehicle" fqn="CaseExamples::&#39;Add Fuel&#39;::vehicle" kind="subject" view="CaseExamples::caseDiagram" link="case.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="161" y="122" width="90" height="37" as="geometry"/>
+            <mxGeometry x="181" y="142" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«include use case»&#xA;&#39;enter vehicle&#39;" fqn="CaseExamples::&#39;Provide Transportation&#39;::&#39;enter vehicle&#39;" kind="include use case" view="CaseExamples::caseDiagram" link="case.sysml:39">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="291" y="122" width="155" height="37" as="geometry"/>
+            <mxGeometry x="321" y="142" width="155" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«subject»&#xA;vehicle" fqn="CaseExamples::&#39;Provide Transportation&#39;::&#39;enter vehicle&#39;::vehicle" kind="subject" view="CaseExamples::caseDiagram" link="case.sysml:40">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="486" y="122" width="81" height="37" as="geometry"/>
+            <mxGeometry x="526" y="142" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«actor»&#xA;driver" fqn="CaseExamples::&#39;Provide Transportation&#39;::&#39;enter vehicle&#39;::driver" kind="actor" view="CaseExamples::caseDiagram" link="case.sysml:41">
           <mxCell style="shape=umlActor;html=0;whiteSpace=wrap;verticalLabelPosition=bottom;verticalAlign=top;" vertex="1" parent="1">
-            <mxGeometry x="607" y="122" width="72" height="37" as="geometry"/>
+            <mxGeometry x="657" y="142" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«use case»&#xA;&#39;Drive Vehicle&#39;" fqn="CaseExamples::&#39;Provide Transportation&#39;::&#39;Drive Vehicle&#39;" kind="use case" view="CaseExamples::caseDiagram" link="case.sysml:44">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="199" width="155" height="37" as="geometry"/>
+            <mxGeometry x="50" y="229" width="155" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«subject»&#xA;vehicle" fqn="CaseExamples::&#39;Provide Transportation&#39;::&#39;Drive Vehicle&#39;::vehicle" kind="subject" view="CaseExamples::caseDiagram" link="case.sysml:45">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="235" y="199" width="81" height="37" as="geometry"/>
+            <mxGeometry x="255" y="229" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="«actor»&#xA;driver" fqn="CaseExamples::&#39;Provide Transportation&#39;::&#39;Drive Vehicle&#39;::driver" kind="actor" view="CaseExamples::caseDiagram" link="case.sysml:46">
           <mxCell style="shape=umlActor;html=0;whiteSpace=wrap;verticalLabelPosition=bottom;verticalAlign=top;" vertex="1" parent="1">
-            <mxGeometry x="356" y="199" width="72" height="37" as="geometry"/>
+            <mxGeometry x="386" y="229" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13" label="«analysis def»&#xA;FuelAnalysis" fqn="CaseExamples::FuelAnalysis" kind="analysis def" view="CaseExamples::caseDiagram" link="case.sysml:50">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="468" y="199" width="127" height="37" as="geometry"/>
+            <mxGeometry x="508" y="229" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n14" label="«subject»&#xA;vehicle" fqn="CaseExamples::FuelAnalysis::vehicle" kind="subject" view="CaseExamples::caseDiagram" link="case.sysml:51">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="635" y="199" width="81" height="37" as="geometry"/>
+            <mxGeometry x="685" y="229" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n15" label="objective&#xA;Estimate the fuel remaining after a journey." kind="objective" view="CaseExamples::caseDiagram" link="case.sysml:52">
           <mxCell style="shape=note;html=0;whiteSpace=wrap;size=14;align=left;verticalAlign=top;spacing=4;" vertex="1" parent="1">
-            <mxGeometry x="40" y="276" width="386" height="42" as="geometry"/>
+            <mxGeometry x="50" y="316" width="386" height="42" as="geometry"/>
           </mxCell>
         </object>
         <object id="n16" label="«verification def»&#xA;FuelVerification" fqn="CaseExamples::FuelVerification" kind="verification def" view="CaseExamples::caseDiagram" link="case.sysml:57">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="466" y="276" width="164" height="37" as="geometry"/>
+            <mxGeometry x="486" y="316" width="164" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n17" label="«subject»&#xA;vehicle" fqn="CaseExamples::FuelVerification::vehicle" kind="subject" view="CaseExamples::caseDiagram" link="case.sysml:58">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="670" y="276" width="81" height="37" as="geometry"/>
+            <mxGeometry x="700" y="316" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n18" label="objective" kind="objective" view="CaseExamples::caseDiagram" link="case.sysml:59">
           <mxCell style="shape=note;html=0;whiteSpace=wrap;size=14;align=left;verticalAlign=top;spacing=4;" vertex="1" parent="1">
-            <mxGeometry x="791" y="276" width="100" height="36" as="geometry"/>
+            <mxGeometry x="831" y="316" width="100" height="36" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="«subject»" kind="association" view="CaseExamples::caseDiagram" link="case.sysml:28">
@@ -112,21 +112,20 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n2" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="475" y="24"/>
-                <mxPoint x="298" y="24"/>
-                <mxPoint x="298" y="49"/>
+                <mxPoint x="505" y="34"/>
+                <mxPoint x="313" y="34"/>
+                <mxPoint x="313" y="59"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e2" label="" kind="anchor" view="CaseExamples::caseDiagram" link="case.sysml:30">
-          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.7619;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.7521;exitY=1;exitPerimeter=0;entryX=0;entryY=0.7619;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="298" y="59"/>
-                <mxPoint x="298" y="93"/>
-                <mxPoint x="531" y="93"/>
-                <mxPoint x="531" y="72"/>
+                <mxPoint x="229" y="103"/>
+                <mxPoint x="566" y="103"/>
+                <mxPoint x="566" y="82"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -135,8 +134,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5062;exitY=0;exitPerimeter=0;entryX=0.2469;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n5" target="n4">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="81" y="98"/>
-                <mxPoint x="1031" y="98"/>
+                <mxPoint x="91" y="111"/>
+                <mxPoint x="1081" y="111"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -145,8 +144,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5062;exitY=1;exitPerimeter=0;entryX=0.7556;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n4" target="n6">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="1052" y="102"/>
-                <mxPoint x="229" y="102"/>
+                <mxPoint x="1102" y="119"/>
+                <mxPoint x="249" y="119"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -155,19 +154,18 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.2469;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n0" target="n4">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="159" y="16"/>
-                <mxPoint x="1031" y="16"/>
+                <mxPoint x="169" y="26"/>
+                <mxPoint x="1081" y="26"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e6" label="«include»" kind="include" view="CaseExamples::caseDiagram" link="case.sysml:39">
-          <mxCell style="edgeStyle=none;exitX=0.7521;exitY=1;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n0" target="n7">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n0" target="n7">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="219" y="106"/>
-                <mxPoint x="271" y="106"/>
-                <mxPoint x="271" y="131"/>
+                <mxPoint x="305" y="69"/>
+                <mxPoint x="305" y="151"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -181,9 +179,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n9" target="n7">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="643" y="106"/>
-                <mxPoint x="466" y="106"/>
-                <mxPoint x="466" y="131"/>
+                <mxPoint x="693" y="126"/>
+                <mxPoint x="501" y="126"/>
+                <mxPoint x="501" y="151"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -192,10 +190,10 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.7484;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="159" y="102"/>
-                <mxPoint x="145" y="102"/>
-                <mxPoint x="145" y="179"/>
-                <mxPoint x="156" y="179"/>
+                <mxPoint x="169" y="119"/>
+                <mxPoint x="165" y="119"/>
+                <mxPoint x="165" y="204"/>
+                <mxPoint x="166" y="204"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -209,9 +207,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n12" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="392" y="183"/>
-                <mxPoint x="215" y="183"/>
-                <mxPoint x="215" y="208"/>
+                <mxPoint x="422" y="213"/>
+                <mxPoint x="230" y="213"/>
+                <mxPoint x="230" y="238"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -222,11 +220,12 @@
           </mxCell>
         </object>
         <object id="e13" label="" kind="anchor" view="CaseExamples::caseDiagram" link="case.sysml:52">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=1;entryY=0.2619;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=none;" edge="1" parent="1" source="n13" target="n15">
+          <mxCell style="edgeStyle=none;exitX=0.5039;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2619;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=none;" edge="1" parent="1" source="n13" target="n15">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="447" y="218"/>
-                <mxPoint x="447" y="287"/>
+                <mxPoint x="572" y="291"/>
+                <mxPoint x="461" y="291"/>
+                <mxPoint x="461" y="327"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -240,8 +239,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=none;" edge="1" parent="1" source="n16" target="n18">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="548" y="260"/>
-                <mxPoint x="816" y="260"/>
+                <mxPoint x="568" y="300"/>
+                <mxPoint x="856" y="300"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/feature-membership.drawio.golden b/internal/ir/view/testdata/feature-membership.drawio.golden
index d3fc6b5f9d..0f4cfda2f7 100644
--- a/internal/ir/view/testdata/feature-membership.drawio.golden
+++ b/internal/ir/view/testdata/feature-membership.drawio.golden
@@ -9,41 +9,41 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;APart" fqn="A::APart" kind="part def" view="MembershipViews::structure" link="feature-membership.sysml:9">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="100" height="135" as="geometry"/>
+            <mxGeometry x="50" y="50" width="100" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«port»&#xA;aPort" fqn="A::APart::aPort" kind="port" view="MembershipViews::structure" link="feature-membership.sysml:10">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="63" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«port def»&#xA;APort" fqn="A::APort" kind="port def" view="MembershipViews::structure" link="feature-membership.sysml:7">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="180" y="40" width="76" height="37" as="geometry"/>
+            <mxGeometry x="200" y="50" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«part»&#xA;part1" fqn="A::part1" kind="part" view="MembershipViews::structure" link="feature-membership.sysml:18">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="215" width="104" height="135" as="geometry"/>
+            <mxGeometry x="50" y="245" width="104" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«port»&#xA;^aPort" fqn="A::APart::aPort" kind="port" view="MembershipViews::structure" link="feature-membership.sysml:10">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n3">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«part»&#xA;part2" fqn="A::part2" kind="part" view="MembershipViews::structure" link="feature-membership.sysml:19">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="184" y="215" width="104" height="135" as="geometry"/>
+            <mxGeometry x="204" y="245" width="104" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«port»&#xA;^aPort" fqn="A::APart::aPort" kind="port" view="MembershipViews::structure" link="feature-membership.sysml:10">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="reference" view="MembershipViews::structure" link="feature-membership.sysml:10">
-          <mxCell style="edgeStyle=none;exitX=0.475;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.475;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
@@ -51,38 +51,38 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0.25;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="199" y="141"/>
+                <mxPoint x="219" y="161"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e2" label="" kind="typing" view="MembershipViews::structure" link="feature-membership.sysml:18">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5037;exitPerimeter=0;entryX=0;entryY=0.237;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n3" target="n0">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5034;exitPerimeter=0;entryX=0;entryY=0.2207;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n3" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="24" y="283"/>
-                <mxPoint x="24" y="72"/>
+                <mxPoint x="34" y="318"/>
+                <mxPoint x="34" y="82"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e3" label="" kind="reference" view="MembershipViews::structure" link="feature-membership.sysml:10">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n3" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n3" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="" kind="typing" view="MembershipViews::structure" link="feature-membership.sysml:19">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5037;exitPerimeter=0;entryX=1;entryY=0.237;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n5" target="n0">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5034;exitPerimeter=0;entryX=1;entryY=0.2207;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n5" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="162" y="283"/>
-                <mxPoint x="162" y="72"/>
+                <mxPoint x="177" y="318"/>
+                <mxPoint x="177" y="82"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e5" label="" kind="reference" view="MembershipViews::structure" link="feature-membership.sysml:10">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n5" target="n6">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n5" target="n6">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
diff --git a/internal/ir/view/testdata/filters.drawio.golden b/internal/ir/view/testdata/filters.drawio.golden
index 08cbe54943..7e3dd2c9fc 100644
--- a/internal/ir/view/testdata/filters.drawio.golden
+++ b/internal/ir/view/testdata/filters.drawio.golden
@@ -9,17 +9,17 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Radio" fqn="Systems::Radio" kind="part def" view="FilteredViews::safetyView" link="filters.sysml:12">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="76" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part def»&#xA;Airbag" fqn="Systems::Airbag" kind="part def" view="FilteredViews::safetyView" link="filters.sysml:11">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="156" y="40" width="76" height="37" as="geometry"/>
+            <mxGeometry x="176" y="50" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«part def»&#xA;Brake" fqn="Systems::Braking::Brake" kind="part def" view="FilteredViews::safetyView" link="filters.sysml:5">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="117" width="76" height="37" as="geometry"/>
+            <mxGeometry x="50" y="137" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
       </root>
diff --git a/internal/ir/view/testdata/general-definition.drawio.golden b/internal/ir/view/testdata/general-definition.drawio.golden
index de5ad07bb1..0a267281e3 100644
--- a/internal/ir/view/testdata/general-definition.drawio.golden
+++ b/internal/ir/view/testdata/general-definition.drawio.golden
@@ -9,72 +9,72 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Vehicle" fqn="VehicleStructure::Vehicle" kind="part def" view="GeneralViews::definitionView" link="general.sysml:4">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="81" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part def»&#xA;Chassis" fqn="VehicleStructure::Chassis" kind="part def" view="GeneralViews::definitionView" link="general.sysml:9">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="161" y="40" width="81" height="37" as="geometry"/>
+            <mxGeometry x="181" y="50" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«part def»&#xA;LightChassis" fqn="VehicleStructure::LightChassis" kind="part def" view="GeneralViews::definitionView" link="general.sysml:10">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="282" y="40" width="127" height="37" as="geometry"/>
+            <mxGeometry x="312" y="50" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«part def»&#xA;Driver" fqn="VehicleStructure::Driver" kind="part def" view="GeneralViews::definitionView" link="general.sysml:11">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="449" y="40" width="76" height="37" as="geometry"/>
+            <mxGeometry x="489" y="50" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«action def»&#xA;Brake" fqn="VehicleStructure::Brake" kind="action def" view="GeneralViews::definitionView" link="general.sysml:12">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="117" width="88" height="37" as="geometry"/>
+            <mxGeometry x="50" y="137" width="88" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«part»&#xA;vehicle" fqn="VehicleStructure::vehicle" kind="part" view="GeneralViews::definitionView" link="general.sysml:14">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="168" y="117" width="81" height="37" as="geometry"/>
+            <mxGeometry x="188" y="137" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«part»&#xA;heavyVehicle" fqn="VehicleStructure::heavyVehicle" kind="part" view="GeneralViews::definitionView" link="general.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="289" y="117" width="127" height="37" as="geometry"/>
+            <mxGeometry x="319" y="137" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«action»&#xA;brake" fqn="VehicleStructure::brake" kind="action" view="GeneralViews::definitionView" link="general.sysml:20">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="456" y="117" width="64" height="37" as="geometry"/>
+            <mxGeometry x="496" y="137" width="64" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«attribute»&#xA;Vehicle::mass" fqn="VehicleStructure::Vehicle::mass" kind="attribute" view="GeneralViews::definitionView" link="general.sysml:5">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="194" width="136" height="37" as="geometry"/>
+            <mxGeometry x="50" y="224" width="136" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«part»&#xA;chassis" fqn="VehicleStructure::Vehicle::chassis" kind="part" view="GeneralViews::definitionView" link="general.sysml:6">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="216" y="194" width="81" height="37" as="geometry"/>
+            <mxGeometry x="236" y="224" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«part»&#xA;driver" fqn="VehicleStructure::Vehicle::driver" kind="part" view="GeneralViews::definitionView" link="general.sysml:7">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="337" y="194" width="72" height="37" as="geometry"/>
+            <mxGeometry x="367" y="224" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«attribute»&#xA;vehicle::mass" fqn="VehicleStructure::vehicle::mass" kind="attribute" view="GeneralViews::definitionView" link="general.sysml:15">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="449" y="194" width="136" height="37" as="geometry"/>
+            <mxGeometry x="489" y="224" width="136" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="«attribute»&#xA;heavyVehicle::mass" fqn="VehicleStructure::heavyVehicle::mass" kind="attribute" view="GeneralViews::definitionView" link="general.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="271" width="183" height="37" as="geometry"/>
+            <mxGeometry x="50" y="311" width="183" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13" label="«part def»&#xA;Engine" fqn="VehicleStructure::Powertrain::Engine" kind="part def" view="GeneralViews::definitionView" link="general.sysml:23">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="263" y="271" width="76" height="37" as="geometry"/>
+            <mxGeometry x="283" y="311" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="specialization" view="GeneralViews::definitionView" link="general.sysml:10">
@@ -86,8 +86,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5062;exitY=0;exitPerimeter=0;entryX=0.7531;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n5" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="209" y="97"/>
-                <mxPoint x="101" y="97"/>
+                <mxPoint x="229" y="120"/>
+                <mxPoint x="111" y="120"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -96,9 +96,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5039;exitY=0;exitPerimeter=0;entryX=1;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n6" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="353" y="93"/>
-                <mxPoint x="140" y="93"/>
-                <mxPoint x="140" y="68"/>
+                <mxPoint x="383" y="104"/>
+                <mxPoint x="152" y="104"/>
+                <mxPoint x="152" y="78"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -107,9 +107,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n7" target="n4">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="488" y="170"/>
-                <mxPoint x="152" y="170"/>
-                <mxPoint x="152" y="145"/>
+                <mxPoint x="528" y="190"/>
+                <mxPoint x="168" y="190"/>
+                <mxPoint x="168" y="165"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -118,8 +118,8 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="24" y="59"/>
-                <mxPoint x="24" y="203"/>
+                <mxPoint x="34" y="69"/>
+                <mxPoint x="34" y="233"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -128,22 +128,19 @@
           <mxCell style="edgeStyle=none;exitX=0.5062;exitY=0;exitPerimeter=0;entryX=1;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n9" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="257" y="172"/>
-                <mxPoint x="265" y="172"/>
-                <mxPoint x="265" y="68"/>
+                <mxPoint x="277" y="195"/>
+                <mxPoint x="285" y="195"/>
+                <mxPoint x="285" y="78"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e6" label="" kind="composition" view="GeneralViews::definitionView" link="general.sysml:6">
-          <mxCell style="edgeStyle=none;exitX=0.5062;exitY=1;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n9">
+          <mxCell style="edgeStyle=none;exitX=0.5062;exitY=1;exitPerimeter=0;entryX=0.7531;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="81" y="101"/>
-                <mxPoint x="148" y="101"/>
-                <mxPoint x="148" y="176"/>
-                <mxPoint x="200" y="176"/>
-                <mxPoint x="200" y="203"/>
+                <mxPoint x="91" y="112"/>
+                <mxPoint x="297" y="112"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -152,8 +149,8 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n10" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="433" y="213"/>
-                <mxPoint x="433" y="68"/>
+                <mxPoint x="470" y="243"/>
+                <mxPoint x="470" y="78"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -162,10 +159,10 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="144" y="59"/>
-                <mxPoint x="144" y="175"/>
-                <mxPoint x="313" y="175"/>
-                <mxPoint x="313" y="203"/>
+                <mxPoint x="160" y="69"/>
+                <mxPoint x="160" y="203"/>
+                <mxPoint x="342" y="203"/>
+                <mxPoint x="342" y="233"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -174,9 +171,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n11" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="517" y="178"/>
-                <mxPoint x="192" y="178"/>
-                <mxPoint x="192" y="203"/>
+                <mxPoint x="557" y="208"/>
+                <mxPoint x="211" y="208"/>
+                <mxPoint x="211" y="233"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -185,9 +182,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5062;exitY=1;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n5" target="n11">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="209" y="173"/>
-                <mxPoint x="425" y="173"/>
-                <mxPoint x="425" y="203"/>
+                <mxPoint x="229" y="199"/>
+                <mxPoint x="462" y="199"/>
+                <mxPoint x="462" y="233"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -196,8 +193,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5027;exitY=0;exitPerimeter=0;entryX=0.75;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n12" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="132" y="251"/>
-                <mxPoint x="142" y="251"/>
+                <mxPoint x="142" y="286"/>
+                <mxPoint x="152" y="286"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -206,9 +203,9 @@
           <mxCell style="edgeStyle=none;exitX=0.252;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n6" target="n12">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="321" y="251"/>
-                <mxPoint x="243" y="251"/>
-                <mxPoint x="243" y="280"/>
+                <mxPoint x="351" y="286"/>
+                <mxPoint x="258" y="286"/>
+                <mxPoint x="258" y="320"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/general-package.drawio.golden b/internal/ir/view/testdata/general-package.drawio.golden
index c61283e0f5..bd1f6d90b6 100644
--- a/internal/ir/view/testdata/general-package.drawio.golden
+++ b/internal/ir/view/testdata/general-package.drawio.golden
@@ -9,27 +9,27 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«package»&#xA;VehicleStructure" fqn="VehicleStructure" kind="package" view="GeneralViews::packageView" link="general.sysml:1">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="164" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="164" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«package»&#xA;Powertrain" fqn="VehicleStructure::Powertrain" kind="package" view="GeneralViews::packageView" link="general.sysml:22">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="244" y="40" width="109" height="37" as="geometry"/>
+            <mxGeometry x="264" y="50" width="109" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«package»&#xA;VehicleRequirements" fqn="VehicleRequirements" kind="package" view="GeneralViews::packageView" link="general.sysml:27">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="393" y="40" width="192" height="37" as="geometry"/>
+            <mxGeometry x="423" y="50" width="192" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«package»&#xA;VehicleVerification" fqn="VehicleVerification" kind="package" view="GeneralViews::packageView" link="general.sysml:62">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="117" width="192" height="37" as="geometry"/>
+            <mxGeometry x="50" y="137" width="192" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«package»&#xA;GeneralViews" fqn="GeneralViews" kind="package" view="GeneralViews::packageView" link="general.sysml:91">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="272" y="117" width="127" height="37" as="geometry"/>
+            <mxGeometry x="292" y="137" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="containment" view="GeneralViews::packageView" link="general.sysml:22">
@@ -41,8 +41,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n2" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="489" y="24"/>
-                <mxPoint x="163" y="24"/>
+                <mxPoint x="519" y="34"/>
+                <mxPoint x="173" y="34"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -51,8 +51,8 @@
           <mxCell style="edgeStyle=none;exitX=0.25;exitY=0;exitPerimeter=0;entryX=0.25;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n3" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="88" y="97"/>
-                <mxPoint x="81" y="97"/>
+                <mxPoint x="98" y="112"/>
+                <mxPoint x="91" y="112"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -61,9 +61,9 @@
           <mxCell style="edgeStyle=none;exitX=0.75;exitY=0;exitPerimeter=0;entryX=0;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n3" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="184" y="93"/>
-                <mxPoint x="224" y="93"/>
-                <mxPoint x="224" y="68"/>
+                <mxPoint x="194" y="108"/>
+                <mxPoint x="239" y="108"/>
+                <mxPoint x="239" y="78"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -72,9 +72,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n3" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="136" y="101"/>
-                <mxPoint x="373" y="101"/>
-                <mxPoint x="373" y="68"/>
+                <mxPoint x="146" y="116"/>
+                <mxPoint x="398" y="116"/>
+                <mxPoint x="398" y="78"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/general-requirement.drawio.golden b/internal/ir/view/testdata/general-requirement.drawio.golden
index 40324dc283..b8a27cca69 100644
--- a/internal/ir/view/testdata/general-requirement.drawio.golden
+++ b/internal/ir/view/testdata/general-requirement.drawio.golden
@@ -4,83 +4,83 @@
 <!-- notice: 4 exposed standard library element(s) not drawn; a requirement rendering draws the model's own elements -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="GeneralViews-requirementView" name="GeneralViews::requirementView">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1664" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1714" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«requirement def»&#xA;MassRequirement&#xA;id R1, “The total mass of the vehicle shall not exceed the stated...”" fqn="VehicleRequirements::MassRequirement" kind="requirement def" view="GeneralViews::requirementView" link="general.sysml:33">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="596" height="54" as="geometry"/>
+            <mxGeometry x="50" y="50" width="596" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«requirement def»&#xA;StoppingRequirement&#xA;id R2, “The vehicle shall stop within the stated distance.”" fqn="VehicleRequirements::StoppingRequirement" kind="requirement def" view="GeneralViews::requirementView" link="general.sysml:39">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="676" y="40" width="512" height="54" as="geometry"/>
+            <mxGeometry x="696" y="50" width="512" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«requirement def»&#xA;EmergencyStopRequirement&#xA;id R3" fqn="VehicleRequirements::EmergencyStopRequirement" kind="requirement def" view="GeneralViews::requirementView" link="general.sysml:42">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="1228" y="40" width="238" height="54" as="geometry"/>
+            <mxGeometry x="1258" y="50" width="238" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«requirement»&#xA;vehicleMass&#xA;id R1.1" fqn="VehicleRequirements::vehicleMass" kind="requirement" view="GeneralViews::requirementView" link="general.sysml:44">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="1506" y="40" width="118" height="54" as="geometry"/>
+            <mxGeometry x="1546" y="50" width="118" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«requirement»&#xA;chassisMass&#xA;id R1.2" fqn="VehicleRequirements::chassisMass" kind="requirement" view="GeneralViews::requirementView" link="general.sysml:47">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="134" width="118" height="54" as="geometry"/>
+            <mxGeometry x="50" y="154" width="118" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«requirement»&#xA;emergencyStop&#xA;id R3.1" fqn="VehicleRequirements::emergencyStop" kind="requirement" view="GeneralViews::requirementView" link="general.sysml:48">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="198" y="134" width="136" height="54" as="geometry"/>
+            <mxGeometry x="218" y="154" width="136" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«part def»&#xA;LightChassis" fqn="VehicleStructure::LightChassis" kind="part def" view="GeneralViews::requirementView" link="general.sysml:10">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="374" y="134" width="127" height="37" as="geometry"/>
+            <mxGeometry x="404" y="154" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«part»&#xA;vehicle" fqn="VehicleStructure::vehicle" kind="part" view="GeneralViews::requirementView" link="general.sysml:14">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="541" y="134" width="81" height="37" as="geometry"/>
+            <mxGeometry x="581" y="154" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«part»&#xA;heavyVehicle" fqn="VehicleStructure::heavyVehicle" kind="part" view="GeneralViews::requirementView" link="general.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="228" width="127" height="37" as="geometry"/>
+            <mxGeometry x="50" y="258" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«action»&#xA;brake" fqn="VehicleStructure::brake" kind="action" view="GeneralViews::requirementView" link="general.sysml:20">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="207" y="228" width="64" height="37" as="geometry"/>
+            <mxGeometry x="227" y="258" width="64" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«verification def»&#xA;MassTest" fqn="VehicleVerification::MassTest" kind="verification def" view="GeneralViews::requirementView" link="general.sysml:67">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="311" y="228" width="124" height="37" as="geometry"/>
+            <mxGeometry x="341" y="258" width="124" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«verification»&#xA;lightMassTest" fqn="VehicleVerification::lightMassTest" kind="verification" view="GeneralViews::requirementView" link="general.sysml:74">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="475" y="228" width="136" height="37" as="geometry"/>
+            <mxGeometry x="515" y="258" width="136" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="«verification»&#xA;heavyMassTest" fqn="VehicleVerification::heavyMassTest" kind="verification" view="GeneralViews::requirementView" link="general.sysml:77">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="305" width="136" height="37" as="geometry"/>
+            <mxGeometry x="50" y="345" width="136" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13" label="«verification def»&#xA;StopTest" fqn="VehicleVerification::StopTest" kind="verification def" view="GeneralViews::requirementView" link="general.sysml:80">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="216" y="305" width="124" height="37" as="geometry"/>
+            <mxGeometry x="236" y="345" width="124" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n14" label="«verification»&#xA;stopTest" fqn="VehicleVerification::stopTest" kind="verification" view="GeneralViews::requirementView" link="general.sysml:86">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="380" y="305" width="100" height="37" as="geometry"/>
+            <mxGeometry x="410" y="345" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="specialization" view="GeneralViews::requirementView" link="general.sysml:42">
@@ -92,19 +92,18 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.2593;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n3" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="1565" y="24"/>
-                <mxPoint x="656" y="24"/>
-                <mxPoint x="656" y="54"/>
+                <mxPoint x="1605" y="34"/>
+                <mxPoint x="671" y="34"/>
+                <mxPoint x="671" y="64"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e2" label="" kind="typing" view="GeneralViews::requirementView" link="general.sysml:47">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n4" target="n0">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0.25;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n4" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="24" y="161"/>
-                <mxPoint x="24" y="81"/>
+                <mxPoint x="199" y="181"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -113,8 +112,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.2521;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n5" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="266" y="111"/>
-                <mxPoint x="1288" y="111"/>
+                <mxPoint x="286" y="121"/>
+                <mxPoint x="1318" y="121"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -123,9 +122,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.2593;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n4" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="99" y="113"/>
-                <mxPoint x="1482" y="113"/>
-                <mxPoint x="1482" y="54"/>
+                <mxPoint x="109" y="127"/>
+                <mxPoint x="1513" y="127"/>
+                <mxPoint x="1513" y="64"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -134,8 +133,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5039;exitY=0;exitPerimeter=0;entryX=0.7542;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n6" target="n4">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="438" y="116"/>
-                <mxPoint x="129" y="116"/>
+                <mxPoint x="468" y="132"/>
+                <mxPoint x="139" y="132"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -144,7 +143,7 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0.7542;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n7" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="1595" y="153"/>
+                <mxPoint x="1635" y="173"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -153,9 +152,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5039;exitY=0;exitPerimeter=0;entryX=0;entryY=0.5;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n8" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="104" y="208"/>
-                <mxPoint x="1486" y="208"/>
-                <mxPoint x="1486" y="67"/>
+                <mxPoint x="114" y="225"/>
+                <mxPoint x="1521" y="225"/>
+                <mxPoint x="1521" y="77"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -164,18 +163,18 @@
           <mxCell style="edgeStyle=none;exitX=0.5062;exitY=0;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n7" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="582" y="118"/>
-                <mxPoint x="300" y="118"/>
+                <mxPoint x="622" y="138"/>
+                <mxPoint x="320" y="138"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e9" label="«allocate»" kind="allocate" view="GeneralViews::requirementView" link="general.sysml:59">
-          <mxCell style="edgeStyle=none;exitX=0.25;exitY=1;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n5" target="n9">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n5" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="232" y="212"/>
-                <mxPoint x="239" y="212"/>
+                <mxPoint x="286" y="233"/>
+                <mxPoint x="275" y="233"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -184,9 +183,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n10" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="373" y="200"/>
-                <mxPoint x="1490" y="200"/>
-                <mxPoint x="1490" y="81"/>
+                <mxPoint x="403" y="233"/>
+                <mxPoint x="1529" y="233"/>
+                <mxPoint x="1529" y="91"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -195,7 +194,7 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0.5;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n11" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="1565" y="247"/>
+                <mxPoint x="1605" y="277"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -204,30 +203,28 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.2542;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n12" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="108" y="289"/>
-                <mxPoint x="1536" y="289"/>
+                <mxPoint x="118" y="324"/>
+                <mxPoint x="1576" y="324"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e13" label="«verify»" fqn="VehicleVerification::StopTest::emergencyStop" kind="verify" view="GeneralViews::requirementView" link="general.sysml:83">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.5;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n13" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n13" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="278" y="281"/>
-                <mxPoint x="287" y="281"/>
-                <mxPoint x="287" y="204"/>
-                <mxPoint x="266" y="204"/>
+                <mxPoint x="202" y="364"/>
+                <mxPoint x="202" y="195"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e14" label="«verify»" kind="verify" view="GeneralViews::requirementView" link="general.sysml:83">
-          <mxCell style="edgeStyle=none;exitX=0.75;exitY=0;exitPerimeter=0;entryX=0.75;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n14" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.75;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n14" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="455" y="204"/>
-                <mxPoint x="300" y="204"/>
+                <mxPoint x="460" y="316"/>
+                <mxPoint x="320" y="316"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/glyphs-action.drawio.golden b/internal/ir/view/testdata/glyphs-action.drawio.golden
index 061105404a..04d931ba7f 100644
--- a/internal/ir/view/testdata/glyphs-action.drawio.golden
+++ b/internal/ir/view/testdata/glyphs-action.drawio.golden
@@ -9,12 +9,12 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«action def»&#xA;Fill" fqn="NotationGlyphs::Fill" kind="action def" view="NotationGlyphs::Diagrams::fillGlyphs" link="notation-glyphs.sysml:44">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="200" height="135" as="geometry"/>
+            <mxGeometry x="50" y="50" width="210" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«action»&#xA;open" fqn="NotationGlyphs::Fill::open" kind="action" view="NotationGlyphs::Diagrams::fillGlyphs" link="notation-glyphs.sysml:45">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="64" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="64" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1:n1.0" label="water" fqn="NotationGlyphs::Fill::open::water" kind="parameter" view="NotationGlyphs::Diagrams::fillGlyphs" link="notation-glyphs.sysml:46">
@@ -26,7 +26,7 @@
         </object>
         <object id="n2" label="«action»&#xA;pour" fqn="NotationGlyphs::Fill::pour" kind="action" view="NotationGlyphs::Diagrams::fillGlyphs" link="notation-glyphs.sysml:48">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="120" y="82" width="64" height="37" as="geometry"/>
+            <mxGeometry x="130" y="92" width="64" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2:n2.0" label="water" fqn="NotationGlyphs::Fill::pour::water" kind="parameter" view="NotationGlyphs::Diagrams::fillGlyphs" link="notation-glyphs.sysml:49">
diff --git a/internal/ir/view/testdata/glyphs-definition.drawio.golden b/internal/ir/view/testdata/glyphs-definition.drawio.golden
index bd276efcfd..d87d80d0c7 100644
--- a/internal/ir/view/testdata/glyphs-definition.drawio.golden
+++ b/internal/ir/view/testdata/glyphs-definition.drawio.golden
@@ -9,67 +9,67 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Plant" fqn="NotationGlyphs::Plant" kind="part def" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:15">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="76" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;tank" fqn="NotationGlyphs::Plant::tank" kind="part" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="156" y="40" width="54" height="37" as="geometry"/>
+            <mxGeometry x="176" y="50" width="54" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«part»&#xA;spare" fqn="NotationGlyphs::Plant::spare" kind="part" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:21">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="250" y="40" width="63" height="37" as="geometry"/>
+            <mxGeometry x="280" y="50" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«timeslice»&#xA;filling" fqn="NotationGlyphs::Plant::filling" kind="timeslice" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="353" y="40" width="82" height="37" as="geometry"/>
+            <mxGeometry x="393" y="50" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«snapshot»&#xA;full" fqn="NotationGlyphs::Plant::full" kind="snapshot" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:19">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="117" width="76" height="37" as="geometry"/>
+            <mxGeometry x="50" y="137" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«occurrence»&#xA;startup" fqn="NotationGlyphs::Plant::startup" kind="occurrence" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:20">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="156" y="117" width="88" height="37" as="geometry"/>
+            <mxGeometry x="176" y="137" width="88" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«requirement def»&#xA;LevelReq" fqn="NotationGlyphs::LevelReq" kind="requirement def" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:31">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="284" y="117" width="118" height="37" as="geometry"/>
+            <mxGeometry x="314" y="137" width="118" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«require constraint»&#xA;keepLevel" fqn="NotationGlyphs::LevelReq::keepLevel" kind="require constraint" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:33">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="442" y="117" width="136" height="37" as="geometry"/>
+            <mxGeometry x="482" y="137" width="136" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«assume constraint»&#xA;lowLevel" fqn="NotationGlyphs::LevelReq::lowLevel" kind="assume constraint" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:34">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="194" width="130" height="37" as="geometry"/>
+            <mxGeometry x="50" y="224" width="130" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«constraint»&#xA;bounded" fqn="NotationGlyphs::bounded" kind="constraint" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="210" y="194" width="88" height="37" as="geometry"/>
+            <mxGeometry x="230" y="224" width="88" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«constraint»&#xA;tight" fqn="NotationGlyphs::tight" kind="constraint" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:27">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="338" y="194" width="88" height="37" as="geometry"/>
+            <mxGeometry x="368" y="224" width="88" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«requirement»&#xA;capacity" fqn="NotationGlyphs::capacity" kind="requirement" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:40">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="466" y="194" width="94" height="37" as="geometry"/>
+            <mxGeometry x="506" y="224" width="94" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="«assert constraint»&#xA;asserted" fqn="NotationGlyphs::capacity::asserted" kind="assert constraint" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:42">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="271" width="130" height="37" as="geometry"/>
+            <mxGeometry x="50" y="311" width="130" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="composition" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:16">
@@ -86,8 +86,8 @@
           <mxCell style="edgeStyle=none;exitX=0.75;exitY=0;exitPerimeter=0;entryX=0.254;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="97" y="24"/>
-                <mxPoint x="266" y="24"/>
+                <mxPoint x="107" y="34"/>
+                <mxPoint x="296" y="34"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -96,8 +96,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.2561;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=oval;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="78" y="16"/>
-                <mxPoint x="374" y="16"/>
+                <mxPoint x="88" y="26"/>
+                <mxPoint x="414" y="26"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -111,28 +111,26 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="136" y="59"/>
-                <mxPoint x="136" y="126"/>
+                <mxPoint x="151" y="69"/>
+                <mxPoint x="151" y="146"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e6" label="require" fqn="NotationGlyphs::LevelReq::bounded" kind="require" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:36">
-          <mxCell style="edgeStyle=none;exitX=0.2542;exitY=1;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n6" target="n9">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n6" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="314" y="178"/>
-                <mxPoint x="276" y="178"/>
+                <mxPoint x="296" y="156"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e7" label="assume" fqn="NotationGlyphs::LevelReq::tight" kind="assume" view="NotationGlyphs::Diagrams::definitionGlyphs" link="notation-glyphs.sysml:37">
-          <mxCell style="edgeStyle=none;exitX=0.7542;exitY=1;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n6" target="n10">
+          <mxCell style="edgeStyle=none;exitX=0.2542;exitY=1;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n6" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="373" y="174"/>
-                <mxPoint x="382" y="174"/>
+                <mxPoint x="344" y="233"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -146,9 +144,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n6" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="343" y="170"/>
-                <mxPoint x="190" y="170"/>
-                <mxPoint x="190" y="203"/>
+                <mxPoint x="373" y="199"/>
+                <mxPoint x="205" y="199"/>
+                <mxPoint x="205" y="233"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -157,7 +155,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n11" target="n12">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="513" y="280"/>
+                <mxPoint x="553" y="320"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/glyphs-interconnection.drawio.golden b/internal/ir/view/testdata/glyphs-interconnection.drawio.golden
index 391ef5c3bb..b5f022ca48 100644
--- a/internal/ir/view/testdata/glyphs-interconnection.drawio.golden
+++ b/internal/ir/view/testdata/glyphs-interconnection.drawio.golden
@@ -9,27 +9,27 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part»&#xA;line" fqn="NotationGlyphs::line" kind="part" view="NotationGlyphs::Diagrams::lineGlyphs" link="notation-glyphs.sysml:58">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="300" height="233" as="geometry"/>
+            <mxGeometry x="50" y="50" width="310" height="253" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;^a" fqn="NotationGlyphs::Line::a" kind="part" view="NotationGlyphs::Diagrams::lineGlyphs" link="notation-glyphs.sysml:54">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="114" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«attribute»&#xA;^level" fqn="NotationGlyphs::Tank::level" kind="attribute" view="NotationGlyphs::Diagrams::lineGlyphs" link="notation-glyphs.sysml:12">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«part»&#xA;^b" fqn="NotationGlyphs::Line::b" kind="part" view="NotationGlyphs::Diagrams::lineGlyphs" link="notation-glyphs.sysml:55">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="170" y="82" width="114" height="135" as="geometry"/>
+            <mxGeometry x="180" y="92" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«attribute»&#xA;^level" fqn="NotationGlyphs::Tank::level" kind="attribute" view="NotationGlyphs::Diagrams::lineGlyphs" link="notation-glyphs.sysml:12">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n3">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="«succession flow»" kind="succession flow" view="NotationGlyphs::Diagrams::lineGlyphs" link="notation-glyphs.sysml:56">
diff --git a/internal/ir/view/testdata/glyphs-mixed.drawio.golden b/internal/ir/view/testdata/glyphs-mixed.drawio.golden
index 3e277b8168..53f0e2a915 100644
--- a/internal/ir/view/testdata/glyphs-mixed.drawio.golden
+++ b/internal/ir/view/testdata/glyphs-mixed.drawio.golden
@@ -3,68 +3,68 @@
 <!-- 7 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="NotationGlyphs-Diagrams-mixedGlyphs" name="NotationGlyphs::Diagrams::mixedGlyphs">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1294" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1374" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«requirement def»&#xA;LevelReq" fqn="NotationGlyphs::LevelReq" kind="requirement def" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:31">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="118" height="135" as="geometry"/>
+            <mxGeometry x="50" y="50" width="118" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«frame»&#xA;safety" fqn="NotationGlyphs::LevelReq::safety" kind="frame" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:35">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«requirement»&#xA;NotationGlyphs::levelReq" fqn="NotationGlyphs::levelReq" kind="requirement" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:39">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="198" y="40" width="238" height="37" as="geometry"/>
+            <mxGeometry x="218" y="50" width="238" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«requirement»&#xA;capacity" fqn="NotationGlyphs::capacity" kind="requirement" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:40">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="476" y="40" width="778" height="485" as="geometry"/>
+            <mxGeometry x="506" y="50" width="818" height="535" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«require constraint»&#xA;capacity::levelReq" fqn="NotationGlyphs::capacity::levelReq" kind="require constraint" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:41">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n3">
-            <mxGeometry x="16" y="82" width="576" height="387" as="geometry"/>
+            <mxGeometry x="16" y="92" width="606" height="427" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«subject»&#xA;^plant" fqn="NotationGlyphs::LevelReq::plant" kind="subject" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:32">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n5">
-            <mxGeometry x="16" y="82" width="198" height="212" as="geometry"/>
+            <mxGeometry x="16" y="92" width="208" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«part»&#xA;^tank" fqn="NotationGlyphs::Plant::tank" kind="part" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n6">
-            <mxGeometry x="16" y="82" width="63" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«part»&#xA;^pump" fqn="NotationGlyphs::Plant::pump" kind="part" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n6">
-            <mxGeometry x="119" y="82" width="63" height="37" as="geometry"/>
+            <mxGeometry x="129" y="92" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«part»&#xA;^spare" fqn="NotationGlyphs::Plant::spare" kind="part" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:21">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n6">
-            <mxGeometry x="16" y="159" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«require constraint»&#xA;^keepLevel" fqn="NotationGlyphs::LevelReq::keepLevel" kind="require constraint" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:33">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="254" y="82" width="136" height="37" as="geometry"/>
+            <mxGeometry x="274" y="92" width="136" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«assume constraint»&#xA;^lowLevel" fqn="NotationGlyphs::LevelReq::lowLevel" kind="assume constraint" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:34">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="430" y="82" width="130" height="37" as="geometry"/>
+            <mxGeometry x="460" y="92" width="130" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="«require constraint»&#xA;^bounded" fqn="NotationGlyphs::LevelReq::bounded" kind="require constraint" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:36">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="16" y="334" width="136" height="37" as="geometry"/>
+            <mxGeometry x="16" y="374" width="136" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12:n12.0" label="^x" fqn="NotationGlyphs::Bounded::x" kind="port" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:24">
@@ -76,7 +76,7 @@
         </object>
         <object id="n13" label="«assume constraint»&#xA;^tight" fqn="NotationGlyphs::LevelReq::tight" kind="assume constraint" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:37">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="192" y="334" width="130" height="37" as="geometry"/>
+            <mxGeometry x="202" y="374" width="130" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13:n13.0" label="^x" fqn="NotationGlyphs::Bounded::x" kind="port" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:24">
@@ -88,12 +88,12 @@
         </object>
         <object id="n14" label="«assert constraint»&#xA;asserted" fqn="NotationGlyphs::capacity::asserted" kind="assert constraint" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:42">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n3">
-            <mxGeometry x="632" y="82" width="130" height="37" as="geometry"/>
+            <mxGeometry x="672" y="92" width="130" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n15" label="«constraint»&#xA;NotationGlyphs::bounded" fqn="NotationGlyphs::bounded" kind="constraint" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="565" width="229" height="37" as="geometry"/>
+            <mxGeometry x="50" y="635" width="229" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n15:n15.0" label="^x" fqn="NotationGlyphs::Bounded::x" kind="port" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:24">
@@ -105,7 +105,7 @@
         </object>
         <object id="n16" label="«constraint»&#xA;NotationGlyphs::tight" fqn="NotationGlyphs::tight" kind="constraint" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:27">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="309" y="565" width="210" height="37" as="geometry"/>
+            <mxGeometry x="329" y="635" width="210" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n16:n16.0" label="^x" fqn="NotationGlyphs::Bounded::x" kind="port" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:24">
@@ -117,54 +117,54 @@
         </object>
         <object id="n4" label="«view»&#xA;tankView" fqn="NotationGlyphs::Diagrams::tankView" kind="view" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:96">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="559" y="565" width="90" height="37" as="geometry"/>
+            <mxGeometry x="589" y="635" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n17" label="«part def»&#xA;Tank" fqn="NotationGlyphs::Tank" kind="part def" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:11">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="642" width="114" height="135" as="geometry"/>
+            <mxGeometry x="50" y="722" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n18" label="«attribute»&#xA;level" fqn="NotationGlyphs::Tank::level" kind="attribute" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:12">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n17">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="frame" kind="frame" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:35">
-          <mxCell style="edgeStyle=none;exitX=0.4407;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.4407;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e1" label="require" kind="require" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:41">
-          <mxCell style="edgeStyle=none;exitX=0.3907;exitY=0.0866;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n3" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.39;exitY=0.0785;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n3" target="n5">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e2" label="assert" kind="assert" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:42">
-          <mxCell style="edgeStyle=none;exitX=0.8959;exitY=0.0866;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n3" target="n14">
+          <mxCell style="edgeStyle=none;exitX=0.901;exitY=0.0785;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n3" target="n14">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e3" label="" kind="reference" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n17" target="n18">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n17" target="n18">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="" kind="typing" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:39">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=1;entryY=0.2519;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n2" target="n0">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=1;entryY=0.2483;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n2" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="178" y="59"/>
-                <mxPoint x="178" y="74"/>
+                <mxPoint x="193" y="69"/>
+                <mxPoint x="193" y="86"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e5" label="«expose»" kind="expose" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:96">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2519;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n4" target="n17">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2483;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n4" target="n17">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="604" y="676"/>
+                <mxPoint x="634" y="758"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -173,27 +173,27 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.2489;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n15">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="99" y="362"/>
-                <mxPoint x="97" y="362"/>
+                <mxPoint x="109" y="407"/>
+                <mxPoint x="107" y="407"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e7" label="«assume»" kind="assume" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:37">
-          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5037;exitPerimeter=0;entryX=0.2524;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n16">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5034;exitPerimeter=0;entryX=0.2524;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n16">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="362" y="108"/>
+                <mxPoint x="382" y="123"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e8" label="«require»" kind="require" view="NotationGlyphs::Diagrams::mixedGlyphs" link="notation-glyphs.sysml:41">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.501;exitPerimeter=0;entryX=1;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n3" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5009;exitPerimeter=0;entryX=1;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n3" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="456" y="283"/>
-                <mxPoint x="456" y="68"/>
+                <mxPoint x="481" y="318"/>
+                <mxPoint x="481" y="78"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/glyphs-package.drawio.golden b/internal/ir/view/testdata/glyphs-package.drawio.golden
index 5b5344882a..663853eaa6 100644
--- a/internal/ir/view/testdata/glyphs-package.drawio.golden
+++ b/internal/ir/view/testdata/glyphs-package.drawio.golden
@@ -9,17 +9,17 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«package»&#xA;NotationGlyphs" fqn="NotationGlyphs" kind="package" view="NotationGlyphs::Diagrams::packageGlyphs" link="notation-glyphs.sysml:5">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="146" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="146" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«package»&#xA;Lib" fqn="NotationGlyphs::Lib" kind="package" view="NotationGlyphs::Diagrams::packageGlyphs" link="notation-glyphs.sysml:59">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="226" y="40" width="70" height="37" as="geometry"/>
+            <mxGeometry x="246" y="50" width="70" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«package»&#xA;Uses" fqn="NotationGlyphs::Uses" kind="package" view="NotationGlyphs::Diagrams::packageGlyphs" link="notation-glyphs.sysml:62">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="117" width="70" height="37" as="geometry"/>
+            <mxGeometry x="50" y="137" width="70" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="containment" view="NotationGlyphs::Diagrams::packageGlyphs" link="notation-glyphs.sysml:59">
@@ -31,8 +31,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.7571;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="113" y="97"/>
-                <mxPoint x="93" y="97"/>
+                <mxPoint x="123" y="112"/>
+                <mxPoint x="103" y="112"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -41,7 +41,7 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0.2571;entryY=1;entryPerimeter=0;rounded=0;html=0;startArrow=oval;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="244" y="136"/>
+                <mxPoint x="264" y="156"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/glyphs-requirement.drawio.golden b/internal/ir/view/testdata/glyphs-requirement.drawio.golden
index 0ddb641726..b2c40db53a 100644
--- a/internal/ir/view/testdata/glyphs-requirement.drawio.golden
+++ b/internal/ir/view/testdata/glyphs-requirement.drawio.golden
@@ -9,30 +9,30 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«requirement def»&#xA;LevelReq" fqn="NotationGlyphs::LevelReq" kind="requirement def" view="NotationGlyphs::Diagrams::requirementGlyphs" link="notation-glyphs.sysml:31">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="118" height="37" as="geometry"/>
+            <mxGeometry x="50" y="50" width="118" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«requirement»&#xA;levelReq" fqn="NotationGlyphs::levelReq" kind="requirement" view="NotationGlyphs::Diagrams::requirementGlyphs" link="notation-glyphs.sysml:39">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="198" y="40" width="94" height="37" as="geometry"/>
+            <mxGeometry x="218" y="50" width="94" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«requirement»&#xA;capacity" fqn="NotationGlyphs::capacity" kind="requirement" view="NotationGlyphs::Diagrams::requirementGlyphs" link="notation-glyphs.sysml:40">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="117" width="94" height="37" as="geometry"/>
+            <mxGeometry x="50" y="137" width="94" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«concern»&#xA;safety&#xA;“Nothing overflows.”" fqn="NotationGlyphs::safety" kind="concern" view="NotationGlyphs::Diagrams::requirementGlyphs" link="notation-glyphs.sysml:28">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="174" y="117" width="184" height="54" as="geometry"/>
+            <mxGeometry x="194" y="137" width="184" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="frame" fqn="NotationGlyphs::LevelReq::safety" kind="frame" view="NotationGlyphs::Diagrams::requirementGlyphs" link="notation-glyphs.sysml:35">
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="99" y="101"/>
-                <mxPoint x="220" y="101"/>
+                <mxPoint x="109" y="116"/>
+                <mxPoint x="240" y="116"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -46,9 +46,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n2" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="87" y="93"/>
-                <mxPoint x="178" y="93"/>
-                <mxPoint x="178" y="68"/>
+                <mxPoint x="97" y="108"/>
+                <mxPoint x="193" y="108"/>
+                <mxPoint x="193" y="78"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/glyphs-tree.drawio.golden b/internal/ir/view/testdata/glyphs-tree.drawio.golden
index ff48afaed4..78ae9a8af8 100644
--- a/internal/ir/view/testdata/glyphs-tree.drawio.golden
+++ b/internal/ir/view/testdata/glyphs-tree.drawio.golden
@@ -9,154 +9,154 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Plant" fqn="NotationGlyphs::Plant" kind="part def" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:15">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="390" height="408" as="geometry"/>
+            <mxGeometry x="50" y="50" width="410" height="448" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;tank" fqn="NotationGlyphs::Plant::tank" kind="part" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:16">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="114" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«attribute»&#xA;^level" fqn="NotationGlyphs::Tank::level" kind="attribute" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:12">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«part»&#xA;pump" fqn="NotationGlyphs::Plant::pump" kind="part" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="170" y="82" width="54" height="37" as="geometry"/>
+            <mxGeometry x="180" y="92" width="54" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«timeslice»&#xA;filling" fqn="NotationGlyphs::Plant::filling" kind="timeslice" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="264" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="284" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«snapshot»&#xA;full" fqn="NotationGlyphs::Plant::full" kind="snapshot" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:19">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="257" width="76" height="37" as="geometry"/>
+            <mxGeometry x="16" y="287" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«occurrence»&#xA;startup" fqn="NotationGlyphs::Plant::startup" kind="occurrence" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:20">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="132" y="257" width="88" height="37" as="geometry"/>
+            <mxGeometry x="142" y="287" width="88" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«part»&#xA;spare" fqn="NotationGlyphs::Plant::spare" kind="part" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:21">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="260" y="257" width="114" height="135" as="geometry"/>
+            <mxGeometry x="280" y="287" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«attribute»&#xA;^level" fqn="NotationGlyphs::Tank::level" kind="attribute" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:12">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n7">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«view»&#xA;tankView" fqn="NotationGlyphs::Diagrams::tankView" kind="view" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:96">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="470" y="40" width="90" height="37" as="geometry"/>
+            <mxGeometry x="510" y="50" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«part def»&#xA;Tank" fqn="NotationGlyphs::Tank" kind="part def" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:11">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="488" width="114" height="135" as="geometry"/>
+            <mxGeometry x="50" y="548" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«attribute»&#xA;level" fqn="NotationGlyphs::Tank::level" kind="attribute" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:12">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="composition" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0.1872;exitY=0.1029;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.178;exitY=0.0938;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e1" label="" kind="composition" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.5051;exitY=0.1029;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.5049;exitY=0.0938;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e2" label="" kind="portion" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:18">
-          <mxCell style="edgeStyle=none;exitX=0.7821;exitY=0.1029;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=oval;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.7927;exitY=0.0938;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=oval;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e3" label="" kind="portion" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:19">
-          <mxCell style="edgeStyle=none;exitX=0.1385;exitY=0.1029;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=oval;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.1317;exitY=0.0938;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=oval;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="94" y="102"/>
-                <mxPoint x="186" y="102"/>
-                <mxPoint x="186" y="277"/>
-                <mxPoint x="152" y="277"/>
-                <mxPoint x="152" y="306.25"/>
+                <mxPoint x="104" y="117"/>
+                <mxPoint x="196" y="117"/>
+                <mxPoint x="196" y="312"/>
+                <mxPoint x="167" y="312"/>
+                <mxPoint x="167" y="346.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e4" label="event" kind="event" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:20">
-          <mxCell style="edgeStyle=none;exitX=0.4513;exitY=0.1029;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n6">
+          <mxCell style="edgeStyle=none;exitX=0.4537;exitY=0.0938;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n0" target="n6">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="216" y="102"/>
-                <mxPoint x="194" y="102"/>
+                <mxPoint x="236" y="117"/>
+                <mxPoint x="214" y="117"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e5" label="" kind="reference" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:21">
-          <mxCell style="edgeStyle=none;exitX=0.8128;exitY=0.1029;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n7">
+          <mxCell style="edgeStyle=none;exitX=0.822;exitY=0.0938;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n7">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="357" y="102"/>
-                <mxPoint x="402" y="102"/>
-                <mxPoint x="402" y="228"/>
-                <mxPoint x="385.5" y="228"/>
+                <mxPoint x="387" y="117"/>
+                <mxPoint x="432" y="117"/>
+                <mxPoint x="432" y="258"/>
+                <mxPoint x="415.5" y="258"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e6" label="" kind="typing" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5037;exitPerimeter=0;entryX=0;entryY=0.2519;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n10">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5034;exitPerimeter=0;entryX=0;entryY=0.2483;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="24" y="190"/>
-                <mxPoint x="24" y="522"/>
+                <mxPoint x="34" y="215"/>
+                <mxPoint x="34" y="584"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e7" label="" kind="reference" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e8" label="references" kind="reference subsetting" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:21">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.7481;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n7" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.7517;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n7" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="357" y="223"/>
+                <mxPoint x="387" y="251"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e9" label="" kind="reference" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n7" target="n8">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n7" target="n8">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e10" label="«expose»" kind="expose" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:97">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2519;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n9" target="n10">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2483;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n9" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="515" y="522"/>
+                <mxPoint x="555" y="584"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e11" label="" kind="reference" view="NotationGlyphs::Diagrams::treeGlyphs" link="notation-glyphs.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n11">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n11">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
diff --git a/internal/ir/view/testdata/interconnection-constraints.drawio.golden b/internal/ir/view/testdata/interconnection-constraints.drawio.golden
index 30661106f4..991cd62f69 100644
--- a/internal/ir/view/testdata/interconnection-constraints.drawio.golden
+++ b/internal/ir/view/testdata/interconnection-constraints.drawio.golden
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- ParametricViews::amplifierView — interconnection rendering (render asInterconnectionDiagram) -->
 <!-- 1 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
-<!-- notice: edge Parametrics::Amplifier::noiseIn (n3 -> n6) not routed: the router found no path at this layout; draw.io routes it when the file opens -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="ParametricViews-amplifierView" name="ParametricViews::amplifierView">
     <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
@@ -10,32 +9,32 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Amplifier" fqn="Parametrics::Amplifier" kind="part def" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:20">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="370" height="212" as="geometry"/>
+            <mxGeometry x="50" y="50" width="390" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«attribute»&#xA;signal" fqn="Parametrics::Amplifier::signal" kind="attribute" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:21">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«attribute»&#xA;gain" fqn="Parametrics::Amplifier::gain" kind="attribute" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:22">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="138" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="148" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«attribute»&#xA;noise" fqn="Parametrics::Amplifier::noise" kind="attribute" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:23">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="260" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="280" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«attribute»&#xA;output" fqn="Parametrics::Amplifier::output" kind="attribute" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:24">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="159" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«constraint»&#xA;amplify" fqn="Parametrics::Amplifier::amplify" kind="constraint" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="138" y="159" width="88" height="37" as="geometry"/>
+            <mxGeometry x="148" y="179" width="88" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5:n5.0" label="^input" fqn="Parametrics::Amplify::input" kind="port" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:5">
@@ -61,7 +60,7 @@
         </object>
         <object id="n6" label="«constraint»&#xA;mix" fqn="Parametrics::Amplifier::mix" kind="constraint" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:27">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="266" y="159" width="88" height="37" as="geometry"/>
+            <mxGeometry x="286" y="179" width="88" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6:n6.0" label="^a" fqn="Parametrics::Mix::a" kind="port" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:12">
@@ -89,8 +88,8 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0.0833;entryY=0.5;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n1" target="n5:n5.0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="154.6" y="140.5"/>
-                <mxPoint x="154.6" y="211.333"/>
+                <mxPoint x="169" y="160.5"/>
+                <mxPoint x="169" y="241.333"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -99,20 +98,30 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=0.0833;entryY=0.5;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n2" target="n5:n5.1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="157" y="140.5"/>
-                <mxPoint x="157" y="223.667"/>
+                <mxPoint x="177" y="160.5"/>
+                <mxPoint x="177" y="253.667"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e2" label="=" fqn="Parametrics::Amplifier::amplified" kind="binding" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:33">
           <mxCell style="edgeStyle=none;exitX=0.9167;exitY=0.5;exitPerimeter=0;entryX=0.0833;entryY=0.5;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n5:n5.2" target="n6:n6.0">
-            <mxGeometry relative="1" as="geometry"/>
+            <mxGeometry relative="1" as="geometry">
+              <Array as="points">
+                <mxPoint x="307.6" y="247.5"/>
+                <mxPoint x="307.6" y="241.333"/>
+              </Array>
+            </mxGeometry>
           </mxCell>
         </object>
         <object id="e3" label="=" fqn="Parametrics::Amplifier::noiseIn" kind="binding" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:34">
-          <mxCell style="edgeStyle=orthogonalEdgeStyle;entryX=0;entryY=0.5;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n3" target="n6:n6.1">
-            <mxGeometry relative="1" as="geometry"/>
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=0.0833;entryY=0.5;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n3" target="n6:n6.1">
+            <mxGeometry relative="1" as="geometry">
+              <Array as="points">
+                <mxPoint x="314" y="160.5"/>
+                <mxPoint x="314" y="253.667"/>
+              </Array>
+            </mxGeometry>
           </mxCell>
         </object>
         <object id="e4" label="=" fqn="Parametrics::Amplifier::mixed" kind="binding" view="ParametricViews::amplifierView" link="interconnection-constraints.sysml:35">
diff --git a/internal/ir/view/testdata/interconnection-ports.drawio.golden b/internal/ir/view/testdata/interconnection-ports.drawio.golden
index e089ad4345..426d20e97d 100644
--- a/internal/ir/view/testdata/interconnection-ports.drawio.golden
+++ b/internal/ir/view/testdata/interconnection-ports.drawio.golden
@@ -9,12 +9,12 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Toaster" fqn="ToasterDemo::Toaster" kind="part def" view="ToasterViews::toasterView" link="interconnection-ports.sysml:19">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="234" height="212" as="geometry"/>
+            <mxGeometry x="50" y="50" width="244" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;heating" fqn="ToasterDemo::Toaster::heating" kind="part" view="ToasterViews::toasterView" link="interconnection-ports.sysml:20">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="81" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1:n1.0" label="^durationIn" fqn="ToasterDemo::HeatingSystem::durationIn" kind="port" view="ToasterViews::toasterView" link="interconnection-ports.sysml:9">
@@ -26,7 +26,7 @@
         </object>
         <object id="n2" label="«part»&#xA;control" fqn="ToasterDemo::Toaster::control" kind="part" view="ToasterViews::toasterView" link="interconnection-ports.sysml:21">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="137" y="82" width="81" height="37" as="geometry"/>
+            <mxGeometry x="147" y="92" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2:n2.0" label="^durationOut" fqn="ToasterDemo::ControlSystem::durationOut" kind="port" view="ToasterViews::toasterView" link="interconnection-ports.sysml:13">
@@ -38,15 +38,15 @@
         </object>
         <object id="n3" label="«part»&#xA;chassis" fqn="ToasterDemo::Toaster::chassis" kind="part" view="ToasterViews::toasterView" link="interconnection-ports.sysml:22">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="159" width="81" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" fqn="ToasterDemo::Toaster::durationInterface" kind="connection" view="ToasterViews::toasterView" link="interconnection-ports.sysml:23">
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.0833;exitPerimeter=0;entryX=0.5;entryY=0.0833;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n2:n2.0" target="n1:n1.0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="217.5" y="101"/>
-                <mxPoint x="96.5" y="101"/>
+                <mxPoint x="237.5" y="121"/>
+                <mxPoint x="106.5" y="121"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -55,8 +55,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.0833;exitPerimeter=0;entryX=0.5;entryY=0.0833;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=1;" edge="1" parent="1" source="n2:n2.0" target="n1:n1.0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="217.5" y="98.6"/>
-                <mxPoint x="96.5" y="98.6"/>
+                <mxPoint x="237.5" y="113"/>
+                <mxPoint x="106.5" y="113"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/interconnection.drawio.golden b/internal/ir/view/testdata/interconnection.drawio.golden
index 7c613ab400..cd6c2c4df6 100644
--- a/internal/ir/view/testdata/interconnection.drawio.golden
+++ b/internal/ir/view/testdata/interconnection.drawio.golden
@@ -9,12 +9,12 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Loop" fqn="Plant::Loop" kind="part def" view="PlantViews::loopView" link="interconnection.sysml:16">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="326" height="408" as="geometry"/>
+            <mxGeometry x="50" y="50" width="336" height="448" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;pump" fqn="Plant::Loop::pump" kind="part" view="PlantViews::loopView" link="interconnection.sysml:17">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="132" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="132" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1:n1.0" label="^outlet" fqn="Plant::Pump::outlet" kind="port" view="PlantViews::loopView" link="interconnection.sysml:5">
@@ -26,12 +26,12 @@
         </object>
         <object id="n2" label="«item»&#xA;^waterOut" fqn="Plant::Pump::waterOut" kind="item" view="PlantViews::loopView" link="interconnection.sysml:6">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="16" y="82" width="100" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«part»&#xA;tank" fqn="Plant::Loop::tank" kind="part" view="PlantViews::loopView" link="interconnection.sysml:18">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="188" y="82" width="122" height="135" as="geometry"/>
+            <mxGeometry x="198" y="92" width="122" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3:n3.0" label="^inlet" fqn="Plant::Tank::inlet" kind="port" view="PlantViews::loopView" link="interconnection.sysml:10">
@@ -43,25 +43,25 @@
         </object>
         <object id="n4" label="«item»&#xA;^waterIn" fqn="Plant::Tank::waterIn" kind="item" view="PlantViews::loopView" link="interconnection.sysml:11">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n3">
-            <mxGeometry x="16" y="82" width="90" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«part»&#xA;sensor" fqn="Plant::Loop::sensor" kind="part" view="PlantViews::loopView" link="interconnection.sysml:22">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="257" width="132" height="135" as="geometry"/>
+            <mxGeometry x="16" y="287" width="132" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«item»&#xA;^waterOut" fqn="Plant::Pump::waterOut" kind="item" view="PlantViews::loopView" link="interconnection.sysml:6">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="16" y="82" width="100" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" fqn="Plant::Loop::supply" kind="connection" view="PlantViews::loopView" link="interconnection.sysml:19">
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.0833;exitPerimeter=0;entryX=0.5;entryY=0.0833;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n1:n1.0" target="n3:n3.0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="122" y="101"/>
-                <mxPoint x="289" y="101"/>
+                <mxPoint x="132" y="121"/>
+                <mxPoint x="309" y="121"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/layout.drawio.golden b/internal/ir/view/testdata/layout.drawio.golden
index ac9d4eeb06..2884615030 100644
--- a/internal/ir/view/testdata/layout.drawio.golden
+++ b/internal/ir/view/testdata/layout.drawio.golden
@@ -9,12 +9,12 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Loop" fqn="Plant::Loop" kind="part def" view="PlantViews::placedView" link="layout.sysml:15">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="160" width="352" height="158" as="geometry"/>
+            <mxGeometry x="50" y="170" width="352" height="168" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;pump" fqn="Plant::Loop::pump" kind="part" view="PlantViews::placedView" link="layout.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;fillColor=#FFE8BD;strokeColor=#333333;fontFamily=Arial;fontSize=11;fontStyle=1;" vertex="1" collapsed="1" parent="n0">
-            <mxGeometry x="16" y="82" width="54" height="35" as="geometry">
+            <mxGeometry x="16" y="92" width="54" height="35" as="geometry">
               <mxRectangle width="54" height="36" as="alternateBounds"/>
             </mxGeometry>
           </mxCell>
@@ -28,7 +28,7 @@
         </object>
         <object id="n2" label="«part»&#xA;tank" fqn="Plant::Loop::tank" kind="part" view="PlantViews::placedView" link="layout.sysml:22">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="216" y="82" width="120" height="60" as="geometry"/>
+            <mxGeometry x="216" y="92" width="120" height="60" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2:n2.0" label="^inlet" fqn="Plant::Tank::inlet" kind="port" view="PlantViews::placedView" link="layout.sysml:12">
@@ -50,7 +50,7 @@
           </mxCell>
         </object>
         <mxCell id="note0" value="always" style="shape=note;html=0;whiteSpace=wrap;size=14;align=left;verticalAlign=top;spacing=4;" vertex="1" parent="1">
-          <mxGeometry x="150" y="242" width="67" height="36" as="geometry"/>
+          <mxGeometry x="170" y="262" width="67" height="36" as="geometry"/>
         </mxCell>
         <mxCell id="note0:anchor0" style="edgeStyle=none;html=0;dashed=1;endArrow=none;" edge="1" parent="1" source="note0" target="n1">
           <mxGeometry relative="1" as="geometry"/>
@@ -62,13 +62,13 @@
           <mxGeometry relative="1" as="geometry"/>
         </mxCell>
         <mxCell id="note2" value="check pressure" style="shape=note;html=0;whiteSpace=wrap;size=14;align=left;verticalAlign=top;spacing=4;" vertex="1" parent="1">
-          <mxGeometry x="40" y="358" width="134" height="36" as="geometry"/>
+          <mxGeometry x="50" y="388" width="134" height="36" as="geometry"/>
         </mxCell>
         <mxCell id="note2:anchor0" style="edgeStyle=none;html=0;dashed=1;endArrow=none;" edge="1" parent="1" source="note2" target="e0">
           <mxGeometry relative="1" as="geometry"/>
         </mxCell>
         <mxCell id="note3" value="free" style="shape=note;html=0;whiteSpace=wrap;size=14;align=left;verticalAlign=top;spacing=4;" vertex="1" parent="1">
-          <mxGeometry x="214" y="358" width="54" height="36" as="geometry"/>
+          <mxGeometry x="234" y="388" width="54" height="36" as="geometry"/>
         </mxCell>
       </root>
     </mxGraphModel>
diff --git a/internal/ir/view/testdata/mixed-memberships.drawio.golden b/internal/ir/view/testdata/mixed-memberships.drawio.golden
index 8f0787943c..3a40a3ede8 100644
--- a/internal/ir/view/testdata/mixed-memberships.drawio.golden
+++ b/internal/ir/view/testdata/mixed-memberships.drawio.golden
@@ -3,276 +3,275 @@
 <!-- 1 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="MixedMemberships-memberships" name="MixedMemberships::memberships">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1062" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1132" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«package»&#xA;MixedMemberships" fqn="MixedMemberships" kind="package" view="MixedMemberships::memberships" link="mixed-memberships.sysml:1">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="982" height="733" as="geometry"/>
+            <mxGeometry x="50" y="50" width="1032" height="813" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«package»&#xA;Library" fqn="MixedMemberships::Library" kind="package" view="MixedMemberships::memberships" link="mixed-memberships.sysml:5">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="278" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="288" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«attribute def»&#xA;Pressure" fqn="MixedMemberships::Library::Pressure" kind="attribute def" view="MixedMemberships::memberships" link="mixed-memberships.sysml:6">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="16" y="82" width="106" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«port def»&#xA;FluidPort" fqn="MixedMemberships::Library::FluidPort" kind="port def" view="MixedMemberships::memberships" link="mixed-memberships.sysml:7">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="162" y="82" width="100" height="37" as="geometry"/>
+            <mxGeometry x="172" y="92" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«part def»&#xA;Impeller" fqn="MixedMemberships::Impeller" kind="part def" view="MixedMemberships::memberships" link="mixed-memberships.sysml:10">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="334" y="82" width="90" height="37" as="geometry"/>
+            <mxGeometry x="354" y="92" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«part def»&#xA;Pump" fqn="MixedMemberships::Pump" kind="part def" view="MixedMemberships::memberships" link="mixed-memberships.sysml:12">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n0">
-            <mxGeometry x="464" y="82" width="502" height="306" as="geometry"/>
+            <mxGeometry x="494" y="92" width="522" height="336" as="geometry"/>
           </mxCell>
         </object>
         <object id="n18" label="«attribute»&#xA;pressure" fqn="MixedMemberships::Pump::pressure" kind="attribute" view="MixedMemberships::memberships" link="mixed-memberships.sysml:13">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="16" y="82" width="90" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«port»&#xA;outlet" fqn="MixedMemberships::Pump::outlet" kind="port" view="MixedMemberships::memberships" link="mixed-memberships.sysml:14">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="146" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="156" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="«part»&#xA;impeller" fqn="MixedMemberships::Pump::impeller" kind="part" view="MixedMemberships::memberships" link="mixed-memberships.sysml:15">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="258" y="82" width="90" height="37" as="geometry"/>
+            <mxGeometry x="278" y="92" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13" label="«part»&#xA;spare" fqn="MixedMemberships::Pump::spare" kind="part" view="MixedMemberships::memberships" link="mixed-memberships.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="16" y="159" width="63" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n19" label="«action»&#xA;prime&#xA;declares no nodes" fqn="MixedMemberships::Pump::prime" kind="action" view="MixedMemberships::memberships" link="mixed-memberships.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="119" y="159" width="159" height="54" as="geometry"/>
+            <mxGeometry x="129" y="179" width="159" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n20" label="«state»&#xA;armed&#xA;declares no states" fqn="MixedMemberships::Pump::armed" kind="state" view="MixedMemberships::memberships" link="mixed-memberships.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="318" y="159" width="168" height="54" as="geometry"/>
+            <mxGeometry x="338" y="179" width="168" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n14" label="«part def»&#xA;Seal" fqn="MixedMemberships::Pump::Seal" kind="part def" view="MixedMemberships::memberships" link="mixed-memberships.sysml:19">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="16" y="253" width="76" height="37" as="geometry"/>
+            <mxGeometry x="16" y="283" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«concern def»&#xA;Containment" fqn="MixedMemberships::Containment" kind="concern def" view="MixedMemberships::memberships" link="mixed-memberships.sysml:22">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="428" width="118" height="37" as="geometry"/>
+            <mxGeometry x="16" y="478" width="118" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«requirement def»&#xA;Safety" fqn="MixedMemberships::Safety" kind="requirement def" view="MixedMemberships::memberships" link="mixed-memberships.sysml:24">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n0">
-            <mxGeometry x="174" y="428" width="338" height="212" as="geometry"/>
+            <mxGeometry x="184" y="478" width="348" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n15" label="«require constraint»&#xA;minPressure" fqn="MixedMemberships::Safety::minPressure" kind="require constraint" view="MixedMemberships::memberships" link="mixed-memberships.sysml:25">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n4">
-            <mxGeometry x="16" y="82" width="136" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="136" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n16" label="«assume constraint»&#xA;primedPump" fqn="MixedMemberships::Safety::primedPump" kind="assume constraint" view="MixedMemberships::memberships" link="mixed-memberships.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n4">
-            <mxGeometry x="192" y="82" width="130" height="37" as="geometry"/>
+            <mxGeometry x="202" y="92" width="130" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n17" label="«assert constraint»&#xA;sealed" fqn="MixedMemberships::Safety::sealed" kind="assert constraint" view="MixedMemberships::memberships" link="mixed-memberships.sysml:27">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n4">
-            <mxGeometry x="16" y="159" width="130" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="130" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«frame»&#xA;contained" fqn="MixedMemberships::Safety::contained" kind="frame" view="MixedMemberships::memberships" link="mixed-memberships.sysml:28">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n4">
-            <mxGeometry x="186" y="159" width="100" height="37" as="geometry"/>
+            <mxGeometry x="196" y="179" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«view»&#xA;memberships" fqn="MixedMemberships::memberships" kind="view" view="MixedMemberships::memberships" link="mixed-memberships.sysml:31">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="552" y="428" width="118" height="37" as="geometry"/>
+            <mxGeometry x="582" y="478" width="118" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«view»&#xA;membershipsLayout" fqn="MixedMemberships::membershipsLayout" kind="view" view="MixedMemberships::memberships" link="mixed-memberships.sysml:36">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="680" width="173" height="37" as="geometry"/>
+            <mxGeometry x="16" y="760" width="173" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="containment" view="MixedMemberships::memberships" link="mixed-memberships.sysml:5">
-          <mxCell style="edgeStyle=none;exitX=0.1578;exitY=0.0573;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.155;exitY=0.0517;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e1" label="" kind="containment" view="MixedMemberships::memberships" link="mixed-memberships.sysml:6">
-          <mxCell style="edgeStyle=none;exitX=0.2482;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.2396;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e2" label="" kind="containment" view="MixedMemberships::memberships" link="mixed-memberships.sysml:7">
-          <mxCell style="edgeStyle=none;exitX=0.7626;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n8">
+          <mxCell style="edgeStyle=none;exitX=0.7708;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n8">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e3" label="" kind="containment" view="MixedMemberships::memberships" link="mixed-memberships.sysml:10">
-          <mxCell style="edgeStyle=none;exitX=0.3859;exitY=0.0573;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n9">
+          <mxCell style="edgeStyle=none;exitX=0.3866;exitY=0.0517;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n9">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="" kind="containment" view="MixedMemberships::memberships" link="mixed-memberships.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=0.7281;exitY=0.0573;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n10">
+          <mxCell style="edgeStyle=none;exitX=0.7316;exitY=0.0517;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n10">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e5" label="" kind="reference" view="MixedMemberships::memberships" link="mixed-memberships.sysml:13">
-          <mxCell style="edgeStyle=none;exitX=0.1215;exitY=0.1373;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n18">
+          <mxCell style="edgeStyle=none;exitX=0.1169;exitY=0.125;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n18">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e6" label="" kind="reference" view="MixedMemberships::memberships" link="mixed-memberships.sysml:14">
-          <mxCell style="edgeStyle=none;exitX=0.3625;exitY=0.1373;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n11">
+          <mxCell style="edgeStyle=none;exitX=0.3678;exitY=0.125;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n11">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e7" label="" kind="composition" view="MixedMemberships::memberships" link="mixed-memberships.sysml:15">
-          <mxCell style="edgeStyle=none;exitX=0.6036;exitY=0.1373;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n12">
+          <mxCell style="edgeStyle=none;exitX=0.6188;exitY=0.125;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n12">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e8" label="" kind="reference" view="MixedMemberships::memberships" link="mixed-memberships.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0.0946;exitY=0.1373;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n13">
+          <mxCell style="edgeStyle=none;exitX=0.091;exitY=0.125;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n13">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="551.5" y="184"/>
-                <mxPoint x="503.5" y="184"/>
-                <mxPoint x="503.5" y="261"/>
-                <mxPoint x="535.75" y="261"/>
+                <mxPoint x="591.5" y="209"/>
+                <mxPoint x="533.5" y="209"/>
+                <mxPoint x="533.5" y="296"/>
+                <mxPoint x="575.75" y="296"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e9" label="" kind="composition" view="MixedMemberships::memberships" link="mixed-memberships.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.3954;exitY=0.1373;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n19">
+          <mxCell style="edgeStyle=none;exitX=0.3994;exitY=0.125;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n19">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="702.5" y="184"/>
-                <mxPoint x="742.25" y="184"/>
+                <mxPoint x="752.5" y="209"/>
+                <mxPoint x="792.25" y="209"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e10" label="" kind="composition" view="MixedMemberships::memberships" link="mixed-memberships.sysml:18">
-          <mxCell style="edgeStyle=none;exitX=0.8008;exitY=0.1373;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n20">
+          <mxCell style="edgeStyle=none;exitX=0.8084;exitY=0.125;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n20">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e11" label="" kind="containment" view="MixedMemberships::memberships" link="mixed-memberships.sysml:19">
-          <mxCell style="edgeStyle=none;exitX=0.1076;exitY=0.1373;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n14">
+          <mxCell style="edgeStyle=none;exitX=0.1034;exitY=0.125;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n14">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="558" y="184"/>
-                <mxPoint x="626" y="184"/>
-                <mxPoint x="626" y="261"/>
-                <mxPoint x="603" y="261"/>
-                <mxPoint x="603" y="346.5"/>
-                <mxPoint x="577" y="346.5"/>
+                <mxPoint x="598" y="209"/>
+                <mxPoint x="666" y="209"/>
+                <mxPoint x="666" y="296"/>
+                <mxPoint x="654.5" y="296"/>
+                <mxPoint x="654.5" y="434.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e12" label="" kind="containment" view="MixedMemberships::memberships" link="mixed-memberships.sysml:22">
-          <mxCell style="edgeStyle=none;exitX=0.0764;exitY=0.0573;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.0727;exitY=0.0517;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="115" y="106"/>
-                <mxPoint x="350" y="106"/>
-                <mxPoint x="350" y="350.5"/>
-                <mxPoint x="190" y="350.5"/>
-                <mxPoint x="190" y="477.25"/>
+                <mxPoint x="125" y="121"/>
+                <mxPoint x="370" y="121"/>
+                <mxPoint x="370" y="395.5"/>
+                <mxPoint x="205" y="395.5"/>
+                <mxPoint x="205" y="537.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e13" label="" kind="containment" view="MixedMemberships::memberships" link="mixed-memberships.sysml:24">
-          <mxCell style="edgeStyle=none;exitX=0.3493;exitY=0.0573;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.3469;exitY=0.0517;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n4">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="383" y="102"/>
-                <mxPoint x="358" y="102"/>
-                <mxPoint x="358" y="313.5"/>
-                <mxPoint x="383" y="313.5"/>
+                <mxPoint x="408" y="117"/>
+                <mxPoint x="388" y="117"/>
+                <mxPoint x="388" y="353.5"/>
+                <mxPoint x="408" y="353.5"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e14" label="require" kind="require" view="MixedMemberships::memberships" link="mixed-memberships.sysml:25">
-          <mxCell style="edgeStyle=none;exitX=0.2485;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n15">
+          <mxCell style="edgeStyle=none;exitX=0.2414;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n15">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e15" label="assume" kind="assume" view="MixedMemberships::memberships" link="mixed-memberships.sysml:26">
-          <mxCell style="edgeStyle=none;exitX=0.7604;exitY=0.1981;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n16">
+          <mxCell style="edgeStyle=none;exitX=0.7672;exitY=0.181;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n16">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e16" label="assert" kind="assert" view="MixedMemberships::memberships" link="mixed-memberships.sysml:27">
-          <mxCell style="edgeStyle=none;exitX=0.2396;exitY=0.1981;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n17">
+          <mxCell style="edgeStyle=none;exitX=0.2328;exitY=0.181;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n17">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="295" y="530"/>
-                <mxPoint x="382" y="530"/>
-                <mxPoint x="382" y="636.25"/>
+                <mxPoint x="315" y="595"/>
+                <mxPoint x="402" y="595"/>
+                <mxPoint x="402" y="716.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e17" label="frame" kind="frame" view="MixedMemberships::memberships" link="mixed-memberships.sysml:28">
-          <mxCell style="edgeStyle=none;exitX=0.6982;exitY=0.1981;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.7069;exitY=0.181;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="450" y="530"/>
-                <mxPoint x="384" y="530"/>
-                <mxPoint x="384" y="636.25"/>
+                <mxPoint x="480" y="595"/>
+                <mxPoint x="414" y="595"/>
+                <mxPoint x="414" y="716.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e18" label="" kind="composition" view="MixedMemberships::memberships" link="mixed-memberships.sysml:31">
-          <mxCell style="edgeStyle=none;exitX=0.6222;exitY=0.0573;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n6">
+          <mxCell style="edgeStyle=none;exitX=0.6211;exitY=0.0517;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n6">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="651" y="102"/>
-                <mxPoint x="488" y="102"/>
-                <mxPoint x="488" y="440"/>
-                <mxPoint x="572" y="440"/>
-                <mxPoint x="572" y="477.25"/>
+                <mxPoint x="691" y="117"/>
+                <mxPoint x="528" y="117"/>
+                <mxPoint x="528" y="495"/>
+                <mxPoint x="607" y="495"/>
+                <mxPoint x="607" y="537.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e19" label="" kind="composition" view="MixedMemberships::memberships" link="mixed-memberships.sysml:36">
-          <mxCell style="edgeStyle=none;exitX=0.1044;exitY=0.0573;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n7">
+          <mxCell style="edgeStyle=none;exitX=0.0993;exitY=0.0517;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n7">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="142.5" y="98"/>
-                <mxPoint x="354" y="98"/>
-                <mxPoint x="354" y="358.5"/>
-                <mxPoint x="198" y="358.5"/>
-                <mxPoint x="198" y="613.75"/>
-                <mxPoint x="185.75" y="613.75"/>
+                <mxPoint x="152.5" y="113"/>
+                <mxPoint x="378" y="113"/>
+                <mxPoint x="378" y="403.5"/>
+                <mxPoint x="213" y="403.5"/>
+                <mxPoint x="213" y="688.75"/>
+                <mxPoint x="195.75" y="688.75"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -281,8 +280,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.7542;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n5" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="450" y="606"/>
-                <mxPoint x="145" y="606"/>
+                <mxPoint x="480" y="681"/>
+                <mxPoint x="155" y="681"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -291,9 +290,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n11" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="686" y="257"/>
-                <mxPoint x="419" y="257"/>
-                <mxPoint x="419" y="232"/>
+                <mxPoint x="736" y="287"/>
+                <mxPoint x="449" y="287"/>
+                <mxPoint x="449" y="262"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -302,8 +301,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.5;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n12" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="807" y="184"/>
-                <mxPoint x="419" y="184"/>
+                <mxPoint x="867" y="209"/>
+                <mxPoint x="449" y="209"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -312,7 +311,7 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=0.7556;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n13" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="442" y="300"/>
+                <mxPoint x="472" y="340"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -321,9 +320,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.7568;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n18" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="565" y="265"/>
-                <mxPoint x="198" y="265"/>
-                <mxPoint x="198" y="232"/>
+                <mxPoint x="605" y="295"/>
+                <mxPoint x="213" y="295"/>
+                <mxPoint x="213" y="262"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/mixed.drawio.golden b/internal/ir/view/testdata/mixed.drawio.golden
index 46f0895cad..670aa4d5a2 100644
--- a/internal/ir/view/testdata/mixed.drawio.golden
+++ b/internal/ir/view/testdata/mixed.drawio.golden
@@ -3,53 +3,53 @@
 <!-- 1 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="MixedExamples-mixedDiagram" name="MixedExamples::mixedDiagram">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1186" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1256" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«package»&#xA;MixedExamples" fqn="MixedExamples" kind="package" view="MixedExamples::mixedDiagram" link="mixed.sysml:1">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="1106" height="747" as="geometry"/>
+            <mxGeometry x="50" y="50" width="1156" height="827" as="geometry"/>
           </mxCell>
         </object>
         <object id="n19" label="«port def»&#xA;FluidPort" fqn="MixedExamples::FluidPort" kind="port def" view="MixedExamples::mixedDiagram" link="mixed.sysml:5">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="100" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n20" label="«part def»&#xA;BaseUnit" fqn="MixedExamples::BaseUnit" kind="part def" view="MixedExamples::mixedDiagram" link="mixed.sysml:6">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="156" y="82" width="90" height="37" as="geometry"/>
+            <mxGeometry x="166" y="92" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n21" label="«part def»&#xA;Pump" fqn="MixedExamples::Pump" kind="part def" view="MixedExamples::mixedDiagram" link="mixed.sysml:8">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n0">
-            <mxGeometry x="286" y="82" width="104" height="135" as="geometry"/>
+            <mxGeometry x="306" y="92" width="104" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n22" label="«port»&#xA;outlet" fqn="MixedExamples::Pump::outlet" kind="port" view="MixedExamples::mixedDiagram" link="mixed.sysml:9">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n21">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n23" label="«part def»&#xA;Tank" fqn="MixedExamples::Tank" kind="part def" view="MixedExamples::mixedDiagram" link="mixed.sysml:12">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n0">
-            <mxGeometry x="430" y="82" width="100" height="135" as="geometry"/>
+            <mxGeometry x="460" y="92" width="100" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n24" label="«port»&#xA;inlet" fqn="MixedExamples::Tank::inlet" kind="port" view="MixedExamples::mixedDiagram" link="mixed.sysml:13">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n23">
-            <mxGeometry x="16" y="82" width="63" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n25" label="«part def»&#xA;Plant" fqn="MixedExamples::Plant" kind="part def" view="MixedExamples::mixedDiagram" link="mixed.sysml:16">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n0">
-            <mxGeometry x="570" y="82" width="180" height="135" as="geometry"/>
+            <mxGeometry x="610" y="92" width="190" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n26" label="«part»&#xA;pump" fqn="MixedExamples::Plant::pump" kind="part" view="MixedExamples::mixedDiagram" link="mixed.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n25">
-            <mxGeometry x="16" y="82" width="54" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="54" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n26:n26.0" label="^outlet" fqn="MixedExamples::Pump::outlet" kind="port" view="MixedExamples::mixedDiagram" link="mixed.sysml:9">
@@ -61,7 +61,7 @@
         </object>
         <object id="n27" label="«part»&#xA;tank" fqn="MixedExamples::Plant::tank" kind="part" view="MixedExamples::mixedDiagram" link="mixed.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n25">
-            <mxGeometry x="110" y="82" width="54" height="37" as="geometry"/>
+            <mxGeometry x="120" y="92" width="54" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n27:n27.0" label="^inlet" fqn="MixedExamples::Tank::inlet" kind="port" view="MixedExamples::mixedDiagram" link="mixed.sysml:13">
@@ -73,119 +73,119 @@
         </object>
         <object id="n28" label="«connection def»&#xA;Connection" fqn="MixedExamples::Connection" kind="connection def" view="MixedExamples::mixedDiagram" link="mixed.sysml:22">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="257" width="180" height="135" as="geometry"/>
+            <mxGeometry x="16" y="287" width="190" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n29" label="«part»&#xA;a" fqn="MixedExamples::Connection::a" kind="part" view="MixedExamples::mixedDiagram" link="mixed.sysml:23">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n28">
-            <mxGeometry x="16" y="82" width="54" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="54" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n30" label="«part»&#xA;b" fqn="MixedExamples::Connection::b" kind="part" view="MixedExamples::mixedDiagram" link="mixed.sysml:24">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n28">
-            <mxGeometry x="110" y="82" width="54" height="37" as="geometry"/>
+            <mxGeometry x="120" y="92" width="54" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«state def»&#xA;Ready&#xA;declares no states" fqn="MixedExamples::Ready" kind="state def" view="MixedExamples::mixedDiagram" link="mixed.sysml:27">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="236" y="257" width="168" height="54" as="geometry"/>
+            <mxGeometry x="256" y="287" width="168" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«state def»&#xA;Modes" fqn="MixedExamples::Modes" kind="state def" view="MixedExamples::mixedDiagram" link="mixed.sysml:29">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n0">
-            <mxGeometry x="444" y="257" width="167" height="152" as="geometry"/>
+            <mxGeometry x="474" y="287" width="177" height="162" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="start" kind="start" view="MixedExamples::mixedDiagram">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«state»&#xA;ready&#xA;initial" fqn="MixedExamples::Modes::ready" kind="state" view="MixedExamples::mixedDiagram" link="mixed.sysml:31">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="76" y="82" width="75" height="54" as="geometry"/>
+            <mxGeometry x="86" y="92" width="75" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«action def»&#xA;Operate" fqn="MixedExamples::Operate" kind="action def" view="MixedExamples::mixedDiagram" link="mixed.sysml:34">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n0">
-            <mxGeometry x="651" y="257" width="164" height="205" as="geometry"/>
+            <mxGeometry x="701" y="287" width="174" height="225" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="initial" fqn="MixedExamples::Operate::start" kind="initial" view="MixedExamples::mixedDiagram" link="mixed.sysml:35">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n5">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«action»&#xA;&#39;step&#39;" fqn="MixedExamples::Operate::&#39;step&#39;" kind="action" view="MixedExamples::mixedDiagram" link="mixed.sysml:36">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="76" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="86" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="final" kind="final" view="MixedExamples::mixedDiagram" link="mixed.sysml:37">
           <mxCell style="ellipse;shape=endState;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n5">
-            <mxGeometry x="16" y="159" width="30" height="30" as="geometry"/>
+            <mxGeometry x="16" y="179" width="30" height="30" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«use case def»&#xA;Inspection" fqn="MixedExamples::Inspection" kind="use case def" view="MixedExamples::mixedDiagram" link="mixed.sysml:42">
           <mxCell style="ellipse;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="855" y="257" width="109" height="37" as="geometry"/>
+            <mxGeometry x="925" y="287" width="109" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«subject»&#xA;plant" fqn="MixedExamples::Inspection::plant" kind="subject" view="MixedExamples::mixedDiagram" link="mixed.sysml:43">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="502" width="70" height="37" as="geometry"/>
+            <mxGeometry x="16" y="562" width="70" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«actor»&#xA;operator" fqn="MixedExamples::Inspection::operator" kind="actor" view="MixedExamples::mixedDiagram" link="mixed.sysml:44">
           <mxCell style="shape=umlActor;html=0;whiteSpace=wrap;verticalLabelPosition=bottom;verticalAlign=top;" vertex="1" parent="n0">
-            <mxGeometry x="126" y="502" width="90" height="37" as="geometry"/>
+            <mxGeometry x="136" y="562" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="objective&#xA;Inspect the plant and report its operating state." kind="objective" view="MixedExamples::mixedDiagram" link="mixed.sysml:45">
           <mxCell style="shape=note;html=0;whiteSpace=wrap;size=14;align=left;verticalAlign=top;spacing=4;" vertex="1" parent="n0">
-            <mxGeometry x="256" y="502" width="428" height="42" as="geometry"/>
+            <mxGeometry x="276" y="562" width="428" height="42" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13" label="«perform action»&#xA;run&#xA;declares no nodes" fqn="MixedExamples::Inspection::run" kind="perform action" view="MixedExamples::mixedDiagram" link="mixed.sysml:48">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="724" y="502" width="159" height="54" as="geometry"/>
+            <mxGeometry x="754" y="562" width="159" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n14" label="«exhibit state»&#xA;mode" fqn="MixedExamples::Inspection::mode" kind="exhibit state" view="MixedExamples::mixedDiagram" link="mixed.sysml:49">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="923" y="502" width="167" height="152" as="geometry"/>
+            <mxGeometry x="963" y="562" width="177" height="162" as="geometry"/>
           </mxCell>
         </object>
         <object id="n16" label="start" kind="start" view="MixedExamples::mixedDiagram">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n14">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n15" label="«state»&#xA;^ready&#xA;initial" fqn="MixedExamples::Modes::ready" kind="state" view="MixedExamples::mixedDiagram" link="mixed.sysml:31">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n14">
-            <mxGeometry x="76" y="82" width="75" height="54" as="geometry"/>
+            <mxGeometry x="86" y="92" width="75" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n31" label="«part def»&#xA;Person" fqn="MixedExamples::Person" kind="part def" view="MixedExamples::mixedDiagram" link="mixed.sysml:52">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="694" width="76" height="37" as="geometry"/>
+            <mxGeometry x="16" y="774" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n17" label="«view»&#xA;mixedDiagram" fqn="MixedExamples::mixedDiagram" kind="view" view="MixedExamples::mixedDiagram" link="mixed.sysml:54">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="132" y="694" width="127" height="37" as="geometry"/>
+            <mxGeometry x="142" y="774" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n18" label="«view»&#xA;mixedLayout" fqn="MixedExamples::mixedLayout" kind="view" view="MixedExamples::mixedDiagram" link="mixed.sysml:59">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="299" y="694" width="118" height="37" as="geometry"/>
+            <mxGeometry x="319" y="774" width="118" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="transition" view="MixedExamples::mixedDiagram" link="mixed.sysml:30">
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="510" y="420"/>
+                <mxPoint x="550" y="470"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -194,8 +194,8 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n6" target="n7">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="747" y="389"/>
-                <mxPoint x="747" y="388"/>
+                <mxPoint x="812" y="439"/>
+                <mxPoint x="812" y="438"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -204,7 +204,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2667;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n7" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="803" y="464"/>
+                <mxPoint x="873" y="524"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -213,10 +213,10 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n9" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="875" y="316"/>
-                <mxPoint x="875" y="521"/>
-                <mxPoint x="146" y="521"/>
-                <mxPoint x="146" y="551"/>
+                <mxPoint x="950" y="356"/>
+                <mxPoint x="950" y="587"/>
+                <mxPoint x="164" y="587"/>
+                <mxPoint x="164" y="621"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -225,8 +225,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.2477;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=none;" edge="1" parent="1" source="n11" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="211" y="523"/>
-                <mxPoint x="922" y="523"/>
+                <mxPoint x="231" y="499"/>
+                <mxPoint x="1002" y="499"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -235,9 +235,9 @@
           <mxCell style="edgeStyle=none;exitX=0.5046;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2619;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=none;" edge="1" parent="1" source="n9" target="n12">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="950" y="526"/>
-                <mxPoint x="744" y="526"/>
-                <mxPoint x="744" y="553"/>
+                <mxPoint x="1030" y="595"/>
+                <mxPoint x="779" y="595"/>
+                <mxPoint x="779" y="623"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -246,7 +246,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n16" target="n15">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="989" y="665"/>
+                <mxPoint x="1039" y="745"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -255,184 +255,186 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.0833;exitPerimeter=0;entryX=0.5;entryY=0.0833;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n26:n26.0" target="n27:n27.0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="653" y="183"/>
-                <mxPoint x="747" y="183"/>
+                <mxPoint x="703" y="213"/>
+                <mxPoint x="807" y="213"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e8" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:5">
-          <mxCell style="edgeStyle=none;exitX=0.0597;exitY=0.0562;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n19">
+          <mxCell style="edgeStyle=none;exitX=0.0571;exitY=0.0508;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n19">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e9" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:6">
-          <mxCell style="edgeStyle=none;exitX=0.1817;exitY=0.0562;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n20">
+          <mxCell style="edgeStyle=none;exitX=0.1825;exitY=0.0508;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n20">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e10" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:8">
-          <mxCell style="edgeStyle=none;exitX=0.3056;exitY=0.0562;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n21">
-            <mxGeometry relative="1" as="geometry"/>
+          <mxCell style="edgeStyle=none;exitX=0.3097;exitY=0.0508;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n21">
+            <mxGeometry relative="1" as="geometry">
+              <Array as="points">
+                <mxPoint x="408" y="117"/>
+                <mxPoint x="408" y="117"/>
+              </Array>
+            </mxGeometry>
           </mxCell>
         </object>
         <object id="e11" label="" kind="reference" view="MixedExamples::mixedDiagram" link="mixed.sysml:9">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n21" target="n22">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n21" target="n22">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e12" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=0.434;exitY=0.0562;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n23">
+          <mxCell style="edgeStyle=none;exitX=0.4412;exitY=0.0508;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n23">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e13" label="" kind="reference" view="MixedExamples::mixedDiagram" link="mixed.sysml:13">
-          <mxCell style="edgeStyle=none;exitX=0.475;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n23" target="n24">
+          <mxCell style="edgeStyle=none;exitX=0.475;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n23" target="n24">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e14" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0.5967;exitY=0.0562;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n25">
+          <mxCell style="edgeStyle=none;exitX=0.6099;exitY=0.0508;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n25">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="700" y="102"/>
-                <mxPoint x="745" y="102"/>
+                <mxPoint x="755" y="117"/>
+                <mxPoint x="802.5" y="117"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e15" label="" kind="composition" view="MixedExamples::mixedDiagram" link="mixed.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.2389;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n25" target="n26">
+          <mxCell style="edgeStyle=none;exitX=0.2263;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n25" target="n26">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e16" label="" kind="composition" view="MixedExamples::mixedDiagram" link="mixed.sysml:18">
-          <mxCell style="edgeStyle=none;exitX=0.7611;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n25" target="n27">
+          <mxCell style="edgeStyle=none;exitX=0.7737;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n25" target="n27">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e17" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:22">
-          <mxCell style="edgeStyle=none;exitX=0.0958;exitY=0.0562;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n28">
+          <mxCell style="edgeStyle=none;exitX=0.096;exitY=0.0508;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n28">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="146" y="98"/>
-                <mxPoint x="180" y="98"/>
-                <mxPoint x="180" y="214.5"/>
-                <mxPoint x="191" y="214.5"/>
+                <mxPoint x="161" y="121"/>
+                <mxPoint x="182" y="121"/>
+                <mxPoint x="182" y="230.1"/>
+                <mxPoint x="161" y="230.1"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e18" label="" kind="reference" view="MixedExamples::mixedDiagram" link="mixed.sysml:23">
-          <mxCell style="edgeStyle=none;exitX=0.2389;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n28" target="n29">
+          <mxCell style="edgeStyle=none;exitX=0.2263;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n28" target="n29">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e19" label="" kind="reference" view="MixedExamples::mixedDiagram" link="mixed.sysml:24">
-          <mxCell style="edgeStyle=none;exitX=0.7611;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n28" target="n30">
+          <mxCell style="edgeStyle=none;exitX=0.7737;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n28" target="n30">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e20" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:27">
-          <mxCell style="edgeStyle=none;exitX=0.2893;exitY=0.0562;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.2941;exitY=0.0508;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="360" y="102"/>
-                <mxPoint x="310" y="102"/>
-                <mxPoint x="310" y="214.5"/>
-                <mxPoint x="318" y="214.5"/>
+                <mxPoint x="390" y="117"/>
+                <mxPoint x="340" y="117"/>
+                <mxPoint x="340" y="244.5"/>
+                <mxPoint x="348" y="244.5"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e21" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:29">
-          <mxCell style="edgeStyle=none;exitX=0.4769;exitY=0.0562;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.4866;exitY=0.0508;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="567.5" y="102"/>
-                <mxPoint x="586" y="102"/>
-                <mxPoint x="586" y="230.5"/>
-                <mxPoint x="567.5" y="230.5"/>
+                <mxPoint x="612.5" y="117"/>
+                <mxPoint x="626" y="117"/>
+                <mxPoint x="626" y="260.5"/>
+                <mxPoint x="612.5" y="260.5"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e22" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:34">
-          <mxCell style="edgeStyle=none;exitX=0.6627;exitY=0.0562;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.6817;exitY=0.0508;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="773" y="102"/>
-                <mxPoint x="814" y="102"/>
+                <mxPoint x="838" y="117"/>
+                <mxPoint x="881.5" y="117"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e23" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:42">
-          <mxCell style="edgeStyle=none;exitX=0.8223;exitY=0.0562;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n9">
+          <mxCell style="edgeStyle=none;exitX=0.8473;exitY=0.0508;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n9">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e24" label="" kind="containment" view="MixedExamples::mixedDiagram" link="mixed.sysml:52">
-          <mxCell style="edgeStyle=none;exitX=0.0488;exitY=0.0562;exitPerimeter=0;entryX=1;entryY=0.5;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n31">
+          <mxCell style="edgeStyle=none;exitX=0.0467;exitY=0.0508;exitPerimeter=0;entryX=1;entryY=0.5;entryPerimeter=0;rounded=0;html=0;startArrow=circlePlus;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n31">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="94" y="106"/>
-                <mxPoint x="172" y="106"/>
-                <mxPoint x="172" y="206.5"/>
-                <mxPoint x="149.2" y="206.5"/>
-                <mxPoint x="149.2" y="752.5"/>
+                <mxPoint x="104" y="113"/>
+                <mxPoint x="190" y="113"/>
+                <mxPoint x="190" y="237.3"/>
+                <mxPoint x="165.8" y="237.3"/>
+                <mxPoint x="165.8" y="842.5"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e25" label="" kind="composition" view="MixedExamples::mixedDiagram" link="mixed.sysml:54">
-          <mxCell style="edgeStyle=none;exitX=0.1768;exitY=0.0562;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n17">
+          <mxCell style="edgeStyle=none;exitX=0.1778;exitY=0.0508;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n17">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="235.5" y="106"/>
-                <mxPoint x="176" y="106"/>
-                <mxPoint x="176" y="214.5"/>
-                <mxPoint x="150" y="214.5"/>
-                <mxPoint x="150" y="743.25"/>
+                <mxPoint x="255.5" y="117"/>
+                <mxPoint x="198" y="117"/>
+                <mxPoint x="198" y="244.5"/>
+                <mxPoint x="170" y="244.5"/>
+                <mxPoint x="170" y="833.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e26" label="" kind="composition" view="MixedExamples::mixedDiagram" link="mixed.sysml:59">
-          <mxCell style="edgeStyle=none;exitX=0.3237;exitY=0.0562;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n18">
+          <mxCell style="edgeStyle=none;exitX=0.327;exitY=0.0508;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n18">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="398" y="98"/>
-                <mxPoint x="306" y="98"/>
-                <mxPoint x="306" y="214.5"/>
-                <mxPoint x="260" y="214.5"/>
-                <mxPoint x="260" y="446.5"/>
-                <mxPoint x="276" y="446.5"/>
-                <mxPoint x="276" y="659"/>
-                <mxPoint x="368.5" y="659"/>
+                <mxPoint x="428" y="117"/>
+                <mxPoint x="490.03" y="117"/>
+                <mxPoint x="490.03" y="507"/>
+                <mxPoint x="310" y="507"/>
+                <mxPoint x="310" y="739"/>
+                <mxPoint x="398.5" y="739"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e27" label="" kind="typing" view="MixedExamples::mixedDiagram" link="mixed.sysml:31">
-          <mxCell style="edgeStyle=none;exitX=0.5067;exitY=0;exitPerimeter=0;entryX=1;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n3" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.5067;exitY=0;exitPerimeter=0;entryX=0.75;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n3" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="598" y="359"/>
-                <mxPoint x="464" y="359"/>
-                <mxPoint x="464" y="338"/>
+                <mxPoint x="648" y="410"/>
+                <mxPoint x="432" y="410"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e28" label="" kind="typing" view="MixedExamples::mixedDiagram" link="mixed.sysml:43">
-          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.237;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n10" target="n25">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.2207;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n10" target="n25">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="146" y="561"/>
-                <mxPoint x="146" y="187"/>
-                <mxPoint x="594" y="187"/>
-                <mxPoint x="594" y="154"/>
+                <mxPoint x="163" y="631"/>
+                <mxPoint x="163" y="217"/>
+                <mxPoint x="642" y="217"/>
+                <mxPoint x="642" y="174"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -441,38 +443,38 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n11" target="n31">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="148" y="561"/>
-                <mxPoint x="148" y="743"/>
+                <mxPoint x="164" y="631"/>
+                <mxPoint x="164" y="833"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e30" label="«perform»" kind="perform" view="MixedExamples::mixedDiagram" link="mixed.sysml:48">
-          <mxCell style="edgeStyle=none;exitX=0.5031;exitY=0;exitPerimeter=0;entryX=0.75;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n13" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.5031;exitY=0;exitPerimeter=0;entryX=0.7529;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n13" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="844" y="518"/>
-                <mxPoint x="814" y="518"/>
+                <mxPoint x="884" y="579"/>
+                <mxPoint x="882" y="579"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e31" label="«exhibit»" kind="exhibit" view="MixedExamples::mixedDiagram" link="mixed.sysml:49">
-          <mxCell style="edgeStyle=none;exitX=0.503;exitY=0;exitPerimeter=0;entryX=0.7485;entryY=0.2763;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n14" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.5028;exitY=0;exitPerimeter=0;entryX=0.7514;entryY=0.2593;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n14" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="1047" y="359"/>
-                <mxPoint x="609" y="359"/>
+                <mxPoint x="1102" y="404"/>
+                <mxPoint x="657" y="404"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e32" label="" kind="specialization" view="MixedExamples::mixedDiagram" link="mixed.sysml:8">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.1556;exitPerimeter=0;entryX=1;entryY=0.5135;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n21" target="n20">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.1448;exitPerimeter=0;entryX=1;entryY=0.5135;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n21" target="n20">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="302" y="143"/>
-                <mxPoint x="302" y="141"/>
+                <mxPoint x="331" y="163"/>
+                <mxPoint x="331" y="161"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -481,17 +483,17 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=0.5;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n22" target="n19">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="106" y="223"/>
+                <mxPoint x="116" y="253"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e34" label="" kind="specialization" view="MixedExamples::mixedDiagram" link="mixed.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.7556;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n23" target="n20">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.7556;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n23" target="n20">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="520" y="180"/>
-                <mxPoint x="264" y="180"/>
+                <mxPoint x="560" y="200"/>
+                <mxPoint x="284" y="200"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -500,8 +502,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5079;exitY=0;exitPerimeter=0;entryX=0.75;entryY=1;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n24" target="n19">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="518" y="185"/>
-                <mxPoint x="131" y="185"/>
+                <mxPoint x="558" y="211"/>
+                <mxPoint x="141" y="211"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -510,30 +512,30 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.7556;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n25" target="n20">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="700" y="106"/>
-                <mxPoint x="264" y="106"/>
+                <mxPoint x="755" y="126"/>
+                <mxPoint x="284" y="126"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e37" label="" kind="typing" view="MixedExamples::mixedDiagram" link="mixed.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.237;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n26" target="n21">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.2207;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n26" target="n21">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="653" y="182"/>
-                <mxPoint x="450" y="182"/>
-                <mxPoint x="450" y="154"/>
+                <mxPoint x="703" y="206"/>
+                <mxPoint x="482" y="206"/>
+                <mxPoint x="482" y="174"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e38" label="" kind="typing" view="MixedExamples::mixedDiagram" link="mixed.sysml:18">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.237;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n27" target="n23">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.2207;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n27" target="n23">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="747" y="180"/>
-                <mxPoint x="590" y="180"/>
-                <mxPoint x="590" y="154"/>
+                <mxPoint x="807" y="200"/>
+                <mxPoint x="634" y="200"/>
+                <mxPoint x="634" y="174"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/state-entry.drawio.golden b/internal/ir/view/testdata/state-entry.drawio.golden
index 7e3142a6b8..262959445b 100644
--- a/internal/ir/view/testdata/state-entry.drawio.golden
+++ b/internal/ir/view/testdata/state-entry.drawio.golden
@@ -9,90 +9,90 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«state def»&#xA;Thermostat" fqn="Machines::Thermostat" kind="state def" view="MachineViews::thermostat" link="state-entry.sysml:7">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="625" height="502" as="geometry"/>
+            <mxGeometry x="50" y="50" width="675" height="552" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="start" kind="start" view="MachineViews::thermostat">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«state»&#xA;heating" fqn="Machines::Thermostat::heating" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:14">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="76" y="82" width="81" height="37" as="geometry"/>
+            <mxGeometry x="86" y="92" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«state»&#xA;idle" fqn="Machines::Thermostat::idle" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:15">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="159" width="164" height="212" as="geometry"/>
+            <mxGeometry x="16" y="179" width="174" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13" label="start" kind="start" view="MachineViews::thermostat">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«state»&#xA;drying" fqn="Machines::Thermostat::idle::drying" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="76" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="86" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«state»&#xA;resting" fqn="Machines::Thermostat::idle::resting" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:19">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="159" width="81" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«state»&#xA;monitoring" fqn="Machines::Thermostat::monitoring" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:21">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="220" y="159" width="389" height="327" as="geometry"/>
+            <mxGeometry x="240" y="179" width="419" height="357" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«region»&#xA;lights" fqn="Machines::Thermostat::monitoring::lights" kind="region" view="MachineViews::thermostat" link="state-entry.sysml:22">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;dashed=1;align=left;verticalAlign=top;startSize=42;collapsible=0;rounded=1;arcSize=10;" vertex="1" parent="n5">
-            <mxGeometry x="16" y="82" width="150" height="212" as="geometry"/>
+            <mxGeometry x="16" y="92" width="160" height="232" as="geometry"/>
           </mxCell>
         </object>
         <object id="n14" label="start" kind="start" view="MachineViews::thermostat">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n6">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«state»&#xA;lit" fqn="Machines::Thermostat::monitoring::lights::lit" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:25">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n6">
-            <mxGeometry x="76" y="82" width="58" height="37" as="geometry"/>
+            <mxGeometry x="86" y="92" width="58" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«state»&#xA;unlit" fqn="Machines::Thermostat::monitoring::lights::unlit" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n6">
-            <mxGeometry x="16" y="159" width="63" height="37" as="geometry"/>
+            <mxGeometry x="16" y="179" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«region»&#xA;fans" fqn="Machines::Thermostat::monitoring::fans" kind="region" view="MachineViews::thermostat" link="state-entry.sysml:28">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;dashed=1;align=left;verticalAlign=top;startSize=42;collapsible=0;rounded=1;arcSize=10;" vertex="1" parent="n5">
-            <mxGeometry x="206" y="82" width="167" height="229" as="geometry"/>
+            <mxGeometry x="226" y="92" width="177" height="249" as="geometry"/>
           </mxCell>
         </object>
         <object id="n15" label="start" kind="start" view="MachineViews::thermostat">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n7">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«state»&#xA;off&#xA;initial" fqn="Machines::Thermostat::monitoring::fans::off" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:31">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n7">
-            <mxGeometry x="76" y="82" width="75" height="54" as="geometry"/>
+            <mxGeometry x="86" y="92" width="75" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«state»&#xA;on" fqn="Machines::Thermostat::monitoring::fans::on" kind="state" view="MachineViews::thermostat" link="state-entry.sysml:32">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n7">
-            <mxGeometry x="16" y="176" width="58" height="37" as="geometry"/>
+            <mxGeometry x="16" y="196" width="58" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="[cold]" kind="transition" view="MachineViews::thermostat" link="state-entry.sysml:12">
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n12" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="96" y="132"/>
-                <mxPoint x="96" y="131"/>
+                <mxPoint x="111" y="152"/>
+                <mxPoint x="111" y="151"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -101,8 +101,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n12" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="66" y="187"/>
-                <mxPoint x="138" y="187"/>
+                <mxPoint x="76" y="212"/>
+                <mxPoint x="153" y="212"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -111,37 +111,36 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.85;exitPerimeter=0;entryX=0;entryY=0.5135;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n13" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="108" y="298"/>
-                <mxPoint x="108" y="300"/>
+                <mxPoint x="130" y="338"/>
+                <mxPoint x="130" y="340"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e3" label="" kind="transition" view="MachineViews::thermostat" link="state-entry.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=1;exitY=0.45;exitPerimeter=0;entryX=0.5432;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n13" target="n4">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.45;exitPerimeter=0;entryX=0.4938;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n13" target="n4">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="116" y="290"/>
+                <mxPoint x="122" y="330"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e4" label="[dark]" kind="transition" view="MachineViews::thermostat" link="state-entry.sysml:23">
-          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n14" target="n8">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.2586;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n14" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="332" y="373"/>
-                <mxPoint x="332" y="372"/>
+                <mxPoint x="332" y="397"/>
+                <mxPoint x="407" y="397"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e5" label="[not dark]" kind="transition" view="MachineViews::thermostat" link="state-entry.sysml:23">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.254;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n14" target="n9">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0.746;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n14" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="302" y="412"/>
-                <mxPoint x="308" y="412"/>
+                <mxPoint x="369" y="423"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -150,26 +149,26 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n15" target="n10">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="492" y="404"/>
+                <mxPoint x="542" y="454"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e7" label="" kind="transition" view="MachineViews::thermostat" link="state-entry.sysml:38">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=0.2529;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="97" y="141"/>
+                <mxPoint x="110" y="161"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e8" label="" kind="transition" view="MachineViews::thermostat" link="state-entry.sysml:39">
-          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2508;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n2" target="n5">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2493;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n2" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="240" y="305"/>
-                <mxPoint x="240" y="281"/>
+                <mxPoint x="265" y="345"/>
+                <mxPoint x="265" y="318"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -178,7 +177,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5067;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n10" target="n11">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="580" y="466"/>
+                <mxPoint x="640" y="526"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/state.drawio.golden b/internal/ir/view/testdata/state.drawio.golden
index dfb6726c0f..bb44a21f85 100644
--- a/internal/ir/view/testdata/state.drawio.golden
+++ b/internal/ir/view/testdata/state.drawio.golden
@@ -9,44 +9,44 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«state def»&#xA;VehicleStates" fqn="Machines::VehicleStates" kind="state def" view="MachineViews::vehicleStates" link="state.sysml:8">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="199" height="421" as="geometry"/>
+            <mxGeometry x="50" y="50" width="209" height="461" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="start" kind="start" view="MachineViews::vehicleStates">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«state»&#xA;off&#xA;initial" fqn="Machines::VehicleStates::off" kind="state" view="MachineViews::vehicleStates" link="state.sysml:13">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="76" y="82" width="75" height="54" as="geometry"/>
+            <mxGeometry x="86" y="92" width="75" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«state»&#xA;operating" fqn="Machines::VehicleStates::operating" kind="state" view="MachineViews::vehicleStates" link="state.sysml:14">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="176" width="167" height="229" as="geometry"/>
+            <mxGeometry x="16" y="196" width="177" height="249" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="start" kind="start" view="MachineViews::vehicleStates">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«state»&#xA;idle&#xA;initial" fqn="Machines::VehicleStates::operating::idle" kind="state" view="MachineViews::vehicleStates" link="state.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="76" y="82" width="75" height="54" as="geometry"/>
+            <mxGeometry x="86" y="92" width="75" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«state»&#xA;moving" fqn="Machines::VehicleStates::operating::moving" kind="state" view="MachineViews::vehicleStates" link="state.sysml:18">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="176" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="196" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="transition" view="MachineViews::vehicleStates" link="state.sysml:11">
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n5" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="66" y="163"/>
+                <mxPoint x="76" y="183"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -55,36 +55,31 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2593;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n6" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="112" y="308"/>
-                <mxPoint x="112" y="312"/>
+                <mxPoint x="127" y="348"/>
+                <mxPoint x="127" y="352"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e2" label="" kind="transition" view="MachineViews::vehicleStates" link="state.sysml:29">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=0.2515;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5;exitPerimeter=0;entryX=0.2486;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="98" y="149"/>
+                <mxPoint x="110" y="169"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e3" label="" kind="transition" view="MachineViews::vehicleStates" link="state.sysml:30">
-          <mxCell style="edgeStyle=none;exitX=0.503;exitY=0;exitPerimeter=0;entryX=0.2533;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n2" target="n1">
-            <mxGeometry relative="1" as="geometry">
-              <Array as="points">
-                <mxPoint x="140" y="204"/>
-                <mxPoint x="135" y="204"/>
-              </Array>
-            </mxGeometry>
+          <mxCell style="edgeStyle=none;exitX=0.5028;exitY=0;exitPerimeter=0;entryX=0.2533;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n2" target="n1">
+            <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="accept Signal [temperature &gt; 0]" fqn="Machines::VehicleStates::operating::idle_to_moving" kind="transition" view="MachineViews::vehicleStates" link="state.sysml:20">
           <mxCell style="edgeStyle=none;exitX=0.5067;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n3" target="n4">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="170" y="401"/>
+                <mxPoint x="190" y="451"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -93,7 +88,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n4" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="108" y="339"/>
+                <mxPoint x="118" y="379"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/tree-edges.drawio.golden b/internal/ir/view/testdata/tree-edges.drawio.golden
index 5c85511a87..2f3bef69ad 100644
--- a/internal/ir/view/testdata/tree-edges.drawio.golden
+++ b/internal/ir/view/testdata/tree-edges.drawio.golden
@@ -3,271 +3,271 @@
 <!-- 8 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="FleetViews-structure" name="FleetViews::structure">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1014" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1094" pageHeight="1199" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Vehicle" fqn="Fleet::Vehicle" kind="part def" view="FleetViews::structure" link="tree-edges.sysml:23">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="370" height="387" as="geometry"/>
+            <mxGeometry x="50" y="50" width="390" height="427" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;chassis" fqn="Fleet::Vehicle::chassis" kind="part" view="FleetViews::structure" link="tree-edges.sysml:24">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="114" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«attribute»&#xA;^mass" fqn="Fleet::Chassis::mass" kind="attribute" view="FleetViews::structure" link="tree-edges.sysml:10">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«part»&#xA;wheels" fqn="Fleet::Vehicle::wheels" kind="part" view="FleetViews::structure" link="tree-edges.sysml:25">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="170" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="180" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«part»&#xA;driver" fqn="Fleet::Vehicle::driver" kind="part" view="FleetViews::structure" link="tree-edges.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="282" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="302" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«attribute»&#xA;total" fqn="Fleet::Vehicle::total" kind="attribute" view="FleetViews::structure" link="tree-edges.sysml:27">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="257" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="287" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«part def»&#xA;Cabin" fqn="Fleet::Vehicle::Cabin" kind="part def" view="FleetViews::structure" link="tree-edges.sysml:28">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="138" y="257" width="76" height="37" as="geometry"/>
+            <mxGeometry x="148" y="287" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«part»&#xA;cabin" fqn="Fleet::Vehicle::cabin" kind="part" view="FleetViews::structure" link="tree-edges.sysml:29">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="254" y="257" width="63" height="37" as="geometry"/>
+            <mxGeometry x="274" y="287" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«part»&#xA;radio" fqn="Fleet::Vehicle::radio" kind="part" view="FleetViews::structure" link="tree-edges.sysml:30">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="334" width="63" height="37" as="geometry"/>
+            <mxGeometry x="16" y="374" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«part»&#xA;trailer" fqn="Fleet::Vehicle::trailer" kind="part" view="FleetViews::structure" link="tree-edges.sysml:31">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="119" y="334" width="81" height="37" as="geometry"/>
+            <mxGeometry x="129" y="374" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n10" label="«part def»&#xA;SportsCar" fqn="Fleet::SportsCar" kind="part def" view="FleetViews::structure" link="tree-edges.sysml:34">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="450" y="40" width="370" height="387" as="geometry"/>
+            <mxGeometry x="490" y="50" width="390" height="427" as="geometry"/>
           </mxCell>
         </object>
         <object id="n11" label="«part»&#xA;chassis" fqn="Fleet::SportsCar::chassis" kind="part" view="FleetViews::structure" link="tree-edges.sysml:35">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n10">
-            <mxGeometry x="16" y="82" width="114" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n12" label="«attribute»&#xA;^mass" fqn="Fleet::LightChassis::mass" kind="attribute" view="FleetViews::structure" link="tree-edges.sysml:14">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n11">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n13" label="«part»&#xA;spare" fqn="Fleet::SportsCar::spare" kind="part" view="FleetViews::structure" link="tree-edges.sysml:36">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="170" y="82" width="63" height="37" as="geometry"/>
+            <mxGeometry x="180" y="92" width="63" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n14" label="«part»&#xA;^wheels" fqn="Fleet::Vehicle::wheels" kind="part" view="FleetViews::structure" link="tree-edges.sysml:25">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="273" y="82" width="81" height="37" as="geometry"/>
+            <mxGeometry x="293" y="92" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n15" label="«part»&#xA;^driver" fqn="Fleet::Vehicle::driver" kind="part" view="FleetViews::structure" link="tree-edges.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="16" y="257" width="81" height="37" as="geometry"/>
+            <mxGeometry x="16" y="287" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n16" label="«attribute»&#xA;^total" fqn="Fleet::Vehicle::total" kind="attribute" view="FleetViews::structure" link="tree-edges.sysml:27">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="137" y="257" width="82" height="37" as="geometry"/>
+            <mxGeometry x="147" y="287" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n17" label="«part»&#xA;^cabin" fqn="Fleet::Vehicle::cabin" kind="part" view="FleetViews::structure" link="tree-edges.sysml:29">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="259" y="257" width="72" height="37" as="geometry"/>
+            <mxGeometry x="279" y="287" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n18" label="«part»&#xA;^radio" fqn="Fleet::Vehicle::radio" kind="part" view="FleetViews::structure" link="tree-edges.sysml:30">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="16" y="334" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="374" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n19" label="«part»&#xA;^trailer" fqn="Fleet::Vehicle::trailer" kind="part" view="FleetViews::structure" link="tree-edges.sysml:31">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n10">
-            <mxGeometry x="128" y="334" width="90" height="37" as="geometry"/>
+            <mxGeometry x="138" y="374" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n20" label="«part def»&#xA;Chassis" fqn="Fleet::Chassis" kind="part def" view="FleetViews::structure" link="tree-edges.sysml:9">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="860" y="40" width="114" height="135" as="geometry"/>
+            <mxGeometry x="930" y="50" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n21" label="«attribute»&#xA;mass" fqn="Fleet::Chassis::mass" kind="attribute" view="FleetViews::structure" link="tree-edges.sysml:10">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n20">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n22" label="«part def»&#xA;LightChassis" fqn="Fleet::LightChassis" kind="part def" view="FleetViews::structure" link="tree-edges.sysml:13">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="467" width="127" height="135" as="geometry"/>
+            <mxGeometry x="50" y="527" width="127" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n23" label="«attribute»&#xA;mass" fqn="Fleet::LightChassis::mass" kind="attribute" view="FleetViews::structure" link="tree-edges.sysml:14">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n22">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n24" label="«part def»&#xA;Wheel" fqn="Fleet::Wheel" kind="part def" view="FleetViews::structure" link="tree-edges.sysml:7">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="207" y="467" width="76" height="37" as="geometry"/>
+            <mxGeometry x="227" y="527" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n25" label="«part def»&#xA;Driver" fqn="Fleet::Driver" kind="part def" view="FleetViews::structure" link="tree-edges.sysml:17">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="323" y="467" width="76" height="37" as="geometry"/>
+            <mxGeometry x="353" y="527" width="76" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n26" label="«attribute def»&#xA;Mass" fqn="Fleet::Mass" kind="attribute def" view="FleetViews::structure" link="tree-edges.sysml:5">
           <mxCell style="rounded=0;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="1">
-            <mxGeometry x="40" y="642" width="106" height="37" as="geometry"/>
+            <mxGeometry x="50" y="722" width="106" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n27" label="«part»&#xA;fleetCar" fqn="Fleet::fleetCar" kind="part" view="FleetViews::structure" link="tree-edges.sysml:39">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="186" y="642" width="388" height="387" as="geometry"/>
+            <mxGeometry x="206" y="722" width="408" height="427" as="geometry"/>
           </mxCell>
         </object>
         <object id="n28" label="«part»&#xA;^chassis" fqn="Fleet::Vehicle::chassis" kind="part" view="FleetViews::structure" link="tree-edges.sysml:24">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n27">
-            <mxGeometry x="16" y="82" width="114" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="114" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n29" label="«attribute»&#xA;^mass" fqn="Fleet::Chassis::mass" kind="attribute" view="FleetViews::structure" link="tree-edges.sysml:10">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n28">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n30" label="«part»&#xA;^wheels" fqn="Fleet::Vehicle::wheels" kind="part" view="FleetViews::structure" link="tree-edges.sysml:25">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n27">
-            <mxGeometry x="170" y="82" width="81" height="37" as="geometry"/>
+            <mxGeometry x="180" y="92" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n31" label="«part»&#xA;^driver" fqn="Fleet::Vehicle::driver" kind="part" view="FleetViews::structure" link="tree-edges.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n27">
-            <mxGeometry x="291" y="82" width="81" height="37" as="geometry"/>
+            <mxGeometry x="311" y="92" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n32" label="«attribute»&#xA;^total" fqn="Fleet::Vehicle::total" kind="attribute" view="FleetViews::structure" link="tree-edges.sysml:27">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n27">
-            <mxGeometry x="16" y="257" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="287" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n33" label="«part»&#xA;^cabin" fqn="Fleet::Vehicle::cabin" kind="part" view="FleetViews::structure" link="tree-edges.sysml:29">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n27">
-            <mxGeometry x="138" y="257" width="72" height="37" as="geometry"/>
+            <mxGeometry x="148" y="287" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n34" label="«part»&#xA;^radio" fqn="Fleet::Vehicle::radio" kind="part" view="FleetViews::structure" link="tree-edges.sysml:30">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n27">
-            <mxGeometry x="250" y="257" width="72" height="37" as="geometry"/>
+            <mxGeometry x="270" y="287" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n35" label="«part»&#xA;^trailer" fqn="Fleet::Vehicle::trailer" kind="part" view="FleetViews::structure" link="tree-edges.sysml:31">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n27">
-            <mxGeometry x="16" y="334" width="90" height="37" as="geometry"/>
+            <mxGeometry x="16" y="374" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:24">
-          <mxCell style="edgeStyle=none;exitX=0.1973;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.1872;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e1" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:25">
-          <mxCell style="edgeStyle=none;exitX=0.5568;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.5538;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n3">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e2" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:26">
-          <mxCell style="edgeStyle=none;exitX=0.8595;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.8667;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e3" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:27">
-          <mxCell style="edgeStyle=none;exitX=0.1541;exitY=0.1085;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.1462;exitY=0.0984;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n0" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="97" y="106"/>
-                <mxPoint x="186" y="106"/>
-                <mxPoint x="186" y="273"/>
-                <mxPoint x="154" y="273"/>
-                <mxPoint x="154" y="306.25"/>
+                <mxPoint x="107" y="121"/>
+                <mxPoint x="196" y="121"/>
+                <mxPoint x="196" y="304"/>
+                <mxPoint x="166" y="304"/>
+                <mxPoint x="166" y="346.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e4" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:29">
-          <mxCell style="edgeStyle=none;exitX=0.7716;exitY=0.1085;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n7">
+          <mxCell style="edgeStyle=none;exitX=0.7833;exitY=0.0984;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n7">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="325.5" y="102"/>
-                <mxPoint x="306" y="102"/>
-                <mxPoint x="306" y="228"/>
-                <mxPoint x="309.75" y="228"/>
+                <mxPoint x="355.5" y="117"/>
+                <mxPoint x="336" y="117"/>
+                <mxPoint x="336" y="258"/>
+                <mxPoint x="339.75" y="258"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e5" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:30">
-          <mxCell style="edgeStyle=none;exitX=0.1284;exitY=0.1085;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n8">
+          <mxCell style="edgeStyle=none;exitX=0.1218;exitY=0.0984;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n8">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="87.5" y="98"/>
-                <mxPoint x="190" y="98"/>
-                <mxPoint x="190" y="277"/>
-                <mxPoint x="158" y="277"/>
-                <mxPoint x="158" y="354"/>
-                <mxPoint x="139" y="354"/>
-                <mxPoint x="139" y="383.25"/>
+                <mxPoint x="97.5" y="113"/>
+                <mxPoint x="204" y="113"/>
+                <mxPoint x="204" y="312"/>
+                <mxPoint x="174" y="312"/>
+                <mxPoint x="174" y="399"/>
+                <mxPoint x="154" y="399"/>
+                <mxPoint x="154" y="433.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e6" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:31">
-          <mxCell style="edgeStyle=none;exitX=0.4311;exitY=0.1085;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n9">
+          <mxCell style="edgeStyle=none;exitX=0.4346;exitY=0.0984;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n9">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="199.5" y="102"/>
-                <mxPoint x="194" y="102"/>
-                <mxPoint x="194" y="281"/>
-                <mxPoint x="162" y="281"/>
-                <mxPoint x="162" y="354"/>
-                <mxPoint x="179.25" y="354"/>
+                <mxPoint x="219.5" y="117"/>
+                <mxPoint x="212" y="117"/>
+                <mxPoint x="212" y="320"/>
+                <mxPoint x="182" y="320"/>
+                <mxPoint x="182" y="399"/>
+                <mxPoint x="199.25" y="399"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e7" label="" kind="typing" view="FleetViews::structure" link="tree-edges.sysml:24">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.2544;entryY=0.3111;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n20">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0.2544;entryY=0.2897;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n20">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="113" y="98"/>
-                <mxPoint x="889" y="98"/>
+                <mxPoint x="123" y="117"/>
+                <mxPoint x="959" y="117"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e8" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:10">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
@@ -275,10 +275,10 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n3" target="n24">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="246" y="231"/>
-                <mxPoint x="270" y="231"/>
-                <mxPoint x="270" y="401"/>
-                <mxPoint x="264" y="401"/>
+                <mxPoint x="266" y="259"/>
+                <mxPoint x="290" y="259"/>
+                <mxPoint x="290" y="451"/>
+                <mxPoint x="284" y="451"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -287,8 +287,8 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n4" target="n25">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="358" y="231"/>
-                <mxPoint x="380" y="231"/>
+                <mxPoint x="388" y="259"/>
+                <mxPoint x="410" y="259"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -297,8 +297,8 @@
           <mxCell style="edgeStyle=none;exitX=0;exitY=0.5135;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n5" target="n26">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="24" y="316"/>
-                <mxPoint x="24" y="651"/>
+                <mxPoint x="34" y="356"/>
+                <mxPoint x="34" y="731"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -309,108 +309,99 @@
           </mxCell>
         </object>
         <object id="e13" label="" kind="specialization" view="FleetViews::structure" link="tree-edges.sysml:34">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.0543;exitPerimeter=0;entryX=1;entryY=0.0543;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n10" target="n0">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.0492;exitPerimeter=0;entryX=1;entryY=0.0492;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n10" target="n0">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e14" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:35">
-          <mxCell style="edgeStyle=none;exitX=0.1973;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n11">
+          <mxCell style="edgeStyle=none;exitX=0.1872;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n11">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e15" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:36">
-          <mxCell style="edgeStyle=none;exitX=0.5446;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n13">
+          <mxCell style="edgeStyle=none;exitX=0.5423;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n13">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e16" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:25">
-          <mxCell style="edgeStyle=none;exitX=0.8473;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n14">
+          <mxCell style="edgeStyle=none;exitX=0.8551;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n14">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e17" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:26">
-          <mxCell style="edgeStyle=none;exitX=0.1527;exitY=0.1085;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n15">
+          <mxCell style="edgeStyle=none;exitX=0.1449;exitY=0.0984;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n15">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="506.5" y="106"/>
-                <mxPoint x="596" y="106"/>
-                <mxPoint x="596" y="273"/>
-                <mxPoint x="563" y="273"/>
-                <mxPoint x="563" y="306.25"/>
+                <mxPoint x="546.5" y="121"/>
+                <mxPoint x="487" y="121"/>
+                <mxPoint x="487" y="346.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e18" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:27">
-          <mxCell style="edgeStyle=none;exitX=0.4811;exitY=0.1085;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n16">
+          <mxCell style="edgeStyle=none;exitX=0.4821;exitY=0.0984;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n10" target="n16">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="628" y="98"/>
-                <mxPoint x="604" y="98"/>
-                <mxPoint x="604" y="228"/>
-                <mxPoint x="607.5" y="228"/>
+                <mxPoint x="678" y="113"/>
+                <mxPoint x="654" y="113"/>
+                <mxPoint x="654" y="258"/>
+                <mxPoint x="657.5" y="258"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e19" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:29">
-          <mxCell style="edgeStyle=none;exitX=0.7973;exitY=0.1085;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n17">
+          <mxCell style="edgeStyle=none;exitX=0.8077;exitY=0.0984;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n17">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="745" y="102"/>
-                <mxPoint x="707" y="102"/>
-                <mxPoint x="707" y="228"/>
-                <mxPoint x="727" y="228"/>
+                <mxPoint x="805" y="117"/>
+                <mxPoint x="753" y="117"/>
+                <mxPoint x="753" y="346.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e20" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:30">
-          <mxCell style="edgeStyle=none;exitX=0.1405;exitY=0.1085;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n18">
+          <mxCell style="edgeStyle=none;exitX=0.1333;exitY=0.0984;exitPerimeter=0;entryX=0;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n18">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="502" y="98"/>
-                <mxPoint x="600" y="98"/>
-                <mxPoint x="600" y="281"/>
-                <mxPoint x="571" y="281"/>
-                <mxPoint x="571" y="354"/>
-                <mxPoint x="558" y="354"/>
-                <mxPoint x="558" y="383.25"/>
+                <mxPoint x="542" y="113"/>
+                <mxPoint x="479" y="113"/>
+                <mxPoint x="479" y="433.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e21" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:31">
-          <mxCell style="edgeStyle=none;exitX=0.4676;exitY=0.1085;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n19">
+          <mxCell style="edgeStyle=none;exitX=0.4692;exitY=0.0984;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n10" target="n19">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="623" y="106"/>
-                <mxPoint x="699" y="106"/>
-                <mxPoint x="699" y="228"/>
-                <mxPoint x="689" y="228"/>
-                <mxPoint x="689" y="383.25"/>
+                <mxPoint x="673" y="121"/>
+                <mxPoint x="749" y="121"/>
+                <mxPoint x="749" y="433.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e22" label="" kind="redefinition" view="FleetViews::structure" link="tree-edges.sysml:35">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.7481;exitPerimeter=0;entryX=1;entryY=0.7481;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n11" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.7517;exitPerimeter=0;entryX=1;entryY=0.7517;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n11" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e23" label="" kind="typing" view="FleetViews::structure" link="tree-edges.sysml:35">
-          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5037;exitPerimeter=0;entryX=0.748;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n11" target="n22">
+          <mxCell style="edgeStyle=none;exitX=0;exitY=0.5034;exitPerimeter=0;entryX=0.748;entryY=0;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n11" target="n22">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="278" y="190"/>
-                <mxPoint x="278" y="435"/>
-                <mxPoint x="135" y="435"/>
+                <mxPoint x="299" y="215"/>
+                <mxPoint x="299" y="490"/>
+                <mxPoint x="145" y="490"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e24" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:14">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n11" target="n12">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n11" target="n12">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
@@ -418,11 +409,11 @@
           <mxCell style="edgeStyle=none;exitX=0.5079;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n13" target="n24">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="652" y="277"/>
-                <mxPoint x="412" y="277"/>
-                <mxPoint x="412" y="401"/>
-                <mxPoint x="303" y="401"/>
-                <mxPoint x="303" y="476"/>
+                <mxPoint x="702" y="312"/>
+                <mxPoint x="447" y="312"/>
+                <mxPoint x="447" y="451"/>
+                <mxPoint x="328" y="451"/>
+                <mxPoint x="328" y="536"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -431,14 +422,14 @@
           <mxCell style="edgeStyle=none;exitX=0.5079;exitY=0;exitPerimeter=0;entryX=0.75;entryY=0;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n13" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="652" y="106"/>
-                <mxPoint x="264" y="106"/>
+                <mxPoint x="702" y="126"/>
+                <mxPoint x="284" y="126"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e27" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:10">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n20" target="n21">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n20" target="n21">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
@@ -446,26 +437,26 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n21" target="n26">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="917" y="583"/>
-                <mxPoint x="166" y="583"/>
-                <mxPoint x="166" y="651"/>
+                <mxPoint x="987" y="653"/>
+                <mxPoint x="181" y="653"/>
+                <mxPoint x="181" y="731"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e29" label="" kind="specialization" view="FleetViews::structure" link="tree-edges.sysml:13">
-          <mxCell style="edgeStyle=none;exitX=0.5039;exitY=0;exitPerimeter=0;entryX=0;entryY=0.237;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n22" target="n20">
+          <mxCell style="edgeStyle=none;exitX=0.5039;exitY=0;exitPerimeter=0;entryX=0;entryY=0.2207;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n22" target="n20">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="104" y="443"/>
-                <mxPoint x="840" y="443"/>
-                <mxPoint x="840" y="72"/>
+                <mxPoint x="114" y="498"/>
+                <mxPoint x="905" y="498"/>
+                <mxPoint x="905" y="82"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e30" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:14">
-          <mxCell style="edgeStyle=none;exitX=0.4488;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n22" target="n23">
+          <mxCell style="edgeStyle=none;exitX=0.4488;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n22" target="n23">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
@@ -473,81 +464,81 @@
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.4865;exitPerimeter=0;entryX=0.2561;entryY=1;entryPerimeter=0;rounded=0;html=0;endArrow=block;endFill=0;" edge="1" parent="1" source="n23" target="n21">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="897" y="567"/>
+                <mxPoint x="967" y="637"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e32" label="" kind="typing" view="FleetViews::structure" link="tree-edges.sysml:39">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.0827;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n27" target="n0">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=1;entryY=0.0749;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n27" target="n0">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="380" y="575"/>
-                <mxPoint x="426" y="575"/>
-                <mxPoint x="426" y="72"/>
+                <mxPoint x="410" y="645"/>
+                <mxPoint x="456" y="645"/>
+                <mxPoint x="456" y="82"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e33" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:24">
-          <mxCell style="edgeStyle=none;exitX=0.1881;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n28">
+          <mxCell style="edgeStyle=none;exitX=0.1789;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n28">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e34" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:25">
-          <mxCell style="edgeStyle=none;exitX=0.5425;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n30">
+          <mxCell style="edgeStyle=none;exitX=0.5404;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n30">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e35" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:26">
-          <mxCell style="edgeStyle=none;exitX=0.8544;exitY=0.1085;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n27" target="n31">
+          <mxCell style="edgeStyle=none;exitX=0.8615;exitY=0.0984;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n27" target="n31">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e36" label="" kind="reference" view="FleetViews::structure" link="tree-edges.sysml:27">
-          <mxCell style="edgeStyle=none;exitX=0.1469;exitY=0.1085;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n27" target="n32">
+          <mxCell style="edgeStyle=none;exitX=0.1397;exitY=0.0984;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n27" target="n32">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="243" y="708"/>
-                <mxPoint x="332" y="708"/>
-                <mxPoint x="332" y="875"/>
-                <mxPoint x="300" y="875"/>
-                <mxPoint x="300" y="908.25"/>
+                <mxPoint x="263" y="793"/>
+                <mxPoint x="352" y="793"/>
+                <mxPoint x="352" y="980"/>
+                <mxPoint x="327" y="980"/>
+                <mxPoint x="327" y="1018.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e37" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:29">
-          <mxCell style="edgeStyle=none;exitX=0.4485;exitY=0.1085;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n33">
+          <mxCell style="edgeStyle=none;exitX=0.451;exitY=0.0984;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n33">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="360" y="704"/>
-                <mxPoint x="340" y="704"/>
-                <mxPoint x="340" y="830"/>
-                <mxPoint x="342" y="830"/>
+                <mxPoint x="390" y="789"/>
+                <mxPoint x="370" y="789"/>
+                <mxPoint x="370" y="930"/>
+                <mxPoint x="372" y="930"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e38" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:30">
-          <mxCell style="edgeStyle=none;exitX=0.7371;exitY=0.1085;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n34">
+          <mxCell style="edgeStyle=none;exitX=0.75;exitY=0.0984;exitPerimeter=0;entryX=0.25;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n34">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="472" y="704"/>
-                <mxPoint x="454" y="704"/>
+                <mxPoint x="512" y="789"/>
+                <mxPoint x="494" y="789"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e39" label="" kind="composition" view="FleetViews::structure" link="tree-edges.sysml:31">
-          <mxCell style="edgeStyle=none;exitX=0.1572;exitY=0.1085;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n35">
+          <mxCell style="edgeStyle=none;exitX=0.1495;exitY=0.0984;exitPerimeter=0;entryX=1;entryY=0.25;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n27" target="n35">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="247" y="700"/>
-                <mxPoint x="336" y="700"/>
-                <mxPoint x="336" y="883"/>
-                <mxPoint x="308" y="883"/>
-                <mxPoint x="308" y="985.25"/>
+                <mxPoint x="267" y="785"/>
+                <mxPoint x="360" y="785"/>
+                <mxPoint x="360" y="988"/>
+                <mxPoint x="335" y="988"/>
+                <mxPoint x="335" y="1105.25"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/tree.drawio.golden b/internal/ir/view/testdata/tree.drawio.golden
index 442ba659a0..28116b3e44 100644
--- a/internal/ir/view/testdata/tree.drawio.golden
+++ b/internal/ir/view/testdata/tree.drawio.golden
@@ -3,92 +3,92 @@
 <!-- 2 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="VehicleViews-vehicleView" name="VehicleViews::vehicleView">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="854" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part def»&#xA;Vehicle" fqn="Vehicles::Vehicle" kind="part def" view="VehicleViews::vehicleView" link="tree.sysml:11">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="398" height="309" as="geometry"/>
+            <mxGeometry x="50" y="50" width="418" height="339" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;engine" fqn="Vehicles::Vehicle::engine" kind="part" view="VehicleViews::vehicleView" link="tree.sysml:12">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="254" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="264" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«attribute»&#xA;^power" fqn="Vehicles::Engine::power" kind="attribute" view="VehicleViews::vehicleView" link="tree.sysml:5">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«part»&#xA;^cylinder" fqn="Vehicles::Engine::cylinder" kind="part" view="VehicleViews::vehicleView" link="tree.sysml:6">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n1">
-            <mxGeometry x="138" y="82" width="100" height="37" as="geometry"/>
+            <mxGeometry x="148" y="92" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«part»&#xA;wheels" fqn="Vehicles::Vehicle::wheels" kind="part" view="VehicleViews::vehicleView" link="tree.sysml:13">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="310" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="330" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="connect" kind="connect" view="VehicleViews::vehicleView" link="tree.sysml:14">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="257" width="81" height="36" as="geometry"/>
+            <mxGeometry x="16" y="287" width="81" height="36" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«view»&#xA;engineSubview" fqn="VehicleViews::vehicleView::engineSubview" kind="view" view="VehicleViews::vehicleView" link="tree.sysml:29">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="478" y="40" width="276" height="233" as="geometry"/>
+            <mxGeometry x="518" y="50" width="286" height="253" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«part def»&#xA;Engine" fqn="Vehicles::Engine" kind="part def" view="VehicleViews::vehicleView" link="tree.sysml:4">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="n6">
-            <mxGeometry x="16" y="82" width="244" height="135" as="geometry"/>
+            <mxGeometry x="16" y="92" width="254" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«attribute»&#xA;power" fqn="Vehicles::Engine::power" kind="attribute" view="VehicleViews::vehicleView" link="tree.sysml:5">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n7">
-            <mxGeometry x="16" y="82" width="82" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="82" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n9" label="«part»&#xA;cylinder" fqn="Vehicles::Engine::cylinder" kind="part" view="VehicleViews::vehicleView" link="tree.sysml:6">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n7">
-            <mxGeometry x="138" y="82" width="90" height="37" as="geometry"/>
+            <mxGeometry x="148" y="92" width="90" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="composition" view="VehicleViews::vehicleView" link="tree.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=0.3593;exitY=0.1359;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.3541;exitY=0.1239;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e1" label="" kind="composition" view="VehicleViews::vehicleView" link="tree.sysml:13">
-          <mxCell style="edgeStyle=none;exitX=0.8693;exitY=0.1359;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.8756;exitY=0.1239;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e2" label="" kind="typing" view="VehicleViews::vehicleView" link="tree.sysml:12">
-          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5037;exitPerimeter=0;entryX=0;entryY=0.5037;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n7">
+          <mxCell style="edgeStyle=none;exitX=1;exitY=0.5034;exitPerimeter=0;entryX=0;entryY=0.5034;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n7">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e3" label="" kind="reference" view="VehicleViews::vehicleView" link="tree.sysml:5">
-          <mxCell style="edgeStyle=none;exitX=0.2244;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.2159;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="" kind="composition" view="VehicleViews::vehicleView" link="tree.sysml:6">
-          <mxCell style="edgeStyle=none;exitX=0.7402;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n1" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.75;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n1" target="n3">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e5" label="" kind="reference" view="VehicleViews::vehicleView" link="tree.sysml:5">
-          <mxCell style="edgeStyle=none;exitX=0.2336;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n7" target="n8">
+          <mxCell style="edgeStyle=none;exitX=0.2244;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n7" target="n8">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e6" label="" kind="composition" view="VehicleViews::vehicleView" link="tree.sysml:6">
-          <mxCell style="edgeStyle=none;exitX=0.75;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n7" target="n9">
+          <mxCell style="edgeStyle=none;exitX=0.7598;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n7" target="n9">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
diff --git a/internal/ir/view/testdata/typed-action.drawio.golden b/internal/ir/view/testdata/typed-action.drawio.golden
index 5632d41340..f05e6039ce 100644
--- a/internal/ir/view/testdata/typed-action.drawio.golden
+++ b/internal/ir/view/testdata/typed-action.drawio.golden
@@ -9,30 +9,30 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«action»&#xA;run" fqn="Typed::run" kind="action" view="TypedViews::cycleView" link="typed-behavior.sysml:7">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="156" height="205" as="geometry"/>
+            <mxGeometry x="50" y="50" width="166" height="225" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="initial" fqn="Typed::run::start" kind="initial" view="TypedViews::cycleView" link="typed-behavior.sysml:8">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«action»&#xA;warm" fqn="Typed::run::warm" kind="action" view="TypedViews::cycleView" link="typed-behavior.sysml:9">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="76" y="82" width="64" height="37" as="geometry"/>
+            <mxGeometry x="86" y="92" width="64" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="final" kind="final" view="TypedViews::cycleView" link="typed-behavior.sysml:10">
           <mxCell style="ellipse;shape=endState;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="159" width="30" height="30" as="geometry"/>
+            <mxGeometry x="16" y="179" width="30" height="30" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="succession" view="TypedViews::cycleView" link="typed-behavior.sysml:11">
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="96" y="132"/>
-                <mxPoint x="96" y="131"/>
+                <mxPoint x="111" y="152"/>
+                <mxPoint x="111" y="151"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -41,7 +41,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2667;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=open;" edge="1" parent="1" source="n2" target="n3">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="148" y="207"/>
+                <mxPoint x="168" y="237"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/typed-state.drawio.golden b/internal/ir/view/testdata/typed-state.drawio.golden
index bffebdadbe..00300f414c 100644
--- a/internal/ir/view/testdata/typed-state.drawio.golden
+++ b/internal/ir/view/testdata/typed-state.drawio.golden
@@ -9,30 +9,30 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«state def»&#xA;Boiler" fqn="Typed::Boiler" kind="state def" view="TypedViews::boilerView" link="typed-behavior.sysml:17">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="167" height="229" as="geometry"/>
+            <mxGeometry x="50" y="50" width="177" height="249" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="start" kind="start" view="TypedViews::boilerView">
           <mxCell style="ellipse;html=0;fillColor=#000000;strokeColor=#000000;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="20" height="20" as="geometry"/>
+            <mxGeometry x="16" y="92" width="20" height="20" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«state»&#xA;idle&#xA;initial" fqn="Typed::Boiler::idle" kind="state" view="TypedViews::boilerView" link="typed-behavior.sysml:20">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="76" y="82" width="75" height="54" as="geometry"/>
+            <mxGeometry x="86" y="92" width="75" height="54" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«state»&#xA;heating" fqn="Typed::Boiler::heating" kind="state" view="TypedViews::boilerView" link="typed-behavior.sysml:21">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="176" width="81" height="37" as="geometry"/>
+            <mxGeometry x="16" y="196" width="81" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="transition" view="TypedViews::boilerView" link="typed-behavior.sysml:18">
           <mxCell style="edgeStyle=none;exitX=1;exitY=0.5;exitPerimeter=0;entryX=0;entryY=0.2593;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n3" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="96" y="132"/>
-                <mxPoint x="96" y="136"/>
+                <mxPoint x="111" y="152"/>
+                <mxPoint x="111" y="156"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -41,7 +41,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5067;exitY=1;exitPerimeter=0;entryX=1;entryY=0.2432;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="154" y="225"/>
+                <mxPoint x="174" y="255"/>
               </Array>
             </mxGeometry>
           </mxCell>
@@ -50,7 +50,7 @@
           <mxCell style="edgeStyle=none;exitX=0.5062;exitY=0;exitPerimeter=0;entryX=0;entryY=0.7593;entryPerimeter=0;rounded=0;html=0;endArrow=open;" edge="1" parent="1" source="n2" target="n1">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="97" y="163"/>
+                <mxPoint x="107" y="183"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/variation-interconnection.drawio.golden b/internal/ir/view/testdata/variation-interconnection.drawio.golden
index a14b35f59c..0a75160397 100644
--- a/internal/ir/view/testdata/variation-interconnection.drawio.golden
+++ b/internal/ir/view/testdata/variation-interconnection.drawio.golden
@@ -9,34 +9,34 @@
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part»&#xA;vehicleFamily" fqn="VariationViews::vehicleFamily" kind="part" view="VariationViews::familyLinks" link="variation.sysml:20">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="388" height="233" as="geometry"/>
+            <mxGeometry x="50" y="50" width="408" height="253" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;engine" fqn="VariationViews::vehicleFamily::engine" kind="part" view="VariationViews::familyLinks" link="variation.sysml:21">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«variation part»&#xA;transmission" fqn="VariationViews::vehicleFamily::transmission" kind="variation part" view="VariationViews::familyLinks" link="variation.sysml:22">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="128" y="82" width="244" height="135" as="geometry"/>
+            <mxGeometry x="138" y="92" width="254" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«variant»&#xA;manual" fqn="VariationViews::vehicleFamily::transmission::manual" kind="variant" view="VariationViews::familyLinks" link="variation.sysml:23">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«variant part»&#xA;automatic" fqn="VariationViews::vehicleFamily::transmission::automatic" kind="variant part" view="VariationViews::familyLinks" link="variation.sysml:24">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="128" y="82" width="100" height="37" as="geometry"/>
+            <mxGeometry x="138" y="92" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="connection" view="VariationViews::familyLinks" link="variation.sysml:26">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.5037;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.5034;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="92" y="190"/>
+                <mxPoint x="102" y="215"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/variation-mixed.drawio.golden b/internal/ir/view/testdata/variation-mixed.drawio.golden
index d5e6faaeeb..531ce31f87 100644
--- a/internal/ir/view/testdata/variation-mixed.drawio.golden
+++ b/internal/ir/view/testdata/variation-mixed.drawio.golden
@@ -3,96 +3,94 @@
 <!-- 2 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="VariationViews-familyMixed" name="VariationViews::familyMixed">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="885" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part»&#xA;vehicleFamily" fqn="VariationViews::vehicleFamily" kind="part" view="VariationViews::familyMixed" link="variation.sysml:20">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="388" height="233" as="geometry"/>
+            <mxGeometry x="50" y="50" width="408" height="253" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;engine" fqn="VariationViews::vehicleFamily::engine" kind="part" view="VariationViews::familyMixed" link="variation.sysml:21">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«variation part»&#xA;transmission" fqn="VariationViews::vehicleFamily::transmission" kind="variation part" view="VariationViews::familyMixed" link="variation.sysml:22">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="128" y="82" width="244" height="135" as="geometry"/>
+            <mxGeometry x="138" y="92" width="254" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«variant»&#xA;manual" fqn="VariationViews::vehicleFamily::transmission::manual" kind="variant" view="VariationViews::familyMixed" link="variation.sysml:23">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«variant part»&#xA;automatic" fqn="VariationViews::vehicleFamily::transmission::automatic" kind="variant part" view="VariationViews::familyMixed" link="variation.sysml:24">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="128" y="82" width="100" height="37" as="geometry"/>
+            <mxGeometry x="138" y="92" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="«variation part def»&#xA;EngineChoices" fqn="VariationViews::EngineChoices" kind="variation part def" view="VariationViews::familyMixed" link="variation.sysml:15">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="468" y="40" width="317" height="135" as="geometry"/>
+            <mxGeometry x="508" y="50" width="327" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«variant»&#xA;fourCylinder" fqn="VariationViews::EngineChoices::fourCylinder" kind="variant" view="VariationViews::familyMixed" link="variation.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="16" y="82" width="127" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«variant»&#xA;sixCylinder" fqn="VariationViews::EngineChoices::sixCylinder" kind="variant" view="VariationViews::familyMixed" link="variation.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n5">
-            <mxGeometry x="183" y="82" width="118" height="37" as="geometry"/>
+            <mxGeometry x="193" y="92" width="118" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="connection" view="VariationViews::familyMixed" link="variation.sysml:26">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.5037;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n1" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=1;exitPerimeter=0;entryX=0;entryY=0.5034;entryPerimeter=0;rounded=0;html=0;endArrow=none;strokeWidth=3;" edge="1" parent="1" source="n1" target="n2">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="92" y="190"/>
+                <mxPoint x="102" y="215"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e1" label="" kind="composition" view="VariationViews::familyMixed" link="variation.sysml:21">
-          <mxCell style="edgeStyle=none;exitX=0.134;exitY=0.1803;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.1275;exitY=0.166;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e2" label="" kind="composition" view="VariationViews::familyMixed" link="variation.sysml:22">
-          <mxCell style="edgeStyle=none;exitX=0.6443;exitY=0.1803;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.6495;exitY=0.166;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n2">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e3" label="" kind="reference" view="VariationViews::familyMixed" link="variation.sysml:23">
-          <mxCell style="edgeStyle=none;exitX=0.2131;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.2047;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n3">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="" kind="composition" view="VariationViews::familyMixed" link="variation.sysml:24">
-          <mxCell style="edgeStyle=none;exitX=0.7295;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.7402;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e5" label="" kind="reference" view="VariationViews::familyMixed" link="variation.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0.2508;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n5" target="n6">
+          <mxCell style="edgeStyle=none;exitX=0.2431;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n5" target="n6">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e6" label="" kind="reference" view="VariationViews::familyMixed" link="variation.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.7634;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n5" target="n7">
+          <mxCell style="edgeStyle=none;exitX=0.7706;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n5" target="n7">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e7" label="" kind="typing" view="VariationViews::familyMixed" link="variation.sysml:21">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.5037;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n5">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.5034;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n5">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="92" y="106"/>
-                <mxPoint x="448" y="106"/>
-                <mxPoint x="448" y="108"/>
+                <mxPoint x="102" y="123"/>
               </Array>
             </mxGeometry>
           </mxCell>
diff --git a/internal/ir/view/testdata/variation-tree.drawio.golden b/internal/ir/view/testdata/variation-tree.drawio.golden
index cf2fd64ebd..5274fd6d85 100644
--- a/internal/ir/view/testdata/variation-tree.drawio.golden
+++ b/internal/ir/view/testdata/variation-tree.drawio.golden
@@ -3,93 +3,91 @@
 <!-- 2 node(s) were not laid out and sit on a grid: the draw.io desktop command line (32 or later) arranges them with its normalize and layout elkLayered options, the editor with Arrange › Layout -->
 <mxfile host="OpenSysML" type="device" compressed="false">
   <diagram id="VariationViews-familyTree" name="VariationViews::familyTree">
-    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+    <mxGraphModel dx="0" dy="0" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="885" pageHeight="1169" math="0" shadow="0">
       <root>
         <mxCell id="0"/>
         <mxCell id="1" parent="0"/>
         <object id="n0" label="«part»&#xA;vehicleFamily" fqn="VariationViews::vehicleFamily" kind="part" view="VariationViews::familyTree" link="variation.sysml:20">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="1">
-            <mxGeometry x="40" y="40" width="388" height="309" as="geometry"/>
+            <mxGeometry x="50" y="50" width="408" height="339" as="geometry"/>
           </mxCell>
         </object>
         <object id="n1" label="«part»&#xA;engine" fqn="VariationViews::vehicleFamily::engine" kind="part" view="VariationViews::familyTree" link="variation.sysml:21">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n2" label="«variation part»&#xA;transmission" fqn="VariationViews::vehicleFamily::transmission" kind="variation part" view="VariationViews::familyTree" link="variation.sysml:22">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;rounded=1;arcSize=10;" vertex="1" parent="n0">
-            <mxGeometry x="128" y="82" width="244" height="135" as="geometry"/>
+            <mxGeometry x="138" y="92" width="254" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n3" label="«variant»&#xA;manual" fqn="VariationViews::vehicleFamily::transmission::manual" kind="variant" view="VariationViews::familyTree" link="variation.sysml:23">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="16" y="82" width="72" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="72" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n4" label="«variant part»&#xA;automatic" fqn="VariationViews::vehicleFamily::transmission::automatic" kind="variant part" view="VariationViews::familyTree" link="variation.sysml:24">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n2">
-            <mxGeometry x="128" y="82" width="100" height="37" as="geometry"/>
+            <mxGeometry x="138" y="92" width="100" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n5" label="connect" kind="connect" view="VariationViews::familyTree" link="variation.sysml:26">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n0">
-            <mxGeometry x="16" y="257" width="81" height="36" as="geometry"/>
+            <mxGeometry x="16" y="287" width="81" height="36" as="geometry"/>
           </mxCell>
         </object>
         <object id="n6" label="«variation part def»&#xA;EngineChoices" fqn="VariationViews::EngineChoices" kind="variation part def" view="VariationViews::familyTree" link="variation.sysml:15">
           <mxCell style="swimlane;html=0;whiteSpace=wrap;fontStyle=1;align=center;verticalAlign=top;startSize=42;collapsible=1;" vertex="1" parent="1">
-            <mxGeometry x="468" y="40" width="317" height="135" as="geometry"/>
+            <mxGeometry x="508" y="50" width="327" height="145" as="geometry"/>
           </mxCell>
         </object>
         <object id="n7" label="«variant»&#xA;fourCylinder" fqn="VariationViews::EngineChoices::fourCylinder" kind="variant" view="VariationViews::familyTree" link="variation.sysml:16">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n6">
-            <mxGeometry x="16" y="82" width="127" height="37" as="geometry"/>
+            <mxGeometry x="16" y="92" width="127" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="n8" label="«variant»&#xA;sixCylinder" fqn="VariationViews::EngineChoices::sixCylinder" kind="variant" view="VariationViews::familyTree" link="variation.sysml:17">
           <mxCell style="rounded=1;arcSize=10;html=0;whiteSpace=wrap;align=center;verticalAlign=middle;" vertex="1" parent="n6">
-            <mxGeometry x="183" y="82" width="118" height="37" as="geometry"/>
+            <mxGeometry x="193" y="92" width="118" height="37" as="geometry"/>
           </mxCell>
         </object>
         <object id="e0" label="" kind="composition" view="VariationViews::familyTree" link="variation.sysml:21">
-          <mxCell style="edgeStyle=none;exitX=0.134;exitY=0.1359;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
+          <mxCell style="edgeStyle=none;exitX=0.1275;exitY=0.1239;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n1">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e1" label="" kind="composition" view="VariationViews::familyTree" link="variation.sysml:22">
-          <mxCell style="edgeStyle=none;exitX=0.6443;exitY=0.1359;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n2">
+          <mxCell style="edgeStyle=none;exitX=0.6495;exitY=0.1239;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n0" target="n2">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e2" label="" kind="typing" view="VariationViews::familyTree" link="variation.sysml:21">
-          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.5037;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n6">
+          <mxCell style="edgeStyle=none;exitX=0.5;exitY=0;exitPerimeter=0;entryX=0;entryY=0.5034;entryPerimeter=0;rounded=0;html=0;dashed=1;endArrow=block;endFill=0;" edge="1" parent="1" source="n1" target="n6">
             <mxGeometry relative="1" as="geometry">
               <Array as="points">
-                <mxPoint x="92" y="106"/>
-                <mxPoint x="448" y="106"/>
-                <mxPoint x="448" y="108"/>
+                <mxPoint x="102" y="123"/>
               </Array>
             </mxGeometry>
           </mxCell>
         </object>
         <object id="e3" label="" kind="reference" view="VariationViews::familyTree" link="variation.sysml:23">
-          <mxCell style="edgeStyle=none;exitX=0.2131;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n3">
+          <mxCell style="edgeStyle=none;exitX=0.2047;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n2" target="n3">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e4" label="" kind="composition" view="VariationViews::familyTree" link="variation.sysml:24">
-          <mxCell style="edgeStyle=none;exitX=0.7295;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n4">
+          <mxCell style="edgeStyle=none;exitX=0.7402;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=1;endArrow=none;" edge="1" parent="1" source="n2" target="n4">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e5" label="" kind="reference" view="VariationViews::familyTree" link="variation.sysml:16">
-          <mxCell style="edgeStyle=none;exitX=0.2508;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n6" target="n7">
+          <mxCell style="edgeStyle=none;exitX=0.2431;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n6" target="n7">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>
         <object id="e6" label="" kind="reference" view="VariationViews::familyTree" link="variation.sysml:17">
-          <mxCell style="edgeStyle=none;exitX=0.7634;exitY=0.3111;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n6" target="n8">
+          <mxCell style="edgeStyle=none;exitX=0.7706;exitY=0.2897;exitPerimeter=0;entryX=0.5;entryY=0;entryPerimeter=0;rounded=0;html=0;startArrow=diamondThin;startFill=0;endArrow=none;" edge="1" parent="1" source="n6" target="n8">
             <mxGeometry relative="1" as="geometry"/>
           </mxCell>
         </object>