diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl
index 14a4a372c..d40d372e3 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/com.fasten.safety.ft.mpl
@@ -19,7 +19,6 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">bda054c4-5d71-46ca-aba0-7104e3070b5a(com.mbeddr.mpsutil.treenotation.styles)</dependency>
     <dependency reexport="false">92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)</dependency>
-    <dependency reexport="false">8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</dependency>
     <dependency reexport="false">2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)</dependency>
     <dependency reexport="false">e9ce245b-3106-45ed-8e5b-aff820d09b85(com.mbeddr.formal.base.tooling)</dependency>
     <dependency reexport="false">20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)</dependency>
@@ -107,6 +106,7 @@
     <module reference="20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)" version="0" />
   </dependencyVersions>
   <extendedLanguages>
+    <extendedLanguage>8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)</extendedLanguage>
     <extendedLanguage>83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</extendedLanguage>
   </extendedLanguages>
 </language>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
index 6ee969a5e..697479935 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
@@ -24,6 +24,7 @@
     <import index="xm38" ref="r:d81a00b5-7941-4066-9929-d2d2283d4215(com.mbeddr.formal.base.tooling.vcs)" />
     <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
     <import index="e57x" ref="r:99808a14-1913-4248-aed8-3139a5d05f88(com.mbeddr.formal.base.styles)" />
+    <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" implicit="true" />
     <import index="fazf" ref="r:28cb0bbd-efcb-4c9e-94f2-4ccc928adfb4(com.fasten.safety.ft.behavior)" implicit="true" />
@@ -46,6 +47,7 @@
         <reference id="5944657839026714445" name="hint" index="2$4xQ3" />
       </concept>
       <concept id="1140524381322" name="jetbrains.mps.lang.editor.structure.CellModel_ListWithRole" flags="ng" index="2czfm3">
+        <property id="1140524450557" name="separatorText" index="2czwfO" />
         <child id="1176897874615" name="nodeFactory" index="4_6I_" />
         <child id="1140524464360" name="cellLayout" index="2czzBx" />
       </concept>
@@ -101,6 +103,8 @@
       <concept id="1630016958697057551" name="jetbrains.mps.lang.editor.structure.IMenuPartParameterized" flags="ng" index="2ZBHr6">
         <child id="1630016958697057552" name="parameterType" index="2ZBHrp" />
       </concept>
+      <concept id="1182191800432" name="jetbrains.mps.lang.editor.structure.QueryFunction_NodeListFilter" flags="in" index="107P5z" />
+      <concept id="1182233249301" name="jetbrains.mps.lang.editor.structure.ConceptFunctionParameter_childNode" flags="nn" index="12_Ws6" />
       <concept id="1235999440492" name="jetbrains.mps.lang.editor.structure.HorizontalAlign" flags="ln" index="37jFXN">
         <property id="1235999920262" name="align" index="37lx6p" />
       </concept>
@@ -155,6 +159,7 @@
       <concept id="1073389882823" name="jetbrains.mps.lang.editor.structure.CellModel_RefNode" flags="sg" stub="730538219795960754" index="3F1sOY" />
       <concept id="1073390211982" name="jetbrains.mps.lang.editor.structure.CellModel_RefNodeList" flags="sg" stub="2794558372793454595" index="3F2HdR">
         <child id="7279578193766667846" name="addHints" index="78xua" />
+        <child id="1182233390675" name="filter" index="12AuX0" />
       </concept>
       <concept id="4233361609415247331" name="jetbrains.mps.lang.editor.structure.QueryFunction_TransformationMenu_Parameter" flags="ig" index="1GhMSn" />
       <concept id="4233361609415240997" name="jetbrains.mps.lang.editor.structure.TransformationMenuPart_Parameterized" flags="ng" index="1GhOrh">
@@ -3065,6 +3070,11 @@
       <property role="TrG5h" value="FT_TREE" />
       <property role="2BUmq6" value="Tree Projection" />
     </node>
