diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 75625fa6e..ccc5f0689 100644
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -1813,9 +1813,6 @@
             </node>
           </node>
           <node concept="1Wc70l" id="45g3j8ig9Q0" role="3clFbw">
-            <node concept="37vLTw" id="45g3j8igcwp" role="3uHU7w">
-              <ref role="3cqZAo" node="45g3j8i6y_n" resolve="runLayouter" />
-            </node>
             <node concept="2OqwBi" id="apJ4OPRaw4" role="3uHU7B">
               <node concept="2OqwBi" id="apJ4OPOBNj" role="2Oq$k0">
                 <node concept="37vLTw" id="apJ4OPOB4K" role="2Oq$k0">
@@ -1829,6 +1826,9 @@
               </node>
               <node concept="3w_OXm" id="apJ4OPRebI" role="2OqNvi" />
             </node>
+            <node concept="37vLTw" id="45g3j8igcwp" role="3uHU7w">
+              <ref role="3cqZAo" node="45g3j8i6y_n" resolve="runLayouter" />
+            </node>
           </node>
         </node>
       </node>
@@ -7591,254 +7591,250 @@
                                             </node>
                                           </node>
                                         </node>
-                                        <node concept="3clFbJ" id="1EaNpsCbmOt" role="3cqZAp">
-                                          <node concept="3clFbS" id="1EaNpsCbmOv" role="3clFbx">
-                                            <node concept="3cpWs8" id="3jXDp6Sh2DF" role="3cqZAp">
-                                              <node concept="3cpWsn" id="3jXDp6Sh2DI" role="3cpWs9">
-                                                <property role="TrG5h" value="synchronizeCode" />
-                                                <node concept="1ajhzC" id="3jXDp6Sh2DB" role="1tU5fm">
-                                                  <node concept="3cqZAl" id="3jXDp6Sh9QV" role="1ajl9A" />
+                                        <node concept="3cpWs8" id="3jXDp6Sh2DF" role="3cqZAp">
+                                          <node concept="3cpWsn" id="3jXDp6Sh2DI" role="3cpWs9">
+                                            <property role="TrG5h" value="synchronizeCode" />
+                                            <node concept="1ajhzC" id="3jXDp6Sh2DB" role="1tU5fm">
+                                              <node concept="3cqZAl" id="3jXDp6Sh9QV" role="1ajl9A" />
+                                            </node>
+                                            <node concept="1bVj0M" id="3jXDp6Sh$El" role="33vP2m">
+                                              <node concept="3clFbS" id="3jXDp6Sh$En" role="1bW5cS">
+                                                <node concept="3clFbF" id="4KKQOHIOebx" role="3cqZAp">
+                                                  <node concept="2OqwBi" id="4KKQOHIOeby" role="3clFbG">
+                                                    <node concept="37vLTw" id="4KKQOHIOebz" role="2Oq$k0">
+                                                      <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
+                                                    </node>
+                                                    <node concept="liA8E" id="4KKQOHIOeb$" role="2OqNvi">
+                                                      <ref role="37wK5l" node="1yAlWL_B36w" resolve="graph2Model" />
+                                                    </node>
+                                                  </node>
                                                 </node>
-                                                <node concept="1bVj0M" id="3jXDp6Sh$El" role="33vP2m">
-                                                  <node concept="3clFbS" id="3jXDp6Sh$En" role="1bW5cS">
-                                                    <node concept="3clFbF" id="4KKQOHIOebx" role="3cqZAp">
-                                                      <node concept="2OqwBi" id="4KKQOHIOeby" role="3clFbG">
-                                                        <node concept="37vLTw" id="4KKQOHIOebz" role="2Oq$k0">
-                                                          <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
-                                                        </node>
-                                                        <node concept="liA8E" id="4KKQOHIOeb$" role="2OqNvi">
-                                                          <ref role="37wK5l" node="1yAlWL_B36w" resolve="graph2Model" />
-                                                        </node>
+                                                <node concept="3clFbF" id="4HMzb$XEaAF" role="3cqZAp">
+                                                  <node concept="2YIFZM" id="4HMzb$XEaUX" role="3clFbG">
+                                                    <ref role="37wK5l" node="4HMzb$X6Zaf" resolve="withContextGraph" />
+                                                    <ref role="1Pybhc" node="5S8_I2FY6vo" resolve="BaseDiagramECell" />
+                                                    <node concept="2OqwBi" id="4HMzb$XEbw4" role="37wK5m">
+                                                      <node concept="37vLTw" id="4HMzb$XEbfc" role="2Oq$k0">
+                                                        <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
+                                                      </node>
+                                                      <node concept="2OwXpG" id="4HMzb$XEcFf" role="2OqNvi">
+                                                        <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
                                                       </node>
                                                     </node>
