diff --git a/network-area-diagram/src/test/resources/IEEE_14_bus_voltage_filter4.svg b/network-area-diagram/src/test/resources/IEEE_14_bus_voltage_filter4.svg
index 7dfc864c0..42a897fc4 100644
--- a/network-area-diagram/src/test/resources/IEEE_14_bus_voltage_filter4.svg
+++ b/network-area-diagram/src/test/resources/IEEE_14_bus_voltage_filter4.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg viewBox="-1271.02 -554.58 2865.69 1241.72" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="-836.56 -581.45 2545.77 1745.17" xmlns="http://www.w3.org/2000/svg">
     <style><![CDATA[
 .nad-branch-edges .nad-edge-path, .nad-3wt-edges .nad-edge-path {stroke: var(--nad-vl-color, lightgrey); stroke-width: 5; fill: none}
 .nad-branch-edges .nad-winding, .nad-3wt-nodes .nad-winding {stroke: var(--nad-vl-color, lightgrey); stroke-width: 5; fill: none}
@@ -127,17 +127,17 @@
                 <nad:busNode svgId="21" equipmentId="VL5_0"/>
             </nad:busNodes>
             <nad:nodes>
-                <nad:node svgId="0" equipmentId="VL10" x="38.96" y="-339.58"/>
-                <nad:node svgId="2" equipmentId="VL11" x="-393.78" y="-299.50"/>
-                <nad:node svgId="4" equipmentId="VL12" x="-678.92" y="487.14"/>
-                <nad:node svgId="6" equipmentId="VL13" x="-331.31" y="376.24"/>
-                <nad:node svgId="8" equipmentId="VL14" x="117.34" y="308.90"/>
-                <nad:node svgId="10" equipmentId="VL6" x="-661.03" y="86.51"/>
-                <nad:node svgId="12" equipmentId="VL7" x="889.53" y="3.81"/>
-                <nad:node svgId="14" equipmentId="VL8" x="1294.67" y="39.93"/>
-                <nad:node svgId="16" equipmentId="VL9" x="424.89" y="-51.77"/>
-                <nad:node svgId="18" equipmentId="VL4" x="721.16" y="-299.60"/>
-                <nad:node svgId="20" equipmentId="VL5" x="-1071.02" y="-36.46"/>
+                <nad:node svgId="0" equipmentId="VL10" x="352.22" y="-28.13"/>
+                <nad:node svgId="2" equipmentId="VL11" x="-50.16" y="123.49"/>
+                <nad:node svgId="4" equipmentId="VL12" x="-156.66" y="963.72"/>
+                <nad:node svgId="6" equipmentId="VL13" x="159.52" y="784.70"/>
+                <nad:node svgId="8" equipmentId="VL14" x="568.23" y="608.74"/>
+                <nad:node svgId="10" equipmentId="VL6" x="-216.52" y="563.72"/>
+                <nad:node svgId="12" equipmentId="VL7" x="1140.00" y="-72.87"/>
+                <nad:node svgId="14" equipmentId="VL8" x="1409.21" y="-366.45"/>
+                <nad:node svgId="16" equipmentId="VL9" x="776.85" y="184.48"/>
+                <nad:node svgId="18" equipmentId="VL4" x="1161.75" y="280.20"/>
+                <nad:node svgId="20" equipmentId="VL5" x="-636.56" y="503.37"/>
             </nad:nodes>
             <nad:edges>
                 <nad:edge svgId="22" equipmentId="L9-10-1" node1="16" node2="0"/>
@@ -157,239 +157,239 @@
         </nad:nad>
     </metadata>
     <g class="nad-vl-nodes">
-        <g transform="translate(38.96,-339.58)" id="0">
+        <g transform="translate(352.22,-28.13)" id="0">
             <circle r="27.50" id="1" class="nad-vl0to30-0 nad-busnode"/>
         </g>
-        <g transform="translate(-393.78,-299.50)" id="2">
+        <g transform="translate(-50.16,123.49)" id="2">
             <circle r="27.50" id="3" class="nad-vl0to30-0 nad-busnode"/>
         </g>
-        <g transform="translate(-678.92,487.14)" id="4">
+        <g transform="translate(-156.66,963.72)" id="4">
             <circle r="27.50" id="5" class="nad-vl0to30-0 nad-busnode"/>
         </g>
-        <g transform="translate(-331.31,376.24)" id="6">
+        <g transform="translate(159.52,784.70)" id="6">
             <circle r="27.50" id="7" class="nad-vl0to30-0 nad-busnode"/>
         </g>
-        <g transform="translate(117.34,308.90)" id="8">
+        <g transform="translate(568.23,608.74)" id="8">
             <circle r="27.50" id="9" class="nad-vl0to30-0 nad-busnode"/>
         </g>
-        <g transform="translate(-661.03,86.51)" id="10">
+        <g transform="translate(-216.52,563.72)" id="10">
             <circle r="27.50" id="11" class="nad-vl0to30-0 nad-busnode"/>
         </g>
-        <g transform="translate(889.53,3.81)" id="12">
+        <g transform="translate(1140.00,-72.87)" id="12">
             <circle r="27.50" id="13" class="nad-vl0to30-0 nad-busnode"/>
         </g>
-        <g transform="translate(1294.67,39.93)" id="14">
+        <g transform="translate(1409.21,-366.45)" id="14">
             <circle r="27.50" id="15" class="nad-vl0to30-0 nad-busnode"/>
         </g>
-        <g transform="translate(424.89,-51.77)" id="16">
+        <g transform="translate(776.85,184.48)" id="16">
             <circle r="27.50" id="17" class="nad-vl0to30-0 nad-busnode"/>
         </g>
     </g>
     <g class="nad-branch-edges">
         <g id="22">
             <g id="22.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="402.84,-68.21 231.92,-195.67"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(376.79,-87.64)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="752.26,172.17 564.54,78.17"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(723.20,157.62)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-53.29)">
+                        <g transform="rotate(-63.40)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-323.29)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-333.40)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
             <g id="22.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="61.00,-323.14 231.92,-195.67"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(87.06,-303.71)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="376.81,-15.82 564.54,78.17"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(405.87,-1.27)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(126.71)">
+                        <g transform="rotate(116.60)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(36.71)" x="19.00"></text>
+                        <text transform="rotate(26.60)" x="19.00"></text>
                     </g>
                 </g>
             </g>
         </g>
         <g id="23">
             <g id="23.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="11.58,-337.04 -177.41,-319.54"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(-20.79,-334.05)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="326.49,-18.44 151.03,47.68"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(296.08,-6.98)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-95.29)">
+                        <g transform="rotate(-110.65)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-5.29)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-20.65)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
             <g id="23.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-366.40,-302.04 -177.41,-319.54"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(-334.04,-305.03)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-24.43,113.79 151.03,47.68"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(5.98,102.33)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(84.71)">
+                        <g transform="rotate(69.35)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-5.29)" x="19.00"></text>
+                        <text transform="rotate(-20.65)" x="19.00"></text>
                     </g>
                 </g>
             </g>
         </g>
         <g id="24">
             <g id="24.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-645.37,63.90 -527.41,-106.50"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(-626.87,37.18)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-206.80,538.00 -133.34,343.61"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(-195.31,507.60)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(34.70)">
+                        <g transform="rotate(20.70)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-55.30)" x="19.00"></text>
+                        <text transform="rotate(-69.30)" x="19.00"></text>
                     </g>
                 </g>
             </g>
             <g id="24.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-409.44,-276.89 -527.41,-106.50"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(-427.94,-250.17)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-59.89,149.21 -133.34,343.61"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(-71.37,179.62)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-145.30)">
+                        <g transform="rotate(-159.30)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-55.30)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-69.30)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
         </g>
         <g id="25">
             <g id="25.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-662.25,113.98 -669.98,286.83"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(-663.70,146.45)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-212.45,590.92 -186.59,763.72"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(-207.64,623.06)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-177.44)">
+                        <g transform="rotate(171.49)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-87.44)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(81.49)" x="19.00"></text>
                     </g>
                 </g>
             </g>
             <g id="25.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-677.70,459.67 -669.98,286.83"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(-676.25,427.20)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-160.73,936.53 -186.59,763.72"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(-165.54,904.38)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(2.56)">
+                        <g transform="rotate(-8.51)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-87.44)" x="19.00"></text>
+                        <text transform="rotate(-278.51)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
         </g>
         <g id="26">
             <g id="26.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-652.72,478.79 -505.12,431.69"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(-621.76,468.91)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-132.73,950.17 1.43,874.21"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(-104.45,934.16)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(72.30)">
+                        <g transform="rotate(60.48)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-17.70)" x="19.00"></text>
+                        <text transform="rotate(-29.52)" x="19.00"></text>
                     </g>
                 </g>
             </g>
             <g id="26.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-357.51,384.60 -505.12,431.69"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(-388.47,394.48)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="135.59,798.25 1.43,874.21"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(107.31,814.27)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-107.70)">
+                        <g transform="rotate(-119.52)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-17.70)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-29.52)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
         </g>
         <g id="27">
             <g id="27.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-640.37,104.66 -496.17,231.37"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(-615.96,126.11)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-192.81,577.66 -28.50,674.21"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(-164.79,594.12)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(131.31)">
+                        <g transform="rotate(120.44)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(41.31)" x="19.00"></text>
+                        <text transform="rotate(30.44)" x="19.00"></text>
                     </g>
                 </g>
             </g>
             <g id="27.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-351.97,358.09 -496.17,231.37"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(-376.38,336.63)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="135.81,770.77 -28.50,674.21"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(107.79,754.30)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-48.69)">