+    <node concept="2BsEeg" id="3Sfdbygn1_l" role="2ABdcP">
+      <property role="2gpH_U" value="true" />
+      <property role="TrG5h" value="LAYOUT_INFO_ONLY" />
+      <property role="2BUmq6" value="LAYOUT_INFO_ONLY" />
+    </node>
   </node>
   <node concept="24kQdi" id="1GpuQyThD0a">
     <property role="3GE5qa" value="tree" />
@@ -7073,31 +7083,63 @@
     <property role="3GE5qa" value="text" />
     <property role="TrG5h" value="FaultTreeTextEditorComponent" />
     <ref role="1XX52x" to="spwl:5rwT_JnuQVv" resolve="FaultTree" />
-    <node concept="3EZMnI" id="3f8ZVRY4Ass" role="2wV5jI">
-      <node concept="VPM3Z" id="3f8ZVRY4Ast" role="3F10Kt" />
-      <node concept="3XFhqQ" id="3f8ZVRY4Asu" role="3EZMnx" />
-      <node concept="3F2HdR" id="3f8ZVRY4Asv" role="3EZMnx">
-        <ref role="1NtTu8" to="spwl:2s9yRNfpPP4" resolve="content" />
-        <node concept="2iRkQZ" id="3f8ZVRY4Asw" role="2czzBx" />
-        <node concept="VPM3Z" id="3f8ZVRY4Asx" role="3F10Kt" />
-        <node concept="4$FPG" id="3f8ZVRY4Asy" role="4_6I_">
-          <node concept="3clFbS" id="3f8ZVRY4Asz" role="2VODD2">
-            <node concept="3clFbF" id="3f8ZVRY4As$" role="3cqZAp">
-              <node concept="2pJPEk" id="3f8ZVRY4As_" role="3clFbG">
-                <node concept="2pJPED" id="3f8ZVRY4AsA" role="2pJPEn">
-                  <ref role="2pJxaS" to="spwl:3ZjKZgVUW8g" resolve="EmptyLine" />
+    <node concept="3EZMnI" id="26E6nZcP_J5" role="2wV5jI">
+      <node concept="3F2HdR" id="1jzC6AK2MuK" role="3EZMnx">
+        <property role="2czwfO" value="," />
+        <ref role="1NtTu8" to="tpck:4uZwTti3__2" resolve="smodelAttribute" />
+        <node concept="2iRfu4" id="1jzC6AK4Muf" role="2czzBx" />
+        <node concept="107P5z" id="1jzC6AK3LJi" role="12AuX0">
+          <node concept="3clFbS" id="1jzC6AK3LJj" role="2VODD2">
+            <node concept="3clFbF" id="1jzC6AK3LNi" role="3cqZAp">
+              <node concept="2OqwBi" id="1jzC6AK3M14" role="3clFbG">
+                <node concept="12_Ws6" id="26E6nZcQ3ic" role="2Oq$k0" />
+                <node concept="1mIQ4w" id="1jzC6AK3MwP" role="2OqNvi">
+                  <node concept="chp4Y" id="1jzC6AK3MBc" role="cj9EA">
+                    <ref role="cht4Q" to="suqv:7L$rKAVfLie" resolve="LayoutMap" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
-        <node concept="2w$q5c" id="3f8ZVRY5Gz_" role="78xua">
-          <node concept="2aJ2om" id="3f8ZVRY5GzA" role="2w$qW5">
-            <ref role="2$4xQ3" node="7wRJ5ynOjYu" resolve="FT_TEXT" />
+        <node concept="xShMh" id="1jzC6AK4MDb" role="3F10Kt">
+          <property role="VOm3f" value="true" />
+        </node>
+        <node concept="VPxyj" id="1jzC6AK4MO9" role="3F10Kt" />
+        <node concept="2w$q5c" id="3Sfdbygn1xy" role="78xua">
+          <node concept="2aJ2om" id="3Sfdbygn1xz" role="2w$qW5">
+            <ref role="2$4xQ3" node="3Sfdbygn1_l" resolve="LAYOUT_INFO_ONLY" />
+          </node>
+        </node>
+      </node>
+      <node concept="3F0ifn" id="26E6nZcP_LT" role="3EZMnx" />
+      <node concept="2iRkQZ" id="26E6nZcP_J6" role="2iSdaV" />
+      <node concept="3EZMnI" id="3f8ZVRY4Ass" role="3EZMnx">
+        <node concept="VPM3Z" id="3f8ZVRY4Ast" role="3F10Kt" />
+        <node concept="3XFhqQ" id="3f8ZVRY4Asu" role="3EZMnx" />
+        <node concept="3F2HdR" id="3f8ZVRY4Asv" role="3EZMnx">
+          <ref role="1NtTu8" to="spwl:2s9yRNfpPP4" resolve="content" />
+          <node concept="2iRkQZ" id="3f8ZVRY4Asw" role="2czzBx" />
+          <node concept="VPM3Z" id="3f8ZVRY4Asx" role="3F10Kt" />
+          <node concept="4$FPG" id="3f8ZVRY4Asy" role="4_6I_">
+            <node concept="3clFbS" id="3f8ZVRY4Asz" role="2VODD2">
+              <node concept="3clFbF" id="3f8ZVRY4As$" role="3cqZAp">
+                <node concept="2pJPEk" id="3f8ZVRY4As_" role="3clFbG">
+                  <node concept="2pJPED" id="3f8ZVRY4AsA" role="2pJPEn">
+                    <ref role="2pJxaS" to="spwl:3ZjKZgVUW8g" resolve="EmptyLine" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2w$q5c" id="3f8ZVRY5Gz_" role="78xua">
+            <node concept="2aJ2om" id="3f8ZVRY5GzA" role="2w$qW5">
+              <ref role="2$4xQ3" node="7wRJ5ynOjYu" resolve="FT_TEXT" />
+            </node>
           </node>
         </node>