-                                                    <node concept="3clFbF" id="4HMzb$XEaAF" role="3cqZAp">
-                                                      <node concept="2YIFZM" id="4HMzb$XEaUX" role="3clFbG">
-                                                        <ref role="37wK5l" node="4HMzb$X6Zaf" resolve="withContextGraph" />
-                                                        <ref role="1Pybhc" node="5S8_I2FY6vo" resolve="BaseDiagramECell" />
-                                                        <node concept="2OqwBi" id="4HMzb$XEbw4" role="37wK5m">
-                                                          <node concept="37vLTw" id="4HMzb$XEbfc" role="2Oq$k0">
-                                                            <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
+                                                    <node concept="1bVj0M" id="4HMzb$XEdcr" role="37wK5m">
+                                                      <property role="3yWfEV" value="true" />
+                                                      <node concept="3clFbS" id="4HMzb$XEdct" role="1bW5cS">
+                                                        <node concept="3cpWs8" id="4HMzb$XKDgT" role="3cqZAp">
+                                                          <node concept="3cpWsn" id="4HMzb$XKDgU" role="3cpWs9">
+                                                            <property role="TrG5h" value="rootECell" />
+                                                            <node concept="3uibUv" id="4HMzb$XKDgH" role="1tU5fm">
+                                                              <ref role="3uigEE" node="4KKQOHIOe6F" resolve="RootDiagramECell" />
+                                                            </node>
+                                                            <node concept="2OqwBi" id="4HMzb$XKDgV" role="33vP2m">
+                                                              <node concept="2OqwBi" id="4HMzb$XKDgW" role="2Oq$k0">
+                                                                <node concept="2OqwBi" id="4HMzb$XKDgX" role="2Oq$k0">
+                                                                  <node concept="37vLTw" id="4HMzb$XKDgY" role="2Oq$k0">
+                                                                    <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
+                                                                  </node>
+                                                                  <node concept="2OwXpG" id="4HMzb$XKDgZ" role="2OqNvi">
+                                                                    <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
+                                                                  </node>
+                                                                </node>
+                                                                <node concept="liA8E" id="4HMzb$XKDh0" role="2OqNvi">
+                                                                  <ref role="37wK5l" node="eyrvBdlDbJ" resolve="getGraphComponent" />
+                                                                </node>
+                                                              </node>
+                                                              <node concept="liA8E" id="4HMzb$XKDh1" role="2OqNvi">
+                                                                <ref role="37wK5l" node="2l7cIJdg_1e" resolve="getDiagramCell" />
+                                                              </node>
+                                                            </node>
                                                           </node>
-                                                          <node concept="2OwXpG" id="4HMzb$XEcFf" role="2OqNvi">
-                                                            <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
+                                                        </node>
+                                                        <node concept="3clFbF" id="4KKQOHIOeb_" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="4KKQOHIOebA" role="3clFbG">
+                                                            <node concept="2OqwBi" id="4KKQOHIOebB" role="2Oq$k0">
+                                                              <node concept="37vLTw" id="4KKQOHIOebC" role="2Oq$k0">
+                                                                <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
+                                                              </node>
+                                                              <node concept="2OwXpG" id="6rrvvVebpiT" role="2OqNvi">
+                                                                <ref role="2Oxat6" node="6rrvvVe3CRy" resolve="myRootModel" />
+                                                              </node>
+                                                            </node>
+                                                            <node concept="liA8E" id="4KKQOHIOebE" role="2OqNvi">
+                                                              <ref role="37wK5l" to="nkm5:27djZ8_ZBuo" resolve="synchronizeWrite" />
+                                                              <node concept="37vLTw" id="4HMzb$XKDh2" role="37wK5m">
+                                                                <ref role="3cqZAo" node="4HMzb$XKDgU" resolve="rootECell" />
+                                                              </node>
+                                                            </node>
                                                           </node>
                                                         </node>