+                        <g transform="rotate(-59.56)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-318.69)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-329.56)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
         </g>
         <g id="28">
             <g id="28.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="-304.11,372.16 -106.99,342.57"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(-271.97,367.33)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="184.78,773.83 363.88,696.72"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(214.63,760.98)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(81.46)">
+                        <g transform="rotate(66.71)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-8.54)" x="19.00"></text>
+                        <text transform="rotate(-23.29)" x="19.00"></text>
                     </g>
                 </g>
             </g>
             <g id="28.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="90.14,312.98 -106.99,342.57"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(58.00,317.80)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="542.98,619.61 363.88,696.72"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(513.12,632.47)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-98.54)">
+                        <g transform="rotate(-113.29)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-8.54)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-23.29)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
         </g>
         <g id="29">
             <g id="29.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="407.05,-30.84 271.11,128.56"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(385.96,-6.11)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="764.72,209.16 672.54,396.61"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(750.37,238.32)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-139.54)">
+                        <g transform="rotate(-153.82)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-49.54)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-63.82)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
             <g id="29.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="135.18,287.97 271.11,128.56"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(156.27,263.24)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="580.37,584.06 672.54,396.61"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(594.71,554.90)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(40.46)">
+                        <g transform="rotate(26.18)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-49.54)" x="19.00"></text>
+                        <text transform="rotate(-63.82)" x="19.00"></text>
                     </g>
                 </g>
             </g>