+        <node concept="l2Vlx" id="3f8ZVRY4AsB" role="2iSdaV" />
       </node>
-      <node concept="l2Vlx" id="3f8ZVRY4AsB" role="2iSdaV" />
     </node>
   </node>
   <node concept="PKFIW" id="3f8ZVRY4C86">
@@ -7317,5 +7359,15 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="26E6nZcRcWd">
+    <property role="3GE5qa" value="base" />
+    <ref role="1XX52x" to="suqv:7L$rKAVfLie" resolve="LayoutMap" />
+    <node concept="3F0ifn" id="26E6nZcRe98" role="2wV5jI">
+      <property role="3F0ifm" value="layout information" />
+    </node>
+    <node concept="2aJ2om" id="26E6nZcRe91" role="CpUAK">
+      <ref role="2$4xQ3" node="3Sfdbygn1_l" resolve="LAYOUT_INFO_ONLY" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
index 7d3652359..9ce4adc69 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
@@ -5557,16 +5557,16 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvzOH" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvzOI" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="_yKhEdNKS_" role="3bR37C">
           <node concept="1Busua" id="_yKhEdNKSA" role="1SiIV1">
             <ref role="1Busuk" node="6hyv0iVPlG3" resolve="com.mbeddr.formal.base" />
           </node>
         </node>
+        <node concept="1SiIV0" id="26E6nZcRD$S" role="3bR37C">
+          <node concept="1Busua" id="26E6nZcRD$T" role="1SiIV1">
+            <ref role="1Busuk" to="90a9:56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3rkUgzovbK_" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
index 74b00144d..b06173c58 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -10539,16 +10539,16 @@
             <ref role="3bR37D" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
           </node>
         </node>
-        <node concept="1SiIV0" id="8xY_IhvyYC" role="3bR37C">
-          <node concept="3bR9La" id="8xY_IhvyYD" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
-          </node>
-        </node>
         <node concept="1SiIV0" id="_yKhEdNKm4" role="3bR37C">
           <node concept="1Busua" id="_yKhEdNKm5" role="1SiIV1">
             <ref role="1Busuk" node="42jqVeFkUuV" resolve="com.mbeddr.formal.base" />
           </node>
         </node>
+        <node concept="1SiIV0" id="26E6nZcREgI" role="3bR37C">
+          <node concept="1Busua" id="26E6nZcREgJ" role="1SiIV1">
+            <ref role="1Busuk" to="90a9:56Tfdun3uan" resolve="de.itemis.mps.editor.diagram.layout" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="3R_yAtWp53E" role="2G$12L">
         <property role="BnDLt" value="true" />