-                                                        <node concept="1bVj0M" id="4HMzb$XEdcr" role="37wK5m">
-                                                          <property role="3yWfEV" value="true" />
-                                                          <node concept="3clFbS" id="4HMzb$XEdct" role="1bW5cS">
-                                                            <node concept="3cpWs8" id="4HMzb$XKDgT" role="3cqZAp">
-                                                              <node concept="3cpWsn" id="4HMzb$XKDgU" role="3cpWs9">
-                                                                <property role="TrG5h" value="rootECell" />
-                                                                <node concept="3uibUv" id="4HMzb$XKDgH" role="1tU5fm">
-                                                                  <ref role="3uigEE" node="4KKQOHIOe6F" resolve="RootDiagramECell" />
+                                                        <node concept="3clFbH" id="144Gyms3TJ4" role="3cqZAp" />
+                                                        <node concept="3clFbJ" id="144GymrY71F" role="3cqZAp">
+                                                          <node concept="3clFbS" id="144GymrY71H" role="3clFbx">
+                                                            <node concept="3cpWs8" id="56H44TzfMly" role="3cqZAp">
+                                                              <node concept="3cpWsn" id="56H44TzfMlz" role="3cpWs9">
+                                                                <property role="TrG5h" value="dcell" />
+                                                                <node concept="3uibUv" id="56H44TzfJF1" role="1tU5fm">
+                                                                  <ref role="3uigEE" node="1yAlWL_Ah1Z" resolve="BaseDiagramDCell" />
                                                                 </node>
-                                                                <node concept="2OqwBi" id="4HMzb$XKDgV" role="33vP2m">
-                                                                  <node concept="2OqwBi" id="4HMzb$XKDgW" role="2Oq$k0">
-                                                                    <node concept="2OqwBi" id="4HMzb$XKDgX" role="2Oq$k0">
-                                                                      <node concept="37vLTw" id="4HMzb$XKDgY" role="2Oq$k0">
+                                                                <node concept="2OqwBi" id="56H44TzfMl$" role="33vP2m">
+                                                                  <node concept="37vLTw" id="56H44TzfMl_" role="2Oq$k0">
+                                                                    <ref role="3cqZAo" node="4HMzb$XKDgU" resolve="rootECell" />
+                                                                  </node>
+                                                                  <node concept="liA8E" id="56H44TzfMlA" role="2OqNvi">
+                                                                    <ref role="37wK5l" node="1M7dGa3$9rX" resolve="getDCell" />
+                                                                    <node concept="2OqwBi" id="56H44TzfMlB" role="37wK5m">
+                                                                      <node concept="37vLTw" id="56H44TzfMlC" role="2Oq$k0">
                                                                         <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
                                                                       </node>
-                                                                      <node concept="2OwXpG" id="4HMzb$XKDgZ" role="2OqNvi">
+                                                                      <node concept="2OwXpG" id="56H44TzfMlD" role="2OqNvi">
                                                                         <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
                                                                       </node>
                                                                     </node>
-                                                                    <node concept="liA8E" id="4HMzb$XKDh0" role="2OqNvi">
-                                                                      <ref role="37wK5l" node="eyrvBdlDbJ" resolve="getGraphComponent" />
-                                                                    </node>
-                                                                  </node>
-                                                                  <node concept="liA8E" id="4HMzb$XKDh1" role="2OqNvi">
-                                                                    <ref role="37wK5l" node="2l7cIJdg_1e" resolve="getDiagramCell" />
                                                                   </node>
                                                                 </node>
                                                               </node>
                                                             </node>
-                                                            <node concept="3clFbF" id="4KKQOHIOeb_" role="3cqZAp">
-                                                              <node concept="2OqwBi" id="4KKQOHIOebA" role="3clFbG">
-                                                                <node concept="2OqwBi" id="4KKQOHIOebB" role="2Oq$k0">
-                                                                  <node concept="37vLTw" id="4KKQOHIOebC" role="2Oq$k0">
-                                                                    <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
-                                                                  </node>
-                                                                  <node concept="2OwXpG" id="6rrvvVebpiT" role="2OqNvi">
-                                                                    <ref role="2Oxat6" node="6rrvvVe3CRy" resolve="myRootModel" />
-                                                                  </node>
+                                                            <node concept="3clFbF" id="56H44TzgJjx" role="3cqZAp">
+                                                              <node concept="2OqwBi" id="56H44TzgSgP" role="3clFbG">
+                                                                <node concept="37vLTw" id="56H44TzgJjv" role="2Oq$k0">
+                                                                  <ref role="3cqZAo" node="56H44TzfMlz" resolve="dcell" />
                                                                 </node>