@@ -397,70 +397,70 @@
         <g id="30">
             <g id="30.1" class="nad-vl120to180-line"></g>
             <g id="30.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-687.37,78.61 -837.29,33.64"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(-718.50,69.27)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="-243.74,559.81 -396.85,537.81"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(-275.91,555.19)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-73.30)">
+                        <g transform="rotate(-81.82)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-343.30)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-351.82)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
             <g class="nad-glued-center">
-                <circle class="nad-vl120to180-line nad-winding" cx="-875.60" cy="22.15" r="20.00"/>
-                <circle class="nad-vl0to30-line nad-winding" cx="-856.44" cy="27.90" r="20.00"/>
+                <circle class="nad-vl120to180-line nad-winding" cx="-436.44" cy="532.12" r="20.00"/>
+                <circle class="nad-vl0to30-line nad-winding" cx="-416.64" cy="534.97" r="20.00"/>
             </g>
         </g>
         <g id="31">
             <g id="31.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="916.92,6.25 1092.10,21.87"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(949.30,9.14)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="1158.58,-93.14 1274.60,-219.66"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(1180.55,-117.09)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(95.09)">
+                        <g transform="rotate(42.52)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(5.09)" x="19.00"></text>
+                        <text transform="rotate(-47.48)" x="19.00"></text>
                     </g>
                 </g>
             </g>
             <g id="31.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="1267.28,37.49 1092.10,21.87"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(1234.91,34.60)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="1390.62,-346.18 1274.60,-219.66"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(1368.66,-322.23)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-84.91)">
+                        <g transform="rotate(-137.48)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-354.91)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-47.48)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
         </g>
         <g id="32">
             <g id="32.1" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="862.23,0.55 657.21,-23.98"/>
-                <g class="nad-glued-1 nad-edge-infos" transform="translate(829.96,-3.31)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-1" points="1117.56,-56.97 958.42,55.80"/>
+                <g class="nad-glued-1 nad-edge-infos" transform="translate(1091.05,-38.18)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-83.18)">
+                        <g transform="rotate(-125.32)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-353.18)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(-35.32)" x="-19.00" style="text-anchor:end"></text>
                     </g>
                 </g>
             </g>
             <g id="32.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="452.19,-48.50 657.21,-23.98"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(484.46,-44.64)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="799.29,168.58 958.42,55.80"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(825.80,149.79)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(96.82)">
+                        <g transform="rotate(54.68)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(6.82)" x="19.00"></text>
+                        <text transform="rotate(-35.32)" x="19.00"></text>
                     </g>
                 </g>
             </g>
@@ -468,55 +468,55 @@
         <g id="33">
             <g id="33.1" class="nad-vl120to180-line"></g>
             <g id="33.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="876.19,-20.23 819.90,-121.66"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(860.42,-48.65)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="1141.69,-45.42 1149.03,73.72"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(1143.69,-12.98)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(-29.03)">
+                        <g transform="rotate(176.48)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-299.03)" x="-19.00" style="text-anchor:end"></text>
+                        <text transform="rotate(86.48)" x="19.00"></text>
                     </g>
                 </g>
             </g>
             <g class="nad-glued-center">
-                <circle class="nad-vl120to180-line nad-winding" cx="800.49" cy="-156.64" r="20.00"/>
-                <circle class="nad-vl0to30-line nad-winding" cx="810.20" cy="-139.15" r="20.00"/>
+                <circle class="nad-vl120to180-line nad-winding" cx="1151.49" cy="113.65" r="20.00"/>
+                <circle class="nad-vl0to30-line nad-winding" cx="1150.26" cy="93.68" r="20.00"/>
             </g>
         </g>
         <g id="34">
             <g id="34.1" class="nad-vl120to180-line"></g>
             <g id="34.2" class="nad-vl0to30-line">
-                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="445.98,-69.41 550.01,-156.44"/>
-                <g class="nad-glued-2 nad-edge-infos" transform="translate(470.91,-90.26)">
+                <polyline class="nad-edge-path nad-stretchable nad-glued-2" points="803.54,191.12 940.18,225.10"/>
+                <g class="nad-glued-2 nad-edge-infos" transform="translate(835.08,198.96)">
                     <g class="nad-active nad-state-out">
-                        <g transform="rotate(50.09)">
+                        <g transform="rotate(103.97)">
                             <path class="nad-arrow-in" transform="scale(10.00)" d="M-1 -1 H1 L0 1z"/>
                             <path class="nad-arrow-out" transform="scale(10.00)" d="M-1 1 H1 L0 -1z"/>
                         </g>
-                        <text transform="rotate(-39.91)" x="19.00"></text>
+                        <text transform="rotate(13.97)" x="19.00"></text>
                     </g>
                 </g>
             </g>
             <g class="nad-glued-center">
-                <circle class="nad-vl120to180-line nad-winding" cx="580.69" cy="-182.10" r="20.00"/>
-                <circle class="nad-vl0to30-line nad-winding" cx="565.35" cy="-169.27" r="20.00"/>
+                <circle class="nad-vl120to180-line nad-winding" cx="979.00" cy="234.75" r="20.00"/>
+                <circle class="nad-vl0to30-line nad-winding" cx="959.59" cy="229.93" r="20.00"/>
             </g>
         </g>
     </g>
     <g class="nad-text-edges">