-                                                                <node concept="liA8E" id="4KKQOHIOebE" role="2OqNvi">
-                                                                  <ref role="37wK5l" to="nkm5:27djZ8_ZBuo" resolve="synchronizeWrite" />
-                                                                  <node concept="37vLTw" id="4HMzb$XKDh2" role="37wK5m">
-                                                                    <ref role="3cqZAo" node="4HMzb$XKDgU" resolve="rootECell" />
-                                                                  </node>
+                                                                <node concept="liA8E" id="56H44Tzh2Bl" role="2OqNvi">
+                                                                  <ref role="37wK5l" node="K9V0C6trdf" resolve="runLayouter" />
+                                                                </node>
+                                                              </node>
+                                                            </node>
+                                                          </node>
+                                                          <node concept="1Wc70l" id="2YP06h4A4O" role="3clFbw">
+                                                            <node concept="3fqX7Q" id="2YP06h4U_f" role="3uHU7w">
+                                                              <node concept="1rXfSq" id="2YP06h4U_h" role="3fr31v">
+                                                                <ref role="37wK5l" node="2YP06h3SH5" resolve="onlyGeometryChanges" />
+                                                                <node concept="37vLTw" id="2YP06h53tK" role="37wK5m">
+                                                                  <ref role="3cqZAo" node="4KKQOHIOebs" resolve="event" />
                                                                 </node>
                                                               </node>
                                                             </node>
-                                                            <node concept="3clFbH" id="144Gyms3TJ4" role="3cqZAp" />
-                                                            <node concept="3clFbJ" id="144GymrY71F" role="3cqZAp">
-                                                              <node concept="3clFbS" id="144GymrY71H" role="3clFbx">
-                                                                <node concept="3cpWs8" id="56H44TzfMly" role="3cqZAp">
-                                                                  <node concept="3cpWsn" id="56H44TzfMlz" role="3cpWs9">
-                                                                    <property role="TrG5h" value="dcell" />
-                                                                    <node concept="3uibUv" id="56H44TzfJF1" role="1tU5fm">
-                                                                      <ref role="3uigEE" node="1yAlWL_Ah1Z" resolve="BaseDiagramDCell" />
+                                                            <node concept="1Wc70l" id="2YP06h9hs1" role="3uHU7B">
+                                                              <node concept="3fqX7Q" id="144Gyms4SpO" role="3uHU7w">
+                                                                <node concept="2OqwBi" id="144Gyms4SpQ" role="3fr31v">
+                                                                  <node concept="2OqwBi" id="144Gyms4SpR" role="2Oq$k0">
+                                                                    <node concept="liA8E" id="144Gyms4SpS" role="2OqNvi">
+                                                                      <ref role="37wK5l" node="5YRJpe$ygQu" resolve="getView" />
                                                                     </node>
-                                                                    <node concept="2OqwBi" id="56H44TzfMl$" role="33vP2m">
-                                                                      <node concept="37vLTw" id="56H44TzfMl_" role="2Oq$k0">
-                                                                        <ref role="3cqZAo" node="4HMzb$XKDgU" resolve="rootECell" />
+                                                                    <node concept="2OqwBi" id="144Gyms4SpT" role="2Oq$k0">
+                                                                      <node concept="37vLTw" id="144Gyms4SpU" role="2Oq$k0">
+                                                                        <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
                                                                       </node>