-        <polyline id="0-textedge" points="68.63,-344.03 138.96,-354.58"/>
-        <polyline id="2-textedge" points="-364.11,-303.95 -293.78,-314.50"/>
-        <polyline id="4-textedge" points="-649.25,482.69 -578.92,472.14"/>
-        <polyline id="6-textedge" points="-301.64,371.79 -231.31,361.24"/>
-        <polyline id="8-textedge" points="147.00,304.45 217.34,293.90"/>
-        <polyline id="10-textedge" points="-631.36,82.06 -561.03,71.51"/>
-        <polyline id="12-textedge" points="919.20,-0.64 989.53,-11.19"/>
-        <polyline id="14-textedge" points="1324.34,35.48 1394.67,24.93"/>
-        <polyline id="16-textedge" points="454.56,-56.22 524.89,-66.77"/>
+        <polyline id="0-textedge" points="381.89,-32.58 452.22,-43.13"/>
+        <polyline id="2-textedge" points="-20.50,119.04 49.84,108.49"/>
+        <polyline id="4-textedge" points="-127.00,959.27 -56.66,948.72"/>
+        <polyline id="6-textedge" points="189.19,780.25 259.52,769.70"/>
+        <polyline id="8-textedge" points="597.90,604.29 668.23,593.74"/>
+        <polyline id="10-textedge" points="-186.85,559.27 -116.52,548.72"/>
+        <polyline id="12-textedge" points="1169.67,-77.32 1240.00,-87.87"/>
+        <polyline id="14-textedge" points="1438.88,-370.90 1509.21,-381.45"/>
+        <polyline id="16-textedge" points="806.52,180.03 876.85,169.48"/>
     </g>
     <g class="nad-text-nodes">
-        <foreignObject id="0-textnode" y="-379.58" x="138.96" height="1" width="1">
+        <foreignObject id="0-textnode" y="-68.13" x="452.22" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL10</div>
                 <table>
@@ -529,7 +529,7 @@
                 </table>
             </div>
         </foreignObject>
-        <foreignObject id="2-textnode" y="-339.50" x="-293.78" height="1" width="1">
+        <foreignObject id="2-textnode" y="83.49" x="49.84" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL11</div>
                 <table>
@@ -542,7 +542,7 @@
                 </table>
             </div>
         </foreignObject>
-        <foreignObject id="4-textnode" y="447.14" x="-578.92" height="1" width="1">
+        <foreignObject id="4-textnode" y="923.72" x="-56.66" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL12</div>
                 <table>
@@ -555,7 +555,7 @@
                 </table>
             </div>
         </foreignObject>
-        <foreignObject id="6-textnode" y="336.24" x="-231.31" height="1" width="1">
+        <foreignObject id="6-textnode" y="744.70" x="259.52" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL13</div>
                 <table>
@@ -568,7 +568,7 @@
                 </table>
             </div>
         </foreignObject>
-        <foreignObject id="8-textnode" y="268.90" x="217.34" height="1" width="1">
+        <foreignObject id="8-textnode" y="568.74" x="668.23" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL14</div>
                 <table>
@@ -581,7 +581,7 @@
                 </table>
             </div>
         </foreignObject>
-        <foreignObject id="10-textnode" y="46.51" x="-561.03" height="1" width="1">
+        <foreignObject id="10-textnode" y="523.72" x="-116.52" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL6</div>
                 <table>
@@ -594,7 +594,7 @@
                 </table>
             </div>
         </foreignObject>
-        <foreignObject id="12-textnode" y="-36.19" x="989.53" height="1" width="1">
+        <foreignObject id="12-textnode" y="-112.87" x="1240.00" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL7</div>
                 <table>
@@ -607,7 +607,7 @@
                 </table>
             </div>
         </foreignObject>
-        <foreignObject id="14-textnode" y="-0.07" x="1394.67" height="1" width="1">
+        <foreignObject id="14-textnode" y="-406.45" x="1509.21" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL8</div>
                 <table>
@@ -620,7 +620,7 @@
                 </table>
             </div>
         </foreignObject>
-        <foreignObject id="16-textnode" y="-91.77" x="524.89" height="1" width="1">
+        <foreignObject id="16-textnode" y="144.48" x="876.85" height="1" width="1">
             <div xmlns="http://www.w3.org/1999/xhtml" class="nad-label-box">
                 <div>VL9</div>
                 <table>