-                                                                      <node concept="liA8E" id="56H44TzfMlA" role="2OqNvi">
-                                                                        <ref role="37wK5l" node="1M7dGa3$9rX" resolve="getDCell" />
-                                                                        <node concept="2OqwBi" id="56H44TzfMlB" role="37wK5m">
-                                                                          <node concept="37vLTw" id="56H44TzfMlC" role="2Oq$k0">
-                                                                            <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
-                                                                          </node>
-                                                                          <node concept="2OwXpG" id="56H44TzfMlD" role="2OqNvi">
-                                                                            <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
-                                                                          </node>
-                                                                        </node>
+                                                                      <node concept="2OwXpG" id="144Gyms4SpV" role="2OqNvi">
+                                                                        <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
                                                                       </node>
                                                                     </node>
                                                                   </node>
-                                                                </node>
-                                                                <node concept="3clFbF" id="56H44TzgJjx" role="3cqZAp">
-                                                                  <node concept="2OqwBi" id="56H44TzgSgP" role="3clFbG">
-                                                                    <node concept="37vLTw" id="56H44TzgJjv" role="2Oq$k0">
-                                                                      <ref role="3cqZAo" node="56H44TzfMlz" resolve="dcell" />
-                                                                    </node>
-                                                                    <node concept="liA8E" id="56H44Tzh2Bl" role="2OqNvi">
-                                                                      <ref role="37wK5l" node="K9V0C6trdf" resolve="runLayouter" />
-                                                                    </node>
+                                                                  <node concept="liA8E" id="144Gyms4SpW" role="2OqNvi">
+                                                                    <ref role="37wK5l" node="1b$B7Ao$dK_" resolve="wasAutoLayout" />
                                                                   </node>
                                                                 </node>
                                                               </node>
-                                                              <node concept="1Wc70l" id="2YP06h4A4O" role="3clFbw">
-                                                                <node concept="3fqX7Q" id="2YP06h4U_f" role="3uHU7w">
-                                                                  <node concept="1rXfSq" id="2YP06h4U_h" role="3fr31v">
-                                                                    <ref role="37wK5l" node="2YP06h3SH5" resolve="onlyGeometryChanges" />
-                                                                    <node concept="37vLTw" id="2YP06h53tK" role="37wK5m">
-                                                                      <ref role="3cqZAo" node="4KKQOHIOebs" resolve="event" />
+                                                              <node concept="2OqwBi" id="2YP06hc2Ye" role="3uHU7B">
+                                                                <node concept="2OqwBi" id="2YP06hbOiB" role="2Oq$k0">
+                                                                  <node concept="2OqwBi" id="2YP06hbz__" role="2Oq$k0">
+                                                                    <node concept="37vLTw" id="2YP06hbrFy" role="2Oq$k0">
+                                                                      <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
                                                                     </node>
-                                                                  </node>
-                                                                </node>
-                                                                <node concept="1Wc70l" id="2YP06h9hs1" role="3uHU7B">
-                                                                  <node concept="3fqX7Q" id="144Gyms4SpO" role="3uHU7w">
-                                                                    <node concept="2OqwBi" id="144Gyms4SpQ" role="3fr31v">
-                                                                      <node concept="2OqwBi" id="144Gyms4SpR" role="2Oq$k0">
-                                                                        <node concept="liA8E" id="144Gyms4SpS" role="2OqNvi">
-                                                                          <ref role="37wK5l" node="5YRJpe$ygQu" resolve="getView" />
-                                                                        </node>
-                                                                        <node concept="2OqwBi" id="144Gyms4SpT" role="2Oq$k0">
-                                                                          <node concept="37vLTw" id="144Gyms4SpU" role="2Oq$k0">
-                                                                            <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
-                                                                          </node>
-                                                                          <node concept="2OwXpG" id="144Gyms4SpV" role="2OqNvi">
-                                                                            <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
-                                                                          </node>
-                                                                        </node>
-                                                                      </node>
-                                                                      <node concept="liA8E" id="144Gyms4SpW" role="2OqNvi">
-                                                                        <ref role="37wK5l" node="1b$B7Ao$dK_" resolve="wasAutoLayout" />
-                                                                      </node>
+                                                                    <node concept="2OwXpG" id="2YP06hbEjp" role="2OqNvi">
+                                                                      <ref role="2Oxat6" node="6rrvvVe3CRy" resolve="myRootModel" />
                                                                     </node>
                                                                   </node>
-                                                                  <node concept="2OqwBi" id="2YP06hc2Ye" role="3uHU7B">
-                                                                    <node concept="2OqwBi" id="2YP06hbOiB" role="2Oq$k0">
-                                                                      <node concept="2OqwBi" id="2YP06hbz__" role="2Oq$k0">
-                                                                        <node concept="37vLTw" id="2YP06hbrFy" role="2Oq$k0">
-                                                                          <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
-                                                                        </node>
-                                                                        <node concept="2OwXpG" id="2YP06hbEjp" role="2OqNvi">
-                                                                          <ref role="2Oxat6" node="6rrvvVe3CRy" resolve="myRootModel" />
-                                                                        </node>
-                                                                      </node>
-                                                                      <node concept="liA8E" id="2YP06hbWJH" role="2OqNvi">
-                                                                        <ref role="37wK5l" to="nkm5:lNQZNowrwP" resolve="getDiagramAccessor" />
-                                                                      </node>
-                                                                    </node>
-                                                                    <node concept="liA8E" id="2YP06hcay_" role="2OqNvi">
-                                                                      <ref role="37wK5l" to="nkm5:2YP06h8_XH" resolve="runAutoLayoutOnChange" />
-                                                                    </node>
+                                                                  <node concept="liA8E" id="2YP06hbWJH" role="2OqNvi">
+                                                                    <ref role="37wK5l" to="nkm5:lNQZNowrwP" resolve="getDiagramAccessor" />
                                                                   </node>
                                                                 </node>
+                                                                <node concept="liA8E" id="2YP06hcay_" role="2OqNvi">
+                                                                  <ref role="37wK5l" to="nkm5:2YP06h8_XH" resolve="runAutoLayoutOnChange" />
+                                                                </node>
                                                               </node>
                                                             </node>
-                                                            <node concept="3clFbF" id="144Gyms5eM$" role="3cqZAp">
-                                                              <node concept="2OqwBi" id="144Gyms5swg" role="3clFbG">
-                                                                <node concept="2OqwBi" id="144Gyms5eMA" role="2Oq$k0">
-                                                                  <node concept="liA8E" id="144Gyms5eMB" role="2OqNvi">
-                                                                    <ref role="37wK5l" node="5YRJpe$ygQu" resolve="getView" />
-                                                                  </node>
-                                                                  <node concept="2OqwBi" id="144Gyms5eMC" role="2Oq$k0">
-                                                                    <node concept="37vLTw" id="144Gyms5eMD" role="2Oq$k0">
-                                                                      <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
-                                                                    </node>
-                                                                    <node concept="2OwXpG" id="144Gyms5eME" role="2OqNvi">
-                                                                      <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
-                                                                    </node>
-                                                                  </node>
+                                                          </node>
+                                                        </node>
+                                                        <node concept="3clFbF" id="144Gyms5eM$" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="144Gyms5swg" role="3clFbG">
+                                                            <node concept="2OqwBi" id="144Gyms5eMA" role="2Oq$k0">
+                                                              <node concept="liA8E" id="144Gyms5eMB" role="2OqNvi">
+                                                                <ref role="37wK5l" node="5YRJpe$ygQu" resolve="getView" />
+                                                              </node>
+                                                              <node concept="2OqwBi" id="144Gyms5eMC" role="2Oq$k0">
+                                                                <node concept="37vLTw" id="144Gyms5eMD" role="2Oq$k0">
+                                                                  <ref role="3cqZAo" node="4KKQOHIOeb9" resolve="finalSynchronizer" />
                                                                 </node>
-                                                                <node concept="liA8E" id="144Gyms5$nr" role="2OqNvi">
-                                                                  <ref role="37wK5l" node="1b$B7Ao$0Nl" resolve="setWasAutoLayout" />
-                                                                  <node concept="3clFbT" id="144Gyms5GcD" role="37wK5m" />
+                                                                <node concept="2OwXpG" id="144Gyms5eME" role="2OqNvi">
+                                                                  <ref role="2Oxat6" node="4KKQOHIOec7" resolve="myGraph" />
                                                                 </node>
                                                               </node>
                                                             </node>
-                                                            <node concept="3clFbH" id="144Gyms50rq" role="3cqZAp" />
+                                                            <node concept="liA8E" id="144Gyms5$nr" role="2OqNvi">
+                                                              <ref role="37wK5l" node="1b$B7Ao$0Nl" resolve="setWasAutoLayout" />
+                                                              <node concept="3clFbT" id="144Gyms5GcD" role="37wK5m" />
+                                                            </node>
                                                           </node>
                                                         </node>
+                                                        <node concept="3clFbH" id="144Gyms50rq" role="3cqZAp" />
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
                                             </node>
-                                            <node concept="3clFbJ" id="3jXDp6SclOd" role="3cqZAp">
-                                              <node concept="3clFbS" id="3jXDp6SclOf" role="3clFbx">
-                                                <node concept="3clFbF" id="3jXDp6Sd4ih" role="3cqZAp">
-                                                  <node concept="2OqwBi" id="6HH$p8MLHg6" role="3clFbG">
-                                                    <node concept="37vLTw" id="1EaNpsCbj_v" role="2Oq$k0">
-                                                      <ref role="3cqZAo" node="1EaNpsCbj_l" resolve="modelAccess" />
-                                                    </node>
-                                                    <node concept="liA8E" id="6HH$p8MLI1J" role="2OqNvi">
-                                                      <ref role="37wK5l" to="lui2:~ModelAccess.executeCommandInEDT(java.lang.Runnable)" resolve="executeCommandInEDT" />
-                                                      <node concept="1bVj0M" id="6HH$p8MLI55" role="37wK5m">
-                                                        <node concept="3clFbS" id="6HH$p8MLI56" role="1bW5cS">
-                                                          <node concept="3clFbF" id="3jXDp6Si8H1" role="3cqZAp">
-                                                            <node concept="2OqwBi" id="3jXDp6SifPs" role="3clFbG">
-                                                              <node concept="37vLTw" id="3jXDp6Si8H0" role="2Oq$k0">
-                                                                <ref role="3cqZAo" node="3jXDp6Sh2DI" resolve="synchronizeCode" />
-                                                              </node>
-                                                              <node concept="1Bd96e" id="3jXDp6SipOh" role="2OqNvi" />
-                                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="3clFbJ" id="3jXDp6SclOd" role="3cqZAp">
+                                          <node concept="3clFbS" id="3jXDp6SclOf" role="3clFbx">
+                                            <node concept="3clFbF" id="3jXDp6Sd4ih" role="3cqZAp">
+                                              <node concept="2OqwBi" id="6HH$p8MLHg6" role="3clFbG">
+                                                <node concept="37vLTw" id="1EaNpsCbj_v" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="1EaNpsCbj_l" resolve="modelAccess" />
+                                                </node>
+                                                <node concept="liA8E" id="6HH$p8MLI1J" role="2OqNvi">
+                                                  <ref role="37wK5l" to="lui2:~ModelAccess.executeCommandInEDT(java.lang.Runnable)" resolve="executeCommandInEDT" />
+                                                  <node concept="1bVj0M" id="6HH$p8MLI55" role="37wK5m">
+                                                    <node concept="3clFbS" id="6HH$p8MLI56" role="1bW5cS">
+                                                      <node concept="3clFbF" id="3jXDp6Si8H1" role="3cqZAp">
+                                                        <node concept="2OqwBi" id="3jXDp6SifPs" role="3clFbG">
+                                                          <node concept="37vLTw" id="3jXDp6Si8H0" role="2Oq$k0">
+                                                            <ref role="3cqZAo" node="3jXDp6Sh2DI" resolve="synchronizeCode" />
                                                           </node>
+                                                          <node concept="1Bd96e" id="3jXDp6SipOh" role="2OqNvi" />
                                                         </node>
                                                       </node>
                                                     </node>
                                                   </node>
                                                 </node>
                                               </node>
-                                              <node concept="3fqX7Q" id="3jXDp6ScOQy" role="3clFbw">
-                                                <node concept="2YIFZM" id="3jXDp6ScOQ$" role="3fr31v">
-                                                  <ref role="37wK5l" to="3a50:~ThreadUtils.isInEDT()" resolve="isInEDT" />
-                                                  <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
-                                                </node>
-                                              </node>
-                                              <node concept="9aQIb" id="3jXDp6SdsQI" role="9aQIa">
-                                                <node concept="3clFbS" id="3jXDp6SdsQJ" role="9aQI4">
-                                                  <node concept="3clFbF" id="3jXDp6Sd$yV" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="3jXDp6Sd$yW" role="3clFbG">
-                                                      <node concept="37vLTw" id="3jXDp6Sd$yX" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="1EaNpsCbj_l" resolve="modelAccess" />
-                                                      </node>
-                                                      <node concept="liA8E" id="3jXDp6Sd$yY" role="2OqNvi">
-                                                        <ref role="37wK5l" to="lui2:~ModelAccess.executeCommand(java.lang.Runnable)" resolve="executeCommand" />
-                                                        <node concept="1bVj0M" id="3jXDp6Sd$yZ" role="37wK5m">
-                                                          <node concept="3clFbS" id="3jXDp6Sd$z0" role="1bW5cS">
-                                                            <node concept="3clFbF" id="3jXDp6SiIob" role="3cqZAp">
-                                                              <node concept="2OqwBi" id="3jXDp6SiP8V" role="3clFbG">
-                                                                <node concept="37vLTw" id="3jXDp6SiIo9" role="2Oq$k0">
-                                                                  <ref role="3cqZAo" node="3jXDp6Sh2DI" resolve="synchronizeCode" />
-                                                                </node>
-                                                                <node concept="1Bd96e" id="3jXDp6SiYa0" role="2OqNvi" />
-                                                              </node>
+                                            </node>
+                                          </node>
+                                          <node concept="3fqX7Q" id="3jXDp6ScOQy" role="3clFbw">
+                                            <node concept="2YIFZM" id="3jXDp6ScOQ$" role="3fr31v">
+                                              <ref role="37wK5l" to="3a50:~ThreadUtils.isInEDT()" resolve="isInEDT" />
+                                              <ref role="1Pybhc" to="3a50:~ThreadUtils" resolve="ThreadUtils" />
+                                            </node>
+                                          </node>
+                                          <node concept="9aQIb" id="3jXDp6SdsQI" role="9aQIa">
+                                            <node concept="3clFbS" id="3jXDp6SdsQJ" role="9aQI4">
+                                              <node concept="3clFbF" id="3jXDp6Sd$yV" role="3cqZAp">
+                                                <node concept="2OqwBi" id="3jXDp6Sd$yW" role="3clFbG">
+                                                  <node concept="37vLTw" id="3jXDp6Sd$yX" role="2Oq$k0">
+                                                    <ref role="3cqZAo" node="1EaNpsCbj_l" resolve="modelAccess" />
+                                                  </node>
+                                                  <node concept="liA8E" id="3jXDp6Sd$yY" role="2OqNvi">
+                                                    <ref role="37wK5l" to="lui2:~ModelAccess.executeCommand(java.lang.Runnable)" resolve="executeCommand" />
+                                                    <node concept="1bVj0M" id="3jXDp6Sd$yZ" role="37wK5m">
+                                                      <node concept="3clFbS" id="3jXDp6Sd$z0" role="1bW5cS">
+                                                        <node concept="3clFbF" id="3jXDp6SiIob" role="3cqZAp">
+                                                          <node concept="2OqwBi" id="3jXDp6SiP8V" role="3clFbG">
+                                                            <node concept="37vLTw" id="3jXDp6SiIo9" role="2Oq$k0">
+                                                              <ref role="3cqZAo" node="3jXDp6Sh2DI" resolve="synchronizeCode" />
                                                             </node>
+                                                            <node concept="1Bd96e" id="3jXDp6SiYa0" role="2OqNvi" />
                                                           </node>
                                                         </node>
                                                       </node>
@@ -7848,16 +7844,6 @@
                                               </node>
                                             </node>
                                           </node>
-                                          <node concept="3fqX7Q" id="1EaNpsCbpn6" role="3clFbw">
-                                            <node concept="2OqwBi" id="1EaNpsCbpn8" role="3fr31v">
-                                              <node concept="37vLTw" id="1EaNpsCbpn9" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="1EaNpsCbj_l" resolve="modelAccess" />
-                                              </node>
-                                              <node concept="liA8E" id="1EaNpsCbpna" role="2OqNvi">
-                                                <ref role="37wK5l" to="lui2:~ModelAccess.canRead()" resolve="canRead" />
-                                              </node>
-                                            </node>
-                                          </node>
                                         </node>
                                       </node>
                                       <node concept="1Wc70l" id="4KKQOHIOebF" role="3clFbw">