diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
index 6aa72262e..7364c0445 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
@@ -172,7 +172,6 @@
         <child id="3937244445246642781" name="nodeToReport" index="1urrMF" />
       </concept>
       <concept id="1210784285454" name="jetbrains.mps.lang.typesystem.structure.TypesystemIntention" flags="ng" index="3Cnw8n">
-        <property id="1216127910019" name="applyImmediately" index="ARO6o" />
         <reference id="1216388525179" name="quickFix" index="QpYPw" />
         <child id="1210784493590" name="actualArgument" index="3Coj4f" />
       </concept>
@@ -405,7 +404,7 @@
     </node>
   </node>
   <node concept="Q5z_Y" id="3f8ZVRYftjp">
-    <property role="TrG5h" value="fix_GoalStructureElementsNames_basedOnPrefix" />
+    <property role="TrG5h" value="fix_EntitiesNames_basedOnPrefix" />
     <node concept="Q6JDH" id="3f8ZVRYftxu" role="Q6Id_">
       <property role="TrG5h" value="nodeWithPrefixedName" />
       <node concept="3Tqbb2" id="3f8ZVRYftx$" role="Q6QK4">
@@ -599,7 +598,7 @@
                     <ref role="3cqZAo" node="84ljAGCXdv" resolve="nodeUsingPrefix" />
                   </node>
                   <node concept="3Cnw8n" id="3f8ZVRYf_jS" role="1urrFz">
-                    <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                    <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                     <node concept="3CnSsL" id="3f8ZVRYf_oM" role="3Coj4f">
                       <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                       <node concept="37vLTw" id="84ljAGDg3E" role="3CoRuB">
@@ -673,8 +672,7 @@
                 <node concept="3clFbS" id="3f8ZVRYdTFI" role="3eOfB_">
                   <node concept="2MkqsV" id="3f8ZVRYdVlx" role="3cqZAp">
                     <node concept="3Cnw8n" id="3f8ZVRYfC5W" role="1urrFz">
-                      <property role="ARO6o" value="true" />
-                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                       <node concept="3CnSsL" id="3f8ZVRYfC5X" role="3Coj4f">
                         <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                         <node concept="37vLTw" id="84ljAGDg6L" role="3CoRuB">
@@ -721,8 +719,7 @@
                       <node concept="3clFbS" id="3f8ZVRYe6LF" role="1zc67A">
                         <node concept="2MkqsV" id="3f8ZVRYe6X3" role="3cqZAp">
                           <node concept="3Cnw8n" id="3f8ZVRYfCbF" role="1urrFz">
-                            <property role="ARO6o" value="true" />
-                            <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                            <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                             <node concept="3CnSsL" id="3f8ZVRYfCbG" role="3Coj4f">
                               <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                               <node concept="37vLTw" id="84ljAGDg9S" role="3CoRuB">
@@ -801,7 +798,7 @@
                   </node>
                   <node concept="2Mj0R9" id="3f8ZVRYe7X$" role="3cqZAp">
                     <node concept="3Cnw8n" id="3f8ZVRYfD01" role="1urrFz">
-                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                       <node concept="3CnSsL" id="3f8ZVRYfD02" role="3Coj4f">
                         <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                         <node concept="37vLTw" id="84ljAGDgbq" role="3CoRuB">
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
index ba22e9704..360680030 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
@@ -24,7 +24,7 @@
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:40ab19e9-751a-4433-b645-0e65160e58a0:org.mpsqa.lint.generic" version="0" />
+    <language slang="l:40ab19e9-751a-4433-b645-0e65160e58a0:org.mpsqa.lint.generic" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="97efeb54-e757-4c3b-b175-aa20f7476a23(com.fasten.meta.linters)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
index 3800b9c96..d6a398ffd 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
index 3cf9d2555..5b03cf4a3 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
index 5a9011dcc..1faf38ec6 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
index dcaebdf1e..1489b7dd9 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
index 2413f0360..dde229eb4 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
@@ -2,7 +2,7 @@
 <model ref="r:7f28bd12-d21d-4c95-8613-64ad2bd87166(com.fasten.meta.linters.model_level)">
   <persistence version="9" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
index f67c9abdd..ab5069183 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
@@ -2,7 +2,7 @@
 <model ref="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)">
   <persistence version="9" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
index fd7d69854..0b0b8ab99 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/tmp/.gitkeep b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/tmp/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
index d25e463a5..361427dab 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
@@ -21,6 +21,7 @@
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
+    <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
@@ -73,6 +74,7 @@
     <module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
     <module reference="5e7ffa70-8e23-49f4-8c13-a887bba14c36(com.mbeddr.formal.safety.gsn.external_evidence)" version="0" />
     <module reference="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" version="0" />
+    <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
     <module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
index ac51b81c9..0a0ff916d 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/models/com.mbeddr.formal.safety.gsn.external_evidence.editor.mps
@@ -20,6 +20,7 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="s9pq" ref="r:8ef909e6-5cd8-45b2-9793-5a70f4829a0a(com.mbeddr.formal.safety.gsn.external_evidence.structure)" />
     <import index="xnej" ref="r:bff9a19b-7e5d-44c3-8cfc-aec191022422(com.mbeddr.formal.base.editor)" />
+    <import index="oqvi" ref="r:d4fc365d-2731-4abe-97d6-18ce4700d823(com.mpsbasics.editor.utils.buttons)" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
     <import index="48kf" ref="r:5f41c82d-84d1-4fb1-a1cf-6697d2365854(com.mbeddr.mpsutil.filepicker.behavior)" implicit="true" />
@@ -354,76 +355,59 @@
         <node concept="3gTLQM" id="4MlXWpxb3fO" role="3EZMnx">
           <node concept="3Fmcul" id="4MlXWpxb3fP" role="3FoqZy">
             <node concept="3clFbS" id="4MlXWpxb3fQ" role="2VODD2">
-              <node concept="3cpWs8" id="4MlXWpxb3fR" role="3cqZAp">
-                <node concept="3cpWsn" id="4MlXWpxb3fS" role="3cpWs9">
-                  <property role="TrG5h" value="button" />
-                  <node concept="3uibUv" id="4MlXWpxb3fT" role="1tU5fm">
-                    <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
+              <node concept="3clFbF" id="3vv33A$iDjw" role="3cqZAp">
+                <node concept="2YIFZM" id="3vv33A$iFbc" role="3clFbG">
+                  <ref role="37wK5l" to="oqvi:3vv33A$ikDL" resolve="createStyledButton" />
+                  <ref role="1Pybhc" to="oqvi:3vv33A$ikzI" resolve="JButtonUtils" />
+                  <node concept="Xl_RD" id="3vv33A$iFgm" role="37wK5m">
+                    <property role="Xl_RC" value="open" />
                   </node>
-                  <node concept="2ShNRf" id="4MlXWpxb3fU" role="33vP2m">
-                    <node concept="1pGfFk" id="4MlXWpxb3fV" role="2ShVmc">
-                      <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(java.lang.String)" resolve="JButton" />
-                      <node concept="Xl_RD" id="4MlXWpxb3fW" role="37wK5m">
-                        <property role="Xl_RC" value="open" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4MlXWpxb3fX" role="3cqZAp">
-                <node concept="2OqwBi" id="4MlXWpxb3fY" role="3clFbG">
-                  <node concept="37vLTw" id="4MlXWpxb3fZ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MlXWpxb3fS" resolve="button" />
-                  </node>
-                  <node concept="liA8E" id="4MlXWpxb3g0" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
-                    <node concept="2ShNRf" id="4MlXWpxb3g1" role="37wK5m">
-                      <node concept="YeOm9" id="4MlXWpxb3g2" role="2ShVmc">
-                        <node concept="1Y3b0j" id="4MlXWpxb3g3" role="YeSDq">
-                          <property role="2bfB8j" value="true" />
-                          <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
-                          <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                          <node concept="3Tm1VV" id="4MlXWpxb3g4" role="1B3o_S" />
-                          <node concept="3clFb_" id="4MlXWpxb3g5" role="jymVt">
-                            <property role="TrG5h" value="actionPerformed" />
-                            <node concept="3Tm1VV" id="4MlXWpxb3g6" role="1B3o_S" />
-                            <node concept="3cqZAl" id="4MlXWpxb3g7" role="3clF45" />
-                            <node concept="37vLTG" id="4MlXWpxb3g8" role="3clF46">
-                              <property role="TrG5h" value="p0" />
-                              <node concept="3uibUv" id="4MlXWpxb3g9" role="1tU5fm">
-                                <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
-                              </node>
+                  <node concept="2ShNRf" id="3vv33A$iFws" role="37wK5m">
+                    <node concept="YeOm9" id="3vv33A$iFwt" role="2ShVmc">
+                      <node concept="1Y3b0j" id="3vv33A$iFwu" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                        <node concept="3Tm1VV" id="3vv33A$iFwv" role="1B3o_S" />
+                        <node concept="3clFb_" id="3vv33A$iFww" role="jymVt">
+                          <property role="TrG5h" value="actionPerformed" />
+                          <node concept="3Tm1VV" id="3vv33A$iFwx" role="1B3o_S" />
+                          <node concept="3cqZAl" id="3vv33A$iFwy" role="3clF45" />
+                          <node concept="37vLTG" id="3vv33A$iFwz" role="3clF46">
+                            <property role="TrG5h" value="p0" />
+                            <node concept="3uibUv" id="3vv33A$iFw$" role="1tU5fm">
+                              <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
                             </node>
-                            <node concept="3clFbS" id="4MlXWpxb3ga" role="3clF47">
-                              <node concept="1QHqEK" id="4MlXWpxb3gb" role="3cqZAp">
-                                <node concept="1QHqEC" id="4MlXWpxb3gc" role="1QHqEI">
-                                  <node concept="3clFbS" id="4MlXWpxb3gd" role="1bW5cS">
-                                    <node concept="3clFbF" id="4MlXWpxb3ge" role="3cqZAp">
-                                      <node concept="2OqwBi" id="4MlXWpxb3gf" role="3clFbG">
-                                        <node concept="2OqwBi" id="4MlXWpxb3gg" role="2Oq$k0">
-                                          <node concept="pncrf" id="4MlXWpxb3gh" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="4MlXWpxb3gi" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="s9pq:3wuU_o8fDTa" resolve="document" />
-                                          </node>
-                                        </node>
-                                        <node concept="2qgKlT" id="4MlXWpxb3gj" role="2OqNvi">
-                                          <ref role="37wK5l" to="48kf:2HwAvL$nEXJ" resolve="openWithSystemEditor" />
+                          </node>
+                          <node concept="3clFbS" id="3vv33A$iFw_" role="3clF47">
+                            <node concept="1QHqEK" id="3vv33A$iFwA" role="3cqZAp">
+                              <node concept="1QHqEC" id="3vv33A$iFwB" role="1QHqEI">
+                                <node concept="3clFbS" id="3vv33A$iFwC" role="1bW5cS">
+                                  <node concept="3clFbF" id="3vv33A$iFwD" role="3cqZAp">
+                                    <node concept="2OqwBi" id="3vv33A$iFwE" role="3clFbG">
+                                      <node concept="2OqwBi" id="3vv33A$iFwF" role="2Oq$k0">
+                                        <node concept="pncrf" id="3vv33A$iFwG" role="2Oq$k0" />
+                                        <node concept="3TrEf2" id="3vv33A$iFwH" role="2OqNvi">
+                                          <ref role="3Tt5mk" to="s9pq:3wuU_o8fDTa" resolve="document" />
                                         </node>
                                       </node>
+                                      <node concept="2qgKlT" id="3vv33A$iFwI" role="2OqNvi">
+                                        <ref role="37wK5l" to="48kf:2HwAvL$nEXJ" resolve="openWithSystemEditor" />
+                                      </node>
                                     </node>
                                   </node>
                                 </node>
-                                <node concept="2OqwBi" id="4MlXWpxb3gk" role="ukAjM">
-                                  <node concept="1Q80Hx" id="4MlXWpxb3gl" role="2Oq$k0" />
-                                  <node concept="liA8E" id="4MlXWpxb3gm" role="2OqNvi">
-                                    <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
-                                  </node>
+                              </node>
+                              <node concept="2OqwBi" id="3vv33A$iFwJ" role="ukAjM">
+                                <node concept="1Q80Hx" id="3vv33A$iFwK" role="2Oq$k0" />
+                                <node concept="liA8E" id="3vv33A$iFwL" role="2OqNvi">
+                                  <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
                                 </node>
                               </node>
                             </node>
-                            <node concept="2AHcQZ" id="4MlXWpxb3gn" role="2AJF6D">
-                              <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="3vv33A$iFwM" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                           </node>
                         </node>
                       </node>
@@ -431,116 +415,48 @@
                   </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="4MlXWpxb3go" role="3cqZAp">
-                <node concept="2OqwBi" id="4MlXWpxb3gp" role="3clFbG">
-                  <node concept="37vLTw" id="4MlXWpxb3gq" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MlXWpxb3fS" resolve="button" />
-                  </node>
-                  <node concept="liA8E" id="4MlXWpxb3gr" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~JComponent.setFont(java.awt.Font)" resolve="setFont" />
-                    <node concept="2ShNRf" id="4MlXWpxb3gs" role="37wK5m">
-                      <node concept="1pGfFk" id="4MlXWpxb3gt" role="2ShVmc">
-                        <ref role="37wK5l" to="z60i:~Font.&lt;init&gt;(java.lang.String,int,int)" resolve="Font" />
-                        <node concept="Xl_RD" id="4MlXWpxb3gu" role="37wK5m">
-                          <property role="Xl_RC" value="Arial" />
-                        </node>
-                        <node concept="10M0yZ" id="4MlXWpxb3gv" role="37wK5m">
-                          <ref role="3cqZAo" to="z60i:~Font.BOLD" resolve="BOLD" />
-                          <ref role="1PxDUh" to="z60i:~Font" resolve="Font" />
-                        </node>
-                        <node concept="3cmrfG" id="4MlXWpxb3gw" role="37wK5m">
-                          <property role="3cmrfH" value="8" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4MlXWpxb3gx" role="3cqZAp">
-                <node concept="2OqwBi" id="4MlXWpxb3gy" role="3clFbG">
-                  <node concept="37vLTw" id="4MlXWpxb3gz" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MlXWpxb3fS" resolve="button" />
-                  </node>
-                  <node concept="liA8E" id="4MlXWpxb3g$" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
-                    <node concept="2ShNRf" id="4MlXWpxb3g_" role="37wK5m">
-                      <node concept="1pGfFk" id="4MlXWpxb3gA" role="2ShVmc">
-                        <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
-                        <node concept="3cmrfG" id="4MlXWpxb3gB" role="37wK5m">
-                          <property role="3cmrfH" value="30" />
-                        </node>
-                        <node concept="3cmrfG" id="4MlXWpxb3gC" role="37wK5m">
-                          <property role="3cmrfH" value="15" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4MlXWpxb3gD" role="3cqZAp">
-                <node concept="37vLTw" id="4MlXWpxb3gE" role="3clFbG">
-                  <ref role="3cqZAo" node="4MlXWpxb3fS" resolve="button" />
-                </node>
-              </node>
             </node>
           </node>
         </node>
         <node concept="3gTLQM" id="4MlXWpxb3gF" role="3EZMnx">
           <node concept="3Fmcul" id="4MlXWpxb3gG" role="3FoqZy">
             <node concept="3clFbS" id="4MlXWpxb3gH" role="2VODD2">
-              <node concept="3cpWs8" id="4MlXWpxb3gI" role="3cqZAp">
-                <node concept="3cpWsn" id="4MlXWpxb3gJ" role="3cpWs9">
-                  <property role="TrG5h" value="button" />
-                  <node concept="3uibUv" id="4MlXWpxb3gK" role="1tU5fm">
-                    <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
-                  </node>
-                  <node concept="2ShNRf" id="4MlXWpxb3gL" role="33vP2m">
-                    <node concept="1pGfFk" id="4MlXWpxb3gM" role="2ShVmc">
-                      <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(java.lang.String)" resolve="JButton" />
-                      <node concept="Xl_RD" id="4MlXWpxb3gN" role="37wK5m">
-                        <property role="Xl_RC" value="update hashcode" />
-                      </node>
-                    </node>
+              <node concept="3clFbF" id="3vv33A$kuDJ" role="3cqZAp">
+                <node concept="2YIFZM" id="3vv33A$kuTZ" role="3clFbG">
+                  <ref role="37wK5l" to="oqvi:3vv33A$ikDL" resolve="createStyledButton" />
+                  <ref role="1Pybhc" to="oqvi:3vv33A$ikzI" resolve="JButtonUtils" />
+                  <node concept="Xl_RD" id="3vv33A$kv7D" role="37wK5m">
+                    <property role="Xl_RC" value="update hashcode" />
                   </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4MlXWpxb3gO" role="3cqZAp">
-                <node concept="2OqwBi" id="4MlXWpxb3gP" role="3clFbG">
-                  <node concept="37vLTw" id="4MlXWpxb3gQ" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MlXWpxb3gJ" resolve="button" />
-                  </node>
-                  <node concept="liA8E" id="4MlXWpxb3gR" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
-                    <node concept="2ShNRf" id="4MlXWpxb3gS" role="37wK5m">
-                      <node concept="YeOm9" id="4MlXWpxb3gT" role="2ShVmc">
-                        <node concept="1Y3b0j" id="4MlXWpxb3gU" role="YeSDq">
-                          <property role="2bfB8j" value="true" />
-                          <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
-                          <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                          <node concept="3Tm1VV" id="4MlXWpxb3gV" role="1B3o_S" />
-                          <node concept="3clFb_" id="4MlXWpxb3gW" role="jymVt">
-                            <property role="TrG5h" value="actionPerformed" />
-                            <node concept="3Tm1VV" id="4MlXWpxb3gX" role="1B3o_S" />
-                            <node concept="3cqZAl" id="4MlXWpxb3gY" role="3clF45" />
-                            <node concept="37vLTG" id="4MlXWpxb3gZ" role="3clF46">
-                              <property role="TrG5h" value="p0" />
-                              <node concept="3uibUv" id="4MlXWpxb3h0" role="1tU5fm">
-                                <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
-                              </node>
+                  <node concept="2ShNRf" id="4MlXWpxb3gS" role="37wK5m">
+                    <node concept="YeOm9" id="4MlXWpxb3gT" role="2ShVmc">
+                      <node concept="1Y3b0j" id="4MlXWpxb3gU" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                        <node concept="3Tm1VV" id="4MlXWpxb3gV" role="1B3o_S" />
+                        <node concept="3clFb_" id="4MlXWpxb3gW" role="jymVt">
+                          <property role="TrG5h" value="actionPerformed" />
+                          <node concept="3Tm1VV" id="4MlXWpxb3gX" role="1B3o_S" />
+                          <node concept="3cqZAl" id="4MlXWpxb3gY" role="3clF45" />
+                          <node concept="37vLTG" id="4MlXWpxb3gZ" role="3clF46">
+                            <property role="TrG5h" value="p0" />
+                            <node concept="3uibUv" id="4MlXWpxb3h0" role="1tU5fm">
+                              <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
                             </node>
-                            <node concept="3clFbS" id="4MlXWpxb3h1" role="3clF47">
-                              <node concept="3clFbF" id="4MlXWpxb3h2" role="3cqZAp">
-                                <node concept="2YIFZM" id="4MlXWpxb3h3" role="3clFbG">
-                                  <ref role="37wK5l" to="kq9k:4MlXWpxaF7U" resolve="updateHashCode" />
-                                  <ref role="1Pybhc" to="kq9k:2QkJsC6G0dk" resolve="ExternalEvidenceDocumentChecker" />
-                                  <node concept="pncrf" id="4MlXWpxb3h4" role="37wK5m" />
-                                  <node concept="1Q80Hx" id="4MlXWpxb3h5" role="37wK5m" />
-                                </node>
+                          </node>
+                          <node concept="3clFbS" id="4MlXWpxb3h1" role="3clF47">
+                            <node concept="3clFbF" id="4MlXWpxb3h2" role="3cqZAp">
+                              <node concept="2YIFZM" id="4MlXWpxb3h3" role="3clFbG">
+                                <ref role="37wK5l" to="kq9k:4MlXWpxaF7U" resolve="updateHashCode" />
+                                <ref role="1Pybhc" to="kq9k:2QkJsC6G0dk" resolve="ExternalEvidenceDocumentChecker" />
+                                <node concept="pncrf" id="4MlXWpxb3h4" role="37wK5m" />
+                                <node concept="1Q80Hx" id="4MlXWpxb3h5" role="37wK5m" />
                               </node>
                             </node>
-                            <node concept="2AHcQZ" id="4MlXWpxb3h6" role="2AJF6D">
-                              <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="4MlXWpxb3h6" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                           </node>
                         </node>
                       </node>
@@ -548,57 +464,6 @@
                   </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="4MlXWpxb3h7" role="3cqZAp">
-                <node concept="2OqwBi" id="4MlXWpxb3h8" role="3clFbG">
-                  <node concept="37vLTw" id="4MlXWpxb3h9" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MlXWpxb3gJ" resolve="button" />
-                  </node>
-                  <node concept="liA8E" id="4MlXWpxb3ha" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~JComponent.setFont(java.awt.Font)" resolve="setFont" />
-                    <node concept="2ShNRf" id="4MlXWpxb3hb" role="37wK5m">
-                      <node concept="1pGfFk" id="4MlXWpxb3hc" role="2ShVmc">
-                        <ref role="37wK5l" to="z60i:~Font.&lt;init&gt;(java.lang.String,int,int)" resolve="Font" />
-                        <node concept="Xl_RD" id="4MlXWpxb3hd" role="37wK5m">
-                          <property role="Xl_RC" value="Arial" />
-                        </node>
-                        <node concept="10M0yZ" id="4MlXWpxb3he" role="37wK5m">
-                          <ref role="3cqZAo" to="z60i:~Font.BOLD" resolve="BOLD" />
-                          <ref role="1PxDUh" to="z60i:~Font" resolve="Font" />
-                        </node>
-                        <node concept="3cmrfG" id="4MlXWpxb3hf" role="37wK5m">
-                          <property role="3cmrfH" value="8" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4MlXWpxb3hg" role="3cqZAp">
-                <node concept="2OqwBi" id="4MlXWpxb3hh" role="3clFbG">
-                  <node concept="37vLTw" id="4MlXWpxb3hi" role="2Oq$k0">
-                    <ref role="3cqZAo" node="4MlXWpxb3gJ" resolve="button" />
-                  </node>
-                  <node concept="liA8E" id="4MlXWpxb3hj" role="2OqNvi">
-                    <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
-                    <node concept="2ShNRf" id="4MlXWpxb3hk" role="37wK5m">
-                      <node concept="1pGfFk" id="4MlXWpxb3hl" role="2ShVmc">
-                        <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
-                        <node concept="3cmrfG" id="4MlXWpxb3hm" role="37wK5m">
-                          <property role="3cmrfH" value="80" />
-                        </node>
-                        <node concept="3cmrfG" id="4MlXWpxb3hn" role="37wK5m">
-                          <property role="3cmrfH" value="15" />
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="3clFbF" id="4MlXWpxb3ho" role="3cqZAp">
-                <node concept="37vLTw" id="4MlXWpxb3hp" role="3clFbG">
-                  <ref role="3cqZAo" node="4MlXWpxb3gJ" resolve="button" />
-                </node>
-              </node>
             </node>
           </node>
         </node>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
index 56566971e..af6485e4e 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
@@ -33,6 +33,7 @@
     <language slang="l:120e1c9d-4e27-4478-b2af-b2c3bd3850b0:com.mbeddr.mpsutil.editor.querylist" version="0" />
     <language slang="l:c73b17af-16a1-4490-8072-8a84937c5206:com.mbeddr.mpsutil.treenotation" version="0" />
     <language slang="l:f89904fb-9486-43a1-865e-5ad0375a8a88:de.itemis.mps.editor.bool" version="0" />
+    <language slang="l:1919c723-b60b-4592-9318-9ce96d91da44:de.itemis.mps.editor.celllayout" version="0" />
     <language slang="l:3bdedd09-792a-4e15-a4db-83970df3ee86:de.itemis.mps.editor.collapsible" version="0" />
     <language slang="l:fa13cc63-c476-4d46-9c96-d53670abe7bc:de.itemis.mps.editor.diagram" version="1" />
     <language slang="l:31c91def-a131-41a1-9018-102874f49a12:de.slisson.mps.editor.multiline" version="0" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
index d9eac5523..40e8ebdc8 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.behavior.mps
@@ -20,9 +20,11 @@
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
     <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
     <import index="o8zo" ref="r:314576fc-3aee-4386-a0a5-a38348ac317d(jetbrains.mps.scope)" />
+    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
   </imports>
   <registry>
     <language id="af65afd8-f0dd-4942-87d9-63a55f2a9db1" name="jetbrains.mps.lang.behavior">
+      <concept id="6496299201655527393" name="jetbrains.mps.lang.behavior.structure.LocalBehaviorMethodCall" flags="nn" index="BsUDl" />
       <concept id="1225194240794" name="jetbrains.mps.lang.behavior.structure.ConceptBehavior" flags="ng" index="13h7C7">
         <reference id="1225194240799" name="concept" index="13h7C2" />
         <child id="1225194240805" name="method" index="13h7CS" />
@@ -41,12 +43,23 @@
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
+      <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
+        <child id="1082485599096" name="statements" index="9aQI4" />
+      </concept>
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
+        <child id="1239714902950" name="expression" index="2$L3a6" />
+      </concept>
+      <concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
@@ -66,8 +79,12 @@
       <concept id="1164991038168" name="jetbrains.mps.baseLanguage.structure.ThrowStatement" flags="nn" index="YS8fn">
         <child id="1164991057263" name="throwable" index="YScLw" />
       </concept>
+      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
+      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
+        <child id="1070534760952" name="componentType" index="10Q1$1" />
+      </concept>
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
         <property id="1176718929932" name="isFinal" index="3TUv4t" />
         <child id="1068431790190" name="initializer" index="33vP2m" />
@@ -92,7 +109,9 @@
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
       </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
       <concept id="1068580123159" name="jetbrains.mps.baseLanguage.structure.IfStatement" flags="nn" index="3clFbJ">
+        <child id="1082485599094" name="ifFalseStatement" index="9aQIa" />
         <child id="1068580123160" name="condition" index="3clFbw" />
         <child id="1068580123161" name="ifTrue" index="3clFbx" />
       </concept>
@@ -113,7 +132,14 @@
       <concept id="1068581242867" name="jetbrains.mps.baseLanguage.structure.LongType" flags="in" index="3cpWsb" />
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
       <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
       <concept id="1081506762703" name="jetbrains.mps.baseLanguage.structure.GreaterThanExpression" flags="nn" index="3eOSWO" />
+      <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
+      <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
+        <child id="1081516765348" name="expression" index="3fr31v" />
+      </concept>
       <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
@@ -126,9 +152,12 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
+      <concept id="1073239437375" name="jetbrains.mps.baseLanguage.structure.NotEqualsExpression" flags="nn" index="3y3z36" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
@@ -149,6 +178,22 @@
         <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
     </language>
+    <language id="3a13115c-633c-4c5c-bbcc-75c4219e9555" name="jetbrains.mps.lang.quotation">
+      <concept id="5455284157993911077" name="jetbrains.mps.lang.quotation.structure.NodeBuilderInitProperty" flags="ng" index="2pJxcG">
+        <reference id="5455284157993911078" name="property" index="2pJxcJ" />
+        <child id="1595412875168045201" name="initValue" index="28ntcv" />
+      </concept>
+      <concept id="5455284157993863837" name="jetbrains.mps.lang.quotation.structure.NodeBuilder" flags="nn" index="2pJPEk">
+        <child id="5455284157993863838" name="quotedNode" index="2pJPEn" />
+      </concept>
+      <concept id="5455284157993863840" name="jetbrains.mps.lang.quotation.structure.NodeBuilderNode" flags="nn" index="2pJPED">
+        <reference id="5455284157993910961" name="concept" index="2pJxaS" />
+        <child id="5455284157993911099" name="values" index="2pJxcM" />
+      </concept>
+      <concept id="6985522012210254362" name="jetbrains.mps.lang.quotation.structure.NodeBuilderPropertyExpression" flags="nn" index="WxPPo">
+        <child id="6985522012210254363" name="expression" index="WxPPp" />
+      </concept>
+    </language>
     <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
@@ -182,6 +227,9 @@
       <concept id="1182511038748" name="jetbrains.mps.lang.smodel.structure.Model_NodesIncludingImportedOperation" flags="nn" index="1j9C0f">
         <child id="6750920497477143623" name="conceptArgument" index="3MHPCF" />
       </concept>
+      <concept id="1139621453865" name="jetbrains.mps.lang.smodel.structure.Node_IsInstanceOfOperation" flags="nn" index="1mIQ4w">
+        <child id="1177027386292" name="conceptArgument" index="cj9EA" />
+      </concept>
       <concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
       <concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
       <concept id="1144101972840" name="jetbrains.mps.lang.smodel.structure.OperationParm_Concept" flags="ng" index="1xMEDy">
@@ -231,8 +279,19 @@
         <child id="1151689745422" name="elementType" index="A3Ik2" />
       </concept>
       <concept id="1151702311717" name="jetbrains.mps.baseLanguage.collections.structure.ToListOperation" flags="nn" index="ANE8D" />
+      <concept id="1153943597977" name="jetbrains.mps.baseLanguage.collections.structure.ForEachStatement" flags="nn" index="2Gpval">
+        <child id="1153944400369" name="variable" index="2Gsz3X" />
+        <child id="1153944424730" name="inputSequence" index="2GsD0m" />
+      </concept>
+      <concept id="1153944193378" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariable" flags="nr" index="2GrKxI" />
+      <concept id="1153944233411" name="jetbrains.mps.baseLanguage.collections.structure.ForEachVariableReference" flags="nn" index="2GrUjf">
+        <reference id="1153944258490" name="variable" index="2Gs0qQ" />
+      </concept>
+      <concept id="1227022210526" name="jetbrains.mps.baseLanguage.collections.structure.ClearAllElementsOperation" flags="nn" index="2Kehj3" />
       <concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1160666733551" name="jetbrains.mps.baseLanguage.collections.structure.AddAllElementsOperation" flags="nn" index="X8dFx" />
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
       <concept id="3055999550620853964" name="jetbrains.mps.baseLanguage.collections.structure.RemoveWhereOperation" flags="nn" index="1aUR6E" />
       <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
       <concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
@@ -707,6 +766,611 @@
       </node>
       <node concept="17QB3L" id="4J4sUayhlVe" role="3clF45" />
     </node>
+    <node concept="13i0hz" id="3vv33A$FW_c" role="13h7CS">
+      <property role="TrG5h" value="performDescriptionAlignment" />
+      <node concept="3Tm1VV" id="3vv33A$FW_d" role="1B3o_S" />
+      <node concept="3cqZAl" id="3vv33A$FXv4" role="3clF45" />
+      <node concept="3clFbS" id="3vv33A$FW_f" role="3clF47">
+        <node concept="3clFbJ" id="3vv33A$nsdY" role="3cqZAp">
+          <node concept="3clFbS" id="3vv33A$nse0" role="3clFbx">
+            <node concept="3cpWs8" id="3T9YlBtocyw" role="3cqZAp">
+              <node concept="3cpWsn" id="3T9YlBtocyx" role="3cpWs9">
+                <property role="TrG5h" value="newWords" />
+                <node concept="2I9FWS" id="3T9YlBtobwt" role="1tU5fm">
+                  <ref role="2I9WkF" to="87nw:2dWzqxEBMSc" resolve="Word" />
+                </node>
+                <node concept="BsUDl" id="3T9YlBtocyy" role="33vP2m">
+                  <ref role="37wK5l" node="3T9YlBtnHHf" resolve="doFormatDescription" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="3T9YlBtoecj" role="3cqZAp">
+              <node concept="2OqwBi" id="3T9YlBtohIt" role="3clFbG">
+                <node concept="2OqwBi" id="3T9YlBtofAI" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3T9YlBtoess" role="2Oq$k0">
+                    <node concept="13iPFW" id="3T9YlBtoech" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="3T9YlBtofq9" role="2OqNvi">
+                      <ref role="3Tt5mk" to="py52:3GRi4m$qYoV" resolve="text" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="3T9YlBtog10" role="2OqNvi">
+                    <ref role="3TtcxE" to="87nw:2dWzqxEBBFI" resolve="words" />
+                  </node>
+                </node>
+                <node concept="2Kehj3" id="3T9YlBtokRz" role="2OqNvi" />
+              </node>
+            </node>
+            <node concept="3clFbF" id="3T9YlBtopgK" role="3cqZAp">
+              <node concept="2OqwBi" id="3T9YlBto_Z3" role="3clFbG">
+                <node concept="2OqwBi" id="3T9YlBtowkr" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3T9YlBtoriD" role="2Oq$k0">
+                    <node concept="13iPFW" id="3T9YlBtopgI" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="3T9YlBtoukD" role="2OqNvi">
+                      <ref role="3Tt5mk" to="py52:3GRi4m$qYoV" resolve="text" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="3T9YlBtoyvK" role="2OqNvi">
+                    <ref role="3TtcxE" to="87nw:2dWzqxEBBFI" resolve="words" />
+                  </node>
+                </node>
+                <node concept="X8dFx" id="3T9YlBtoFhy" role="2OqNvi">
+                  <node concept="37vLTw" id="3T9YlBtoInM" role="25WWJ7">
+                    <ref role="3cqZAo" node="3T9YlBtocyx" resolve="newWords" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="1Wc70l" id="3vv33A$uGhH" role="3clFbw">
+            <node concept="2OqwBi" id="3vv33A$vc8I" role="3uHU7w">
+              <node concept="2OqwBi" id="3vv33A$v2b4" role="2Oq$k0">
+                <node concept="2OqwBi" id="3vv33A$uV07" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3vv33A$uNff" role="2Oq$k0">
+                    <node concept="13iPFW" id="3vv33A$G2CP" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="3vv33A$uRgw" role="2OqNvi">
+                      <ref role="3Tt5mk" to="py52:3GRi4m$qYoV" resolve="text" />
+                    </node>
+                  </node>
+                  <node concept="3Tsc0h" id="3vv33A$uY3w" role="2OqNvi">
+                    <ref role="3TtcxE" to="87nw:2dWzqxEBBFI" resolve="words" />
+                  </node>
+                </node>
+                <node concept="1uHKPH" id="3vv33A$v81I" role="2OqNvi" />
+              </node>
+              <node concept="1mIQ4w" id="3vv33A$vfXe" role="2OqNvi">
+                <node concept="chp4Y" id="3vv33A$vjDs" role="cj9EA">
+                  <ref role="cht4Q" to="87nw:2dWzqxEBMSc" resolve="Word" />
+                </node>
+              </node>
+            </node>
+            <node concept="1Wc70l" id="3vv33A$u068" role="3uHU7B">
+              <node concept="3fqX7Q" id="3vv33A$nwxg" role="3uHU7B">
+                <node concept="2OqwBi" id="3vv33A$nwxi" role="3fr31v">
+                  <node concept="2OqwBi" id="3vv33A$nwxj" role="2Oq$k0">
+                    <node concept="13iPFW" id="3vv33A$G17v" role="2Oq$k0" />
+                    <node concept="3TrEf2" id="3vv33A$nwxl" role="2OqNvi">
+                      <ref role="3Tt5mk" to="py52:3GRi4m$qYoV" resolve="text" />
+                    </node>
+                  </node>
+                  <node concept="2qgKlT" id="3vv33A$nwxm" role="2OqNvi">
+                    <ref role="37wK5l" to="tbr6:2ZHlC004czC" resolve="isEmpty" />
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbC" id="3vv33A$u$YB" role="3uHU7w">
+                <node concept="2OqwBi" id="3vv33A$uqCX" role="3uHU7B">
+                  <node concept="2OqwBi" id="3vv33A$uhIV" role="2Oq$k0">
+                    <node concept="2OqwBi" id="3vv33A$u97H" role="2Oq$k0">
+                      <node concept="13iPFW" id="3vv33A$G2v_" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3vv33A$udZM" role="2OqNvi">
+                        <ref role="3Tt5mk" to="py52:3GRi4m$qYoV" resolve="text" />
+                      </node>
+                    </node>
+                    <node concept="3Tsc0h" id="3vv33A$ulDn" role="2OqNvi">
+                      <ref role="3TtcxE" to="87nw:2dWzqxEBBFI" resolve="words" />
+                    </node>
+                  </node>
+                  <node concept="34oBXx" id="3vv33A$uwfZ" role="2OqNvi" />
+                </node>
+                <node concept="3cmrfG" id="3vv33A$uDkq" role="3uHU7w">
+                  <property role="3cmrfH" value="1" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="13i0hz" id="3T9YlBtnHHf" role="13h7CS">
+      <property role="TrG5h" value="doFormatDescription" />
+      <node concept="3Tm1VV" id="3T9YlBtnHHg" role="1B3o_S" />
+      <node concept="2I9FWS" id="3T9YlBtnMgi" role="3clF45">
+        <ref role="2I9WkF" to="87nw:2dWzqxEBMSc" resolve="Word" />
+      </node>
+      <node concept="3clFbS" id="3T9YlBtnHEL" role="3clF47">
+        <node concept="3cpWs8" id="3T9YlBtnRcd" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtnRcg" role="3cpWs9">
+            <property role="TrG5h" value="res" />
+            <node concept="2I9FWS" id="3T9YlBtnRcb" role="1tU5fm">
+              <ref role="2I9WkF" to="87nw:2dWzqxEBMSc" resolve="Word" />
+            </node>
+            <node concept="2ShNRf" id="3T9YlBtnUwX" role="33vP2m">
+              <node concept="2T8Vx0" id="3T9YlBtnWl4" role="2ShVmc">
+                <node concept="2I9FWS" id="3T9YlBtnWl6" role="2T96Bj">
+                  <ref role="2I9WkF" to="87nw:2dWzqxEBMSc" resolve="Word" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="YXkTXVvMkg" role="3cqZAp" />
+        <node concept="3cpWs8" id="2xX7zRJRvex" role="3cqZAp">
+          <node concept="3cpWsn" id="2xX7zRJRvey" role="3cpWs9">
+            <property role="TrG5h" value="buffer" />
+            <node concept="3uibUv" id="2xX7zRJRvez" role="1tU5fm">
+              <ref role="3uigEE" to="wyt6:~StringBuffer" resolve="StringBuffer" />
+            </node>
+            <node concept="2ShNRf" id="2xX7zRJRvlZ" role="33vP2m">
+              <node concept="1pGfFk" id="2xX7zRJRvlY" role="2ShVmc">
+                <ref role="37wK5l" to="wyt6:~StringBuffer.&lt;init&gt;()" resolve="StringBuffer" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="2xX7zRJRvtx" role="3cqZAp">
+          <node concept="2GrKxI" id="2xX7zRJRvtz" role="2Gsz3X">
+            <property role="TrG5h" value="word" />
+          </node>
+          <node concept="3clFbS" id="2xX7zRJRvt_" role="2LFqv$">
+            <node concept="3clFbJ" id="2xX7zRJRxi5" role="3cqZAp">
+              <node concept="3clFbS" id="2xX7zRJRxi7" role="3clFbx">
+                <node concept="3clFbF" id="2xX7zRJRw5P" role="3cqZAp">
+                  <node concept="2OqwBi" id="2xX7zRJRwAq" role="3clFbG">
+                    <node concept="37vLTw" id="2xX7zRJRw5O" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2xX7zRJRvey" resolve="buffer" />
+                    </node>
+                    <node concept="liA8E" id="2xX7zRJRx4a" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~StringBuffer.append(java.lang.String)" resolve="append" />
+                      <node concept="2OqwBi" id="7diJr$RwFAA" role="37wK5m">
+                        <node concept="2GrUjf" id="2xX7zRJRx9u" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="2xX7zRJRvtz" resolve="word" />
+                        </node>
+                        <node concept="2qgKlT" id="7diJr$RwG7z" role="2OqNvi">
+                          <ref role="37wK5l" to="tbr6:3Q5enzfMT4t" resolve="toTextString" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3y3z36" id="2xX7zRJRxkY" role="3clFbw">
+                <node concept="10Nm6u" id="2xX7zRJRxmc" role="3uHU7w" />
+                <node concept="2GrUjf" id="2xX7zRJRxjA" role="3uHU7B">
+                  <ref role="2Gs0qQ" node="2xX7zRJRvtz" resolve="word" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="2xX7zRJRvXc" role="2GsD0m">
+            <node concept="2OqwBi" id="YXkTXVw0X2" role="2Oq$k0">
+              <node concept="13iPFW" id="2xX7zRJRv_r" role="2Oq$k0" />
+              <node concept="3TrEf2" id="YXkTXVw785" role="2OqNvi">
+                <ref role="3Tt5mk" to="py52:3GRi4m$qYoV" resolve="text" />
+              </node>
+            </node>
+            <node concept="3Tsc0h" id="2xX7zRJRw4L" role="2OqNvi">
+              <ref role="3TtcxE" to="87nw:2dWzqxEBBFI" resolve="words" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="YXkTXVwqKb" role="3cqZAp">
+          <node concept="3cpWsn" id="YXkTXVwqKe" role="3cpWs9">
+            <property role="TrG5h" value="textAsString" />
+            <node concept="17QB3L" id="YXkTXVwqK6" role="1tU5fm" />
+            <node concept="2OqwBi" id="2xX7zRJRy0R" role="33vP2m">
+              <node concept="37vLTw" id="2xX7zRJRxOe" role="2Oq$k0">
+                <ref role="3cqZAo" node="2xX7zRJRvey" resolve="buffer" />
+              </node>
+              <node concept="liA8E" id="2xX7zRJRyC1" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3T9YlBtnHEM" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtnHEN" role="3cpWs9">
+            <property role="TrG5h" value="numberOfLines" />
+            <node concept="10Oyi0" id="3T9YlBtnHEO" role="1tU5fm" />
+            <node concept="2OqwBi" id="YXkTXVxrGH" role="33vP2m">
+              <node concept="2OqwBi" id="YXkTXVwZRZ" role="2Oq$k0">
+                <node concept="37vLTw" id="YXkTXVwVKF" role="2Oq$k0">
+                  <ref role="3cqZAo" node="YXkTXVwqKe" resolve="textAsString" />
+                </node>
+                <node concept="liA8E" id="YXkTXVx647" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
+                  <node concept="Xl_RD" id="YXkTXVx8T1" role="37wK5m">
+                    <property role="Xl_RC" value="\n" />
+                  </node>
+                </node>
+              </node>
+              <node concept="1Rwk04" id="YXkTXVxwUt" role="2OqNvi" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="YXkTXVzaox" role="3cqZAp">
+          <node concept="3clFbS" id="YXkTXVzaoz" role="3clFbx">
+            <node concept="3clFbF" id="YXkTXVzymR" role="3cqZAp">
+              <node concept="3uNrnE" id="YXkTXVzBsH" role="3clFbG">
+                <node concept="37vLTw" id="YXkTXVzBsJ" role="2$L3a6">
+                  <ref role="3cqZAo" node="3T9YlBtnHEN" resolve="numberOfLines" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="YXkTXVzgKE" role="3clFbw">
+            <node concept="37vLTw" id="YXkTXVzdWO" role="2Oq$k0">
+              <ref role="3cqZAo" node="YXkTXVwqKe" resolve="textAsString" />
+            </node>
+            <node concept="liA8E" id="YXkTXVzlx5" role="2OqNvi">
+              <ref role="37wK5l" to="wyt6:~String.endsWith(java.lang.String)" resolve="endsWith" />
+              <node concept="Xl_RD" id="YXkTXVzp1i" role="37wK5m">
+                <property role="Xl_RC" value="\n" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3T9YlBtnHEW" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtnHEX" role="3cpWs9">
+            <property role="TrG5h" value="totalNumberOfCharacters" />
+            <node concept="10Oyi0" id="3T9YlBtnHEY" role="1tU5fm" />
+            <node concept="2OqwBi" id="3T9YlBtnHEZ" role="33vP2m">
+              <node concept="37vLTw" id="YXkTXVxDhy" role="2Oq$k0">
+                <ref role="3cqZAo" node="YXkTXVwqKe" resolve="textAsString" />
+              </node>
+              <node concept="liA8E" id="3T9YlBtnHF5" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3T9YlBtnHF6" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtnHF7" role="3cpWs9">
+            <property role="TrG5h" value="numberOfCharactersPerLine" />
+            <node concept="10Oyi0" id="3T9YlBtnHF8" role="1tU5fm" />
+            <node concept="3cpWs3" id="3T9YlBtnHF9" role="33vP2m">
+              <node concept="3cmrfG" id="3T9YlBtnHFa" role="3uHU7w">
+                <property role="3cmrfH" value="1" />
+              </node>
+              <node concept="1eOMI4" id="3T9YlBtnHFb" role="3uHU7B">
+                <node concept="FJ1c_" id="3T9YlBtnHFc" role="1eOMHV">
+                  <node concept="37vLTw" id="3T9YlBtnHFd" role="3uHU7w">
+                    <ref role="3cqZAo" node="3T9YlBtnHEN" resolve="numberOfLines" />
+                  </node>
+                  <node concept="37vLTw" id="3T9YlBtnHFe" role="3uHU7B">
+                    <ref role="3cqZAo" node="3T9YlBtnHEX" resolve="totalNumberOfCharacters" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3T9YlBtnHFf" role="3cqZAp" />
+        <node concept="3cpWs8" id="3T9YlBtnHFg" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtnHFh" role="3cpWs9">
+            <property role="TrG5h" value="textOnOneLine" />
+            <node concept="17QB3L" id="3T9YlBtnHFi" role="1tU5fm" />
+            <node concept="2OqwBi" id="YXkTXVscBi" role="33vP2m">
+              <node concept="2OqwBi" id="YXkTXVrSw8" role="2Oq$k0">
+                <node concept="2OqwBi" id="YXkTXVrwjk" role="2Oq$k0">
+                  <node concept="2OqwBi" id="3T9YlBtnHFk" role="2Oq$k0">
+                    <node concept="2OqwBi" id="3T9YlBtnHFl" role="2Oq$k0">
+                      <node concept="13iPFW" id="3T9YlBtnHFm" role="2Oq$k0" />
+                      <node concept="3TrEf2" id="3T9YlBtnHFn" role="2OqNvi">
+                        <ref role="3Tt5mk" to="py52:3GRi4m$qYoV" resolve="text" />
+                      </node>
+                    </node>
+                    <node concept="2qgKlT" id="3T9YlBtnHFo" role="2OqNvi">
+                      <ref role="37wK5l" to="tbr6:3Q5enzfMT4l" resolve="asTextString" />
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="YXkTXVr_$c" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
+                    <node concept="Xl_RD" id="YXkTXVrBUp" role="37wK5m">
+                      <property role="Xl_RC" value="\n" />
+                    </node>
+                    <node concept="Xl_RD" id="YXkTXVrLP4" role="37wK5m">
+                      <property role="Xl_RC" value=" " />
+                    </node>
+                  </node>
+                </node>
+                <node concept="liA8E" id="YXkTXVrXRQ" role="2OqNvi">
+                  <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
+                  <node concept="Xl_RD" id="YXkTXVs0bf" role="37wK5m">
+                    <property role="Xl_RC" value="\r" />
+                  </node>
+                  <node concept="Xl_RD" id="YXkTXVs6On" role="37wK5m">
+                    <property role="Xl_RC" value=" " />
+                  </node>
+                </node>
+              </node>
+              <node concept="liA8E" id="YXkTXVshOu" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
+                <node concept="Xl_RD" id="YXkTXVsl1v" role="37wK5m">
+                  <property role="Xl_RC" value="  " />
+                </node>
+                <node concept="Xl_RD" id="YXkTXVsvjq" role="37wK5m">
+                  <property role="Xl_RC" value=" " />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3T9YlBtnHFs" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtnHFt" role="3cpWs9">
+            <property role="TrG5h" value="tokens" />
+            <node concept="10Q1$e" id="3T9YlBtnHFu" role="1tU5fm">
+              <node concept="17QB3L" id="3T9YlBtnHFv" role="10Q1$1" />
+            </node>
+            <node concept="2OqwBi" id="3T9YlBtnHFw" role="33vP2m">
+              <node concept="37vLTw" id="3T9YlBtnHFx" role="2Oq$k0">
+                <ref role="3cqZAo" node="3T9YlBtnHFh" resolve="textOnOneLine" />
+              </node>
+              <node concept="liA8E" id="3T9YlBtnHFy" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
+                <node concept="Xl_RD" id="3T9YlBtnHFz" role="37wK5m">
+                  <property role="Xl_RC" value=" " />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3T9YlBtnHF$" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtnHF_" role="3cpWs9">
+            <property role="TrG5h" value="formattedString" />
+            <node concept="17QB3L" id="3T9YlBtnHFA" role="1tU5fm" />
+            <node concept="Xl_RD" id="3T9YlBtnHFB" role="33vP2m">
+              <property role="Xl_RC" value="" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3T9YlBtnHFC" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtnHFD" role="3cpWs9">
+            <property role="TrG5h" value="crtLine" />
+            <node concept="17QB3L" id="3T9YlBtnHFE" role="1tU5fm" />
+            <node concept="Xl_RD" id="3T9YlBtnHFF" role="33vP2m">
+              <property role="Xl_RC" value="" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3T9YlBtuRyw" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtuRyz" role="3cpWs9">
+            <property role="TrG5h" value="crtLineNumber" />
+            <node concept="10Oyi0" id="3T9YlBtuRyu" role="1tU5fm" />
+            <node concept="3cmrfG" id="3T9YlBtv3_t" role="33vP2m">
+              <property role="3cmrfH" value="1" />
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="3T9YlBtnHFG" role="3cqZAp">
+          <node concept="2GrKxI" id="3T9YlBtnHFH" role="2Gsz3X">
+            <property role="TrG5h" value="token" />
+          </node>
+          <node concept="37vLTw" id="3T9YlBtnHFI" role="2GsD0m">
+            <ref role="3cqZAo" node="3T9YlBtnHFt" resolve="tokens" />
+          </node>
+          <node concept="3clFbS" id="3T9YlBtnHFJ" role="2LFqv$">
+            <node concept="3clFbJ" id="3T9YlBtnHFK" role="3cqZAp">
+              <node concept="1Wc70l" id="3T9YlBtvnXb" role="3clFbw">
+                <node concept="3eOVzh" id="3T9YlBtvECv" role="3uHU7w">
+                  <node concept="37vLTw" id="3T9YlBtvssD" role="3uHU7B">
+                    <ref role="3cqZAo" node="3T9YlBtuRyz" resolve="crtLineNumber" />
+                  </node>
+                  <node concept="37vLTw" id="3T9YlBtvAem" role="3uHU7w">
+                    <ref role="3cqZAo" node="3T9YlBtnHEN" resolve="numberOfLines" />
+                  </node>
+                </node>
+                <node concept="3eOSWO" id="3T9YlBtnHFL" role="3uHU7B">
+                  <node concept="2OqwBi" id="3T9YlBtnHFU" role="3uHU7B">
+                    <node concept="1eOMI4" id="3T9YlBtnHFV" role="2Oq$k0">
+                      <node concept="3cpWs3" id="3T9YlBtnHFW" role="1eOMHV">
+                        <node concept="2GrUjf" id="3T9YlBtnHFX" role="3uHU7w">
+                          <ref role="2Gs0qQ" node="3T9YlBtnHFH" resolve="token" />
+                        </node>
+                        <node concept="3cpWs3" id="3T9YlBtnHFY" role="3uHU7B">
+                          <node concept="37vLTw" id="3T9YlBtnHFZ" role="3uHU7B">
+                            <ref role="3cqZAo" node="3T9YlBtnHFD" resolve="crtLine" />
+                          </node>
+                          <node concept="Xl_RD" id="3T9YlBtnHG0" role="3uHU7w">
+                            <property role="Xl_RC" value=" " />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="liA8E" id="3T9YlBtnHG1" role="2OqNvi">
+                      <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                    </node>
+                  </node>
+                  <node concept="1eOMI4" id="3T9YlBtnHFM" role="3uHU7w">
+                    <node concept="3cpWs3" id="3T9YlBtnHFN" role="1eOMHV">
+                      <node concept="FJ1c_" id="3T9YlBtnHFO" role="3uHU7w">
+                        <node concept="2OqwBi" id="3T9YlBtnHFP" role="3uHU7B">
+                          <node concept="2GrUjf" id="3T9YlBtnHFQ" role="2Oq$k0">
+                            <ref role="2Gs0qQ" node="3T9YlBtnHFH" resolve="token" />
+                          </node>
+                          <node concept="liA8E" id="3T9YlBtnHFR" role="2OqNvi">
+                            <ref role="37wK5l" to="wyt6:~String.length()" resolve="length" />
+                          </node>
+                        </node>
+                        <node concept="3cmrfG" id="3T9YlBtnHFS" role="3uHU7w">
+                          <property role="3cmrfH" value="2" />
+                        </node>
+                      </node>
+                      <node concept="37vLTw" id="3T9YlBtnHFT" role="3uHU7B">
+                        <ref role="3cqZAo" node="3T9YlBtnHF7" resolve="numberOfCharactersPerLine" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="3clFbS" id="3T9YlBtnHG2" role="3clFbx">
+                <node concept="3clFbJ" id="3T9YlBtnHG3" role="3cqZAp">
+                  <node concept="3clFbS" id="3T9YlBtnHG4" role="3clFbx">
+                    <node concept="3clFbF" id="3T9YlBtnHG5" role="3cqZAp">
+                      <node concept="37vLTI" id="3T9YlBtnHG6" role="3clFbG">
+                        <node concept="37vLTw" id="3T9YlBtnHG7" role="37vLTJ">
+                          <ref role="3cqZAo" node="3T9YlBtnHF_" resolve="formattedString" />
+                        </node>
+                        <node concept="37vLTw" id="3T9YlBtnHG8" role="37vLTx">
+                          <ref role="3cqZAo" node="3T9YlBtnHFD" resolve="crtLine" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="3T9YlBtnHG9" role="3clFbw">
+                    <node concept="37vLTw" id="3T9YlBtnHGa" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3T9YlBtnHF_" resolve="formattedString" />
+                    </node>
+                    <node concept="17RlXB" id="3T9YlBtnHGb" role="2OqNvi" />
+                  </node>
+                  <node concept="9aQIb" id="3T9YlBtnHGc" role="9aQIa">
+                    <node concept="3clFbS" id="3T9YlBtnHGd" role="9aQI4">
+                      <node concept="3clFbF" id="3T9YlBtnHGe" role="3cqZAp">
+                        <node concept="37vLTI" id="3T9YlBtnHGf" role="3clFbG">
+                          <node concept="37vLTw" id="3T9YlBtnHGg" role="37vLTJ">
+                            <ref role="3cqZAo" node="3T9YlBtnHF_" resolve="formattedString" />
+                          </node>
+                          <node concept="3cpWs3" id="3T9YlBtnHGh" role="37vLTx">
+                            <node concept="3cpWs3" id="3T9YlBtnHGi" role="3uHU7B">
+                              <node concept="Xl_RD" id="3T9YlBtnHGj" role="3uHU7w">
+                                <property role="Xl_RC" value="\n" />
+                              </node>
+                              <node concept="37vLTw" id="3T9YlBtnHGk" role="3uHU7B">
+                                <ref role="3cqZAo" node="3T9YlBtnHF_" resolve="formattedString" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="3T9YlBtnHGl" role="3uHU7w">
+                              <ref role="3cqZAo" node="3T9YlBtnHFD" resolve="crtLine" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3T9YlBtnHGs" role="3cqZAp">
+                  <node concept="37vLTI" id="3T9YlBtnHGt" role="3clFbG">
+                    <node concept="2GrUjf" id="3T9YlBtnHGu" role="37vLTx">
+                      <ref role="2Gs0qQ" node="3T9YlBtnHFH" resolve="token" />
+                    </node>
+                    <node concept="37vLTw" id="3T9YlBtnHGv" role="37vLTJ">
+                      <ref role="3cqZAo" node="3T9YlBtnHFD" resolve="crtLine" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="3T9YlBtveba" role="3cqZAp">
+                  <node concept="3uNrnE" id="3T9YlBtvjN_" role="3clFbG">
+                    <node concept="37vLTw" id="3T9YlBtvjNB" role="2$L3a6">
+                      <ref role="3cqZAo" node="3T9YlBtuRyz" resolve="crtLineNumber" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+              <node concept="9aQIb" id="3T9YlBtnHGw" role="9aQIa">
+                <node concept="3clFbS" id="3T9YlBtnHGx" role="9aQI4">
+                  <node concept="3clFbJ" id="3T9YlBtnHGy" role="3cqZAp">
+                    <node concept="3clFbS" id="3T9YlBtnHGz" role="3clFbx">
+                      <node concept="3clFbF" id="3T9YlBtnHG$" role="3cqZAp">
+                        <node concept="37vLTI" id="3T9YlBtnHG_" role="3clFbG">
+                          <node concept="2GrUjf" id="3T9YlBtnHGA" role="37vLTx">
+                            <ref role="2Gs0qQ" node="3T9YlBtnHFH" resolve="token" />
+                          </node>
+                          <node concept="37vLTw" id="3T9YlBtnHGB" role="37vLTJ">
+                            <ref role="3cqZAo" node="3T9YlBtnHFD" resolve="crtLine" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="3T9YlBtnHGC" role="3clFbw">
+                      <node concept="37vLTw" id="3T9YlBtnHGD" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3T9YlBtnHFD" resolve="crtLine" />
+                      </node>
+                      <node concept="17RlXB" id="3T9YlBtnHGE" role="2OqNvi" />
+                    </node>
+                    <node concept="9aQIb" id="3T9YlBtnHGF" role="9aQIa">
+                      <node concept="3clFbS" id="3T9YlBtnHGG" role="9aQI4">
+                        <node concept="3clFbF" id="3T9YlBtnHGH" role="3cqZAp">
+                          <node concept="d57v9" id="3T9YlBtnHGI" role="3clFbG">
+                            <node concept="3cpWs3" id="3T9YlBtnHGJ" role="37vLTx">
+                              <node concept="2GrUjf" id="3T9YlBtnHGK" role="3uHU7w">
+                                <ref role="2Gs0qQ" node="3T9YlBtnHFH" resolve="token" />
+                              </node>
+                              <node concept="Xl_RD" id="3T9YlBtnHGL" role="3uHU7B">
+                                <property role="Xl_RC" value=" " />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="3T9YlBtnHGM" role="37vLTJ">
+                              <ref role="3cqZAo" node="3T9YlBtnHFD" resolve="crtLine" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3T9YlBtnHGN" role="3cqZAp">
+          <node concept="37vLTI" id="3T9YlBtnHGO" role="3clFbG">
+            <node concept="37vLTw" id="3T9YlBtnHGP" role="37vLTJ">
+              <ref role="3cqZAo" node="3T9YlBtnHF_" resolve="formattedString" />
+            </node>
+            <node concept="3cpWs3" id="3T9YlBtnHGQ" role="37vLTx">
+              <node concept="3cpWs3" id="3T9YlBtnHGR" role="3uHU7B">
+                <node concept="Xl_RD" id="3T9YlBtnHGS" role="3uHU7w">
+                  <property role="Xl_RC" value="\n" />
+                </node>
+                <node concept="37vLTw" id="3T9YlBtnHGT" role="3uHU7B">
+                  <ref role="3cqZAo" node="3T9YlBtnHF_" resolve="formattedString" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="3T9YlBtnHGU" role="3uHU7w">
+                <ref role="3cqZAo" node="3T9YlBtnHFD" resolve="crtLine" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3T9YlBtnOKs" role="3cqZAp" />
+        <node concept="3clFbF" id="3T9YlBtnY5C" role="3cqZAp">
+          <node concept="2OqwBi" id="3T9YlBto0VE" role="3clFbG">
+            <node concept="37vLTw" id="3T9YlBtnY5A" role="2Oq$k0">
+              <ref role="3cqZAo" node="3T9YlBtnRcg" resolve="res" />
+            </node>
+            <node concept="TSZUe" id="3T9YlBto55c" role="2OqNvi">
+              <node concept="2pJPEk" id="3T9YlBto5Mh" role="25WWJ7">
+                <node concept="2pJPED" id="3T9YlBto5Mj" role="2pJPEn">
+                  <ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
+                  <node concept="2pJxcG" id="3T9YlBto8gD" role="2pJxcM">
+                    <ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
+                    <node concept="WxPPo" id="3T9YlBto9w9" role="28ntcv">
+                      <node concept="37vLTw" id="3T9YlBto9w7" role="WxPPp">
+                        <ref role="3cqZAo" node="3T9YlBtnHF_" resolve="formattedString" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3T9YlBtob4c" role="3cqZAp">
+          <node concept="37vLTw" id="3T9YlBtob4a" role="3clFbG">
+            <ref role="3cqZAo" node="3T9YlBtnRcg" resolve="res" />
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="13h7C7" id="79zp7ziemik">
     <property role="3GE5qa" value="base" />
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
index 119501434..5d6c15710 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
@@ -15,6 +15,7 @@
     <use id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions" version="4" />
     <use id="31c91def-a131-41a1-9018-102874f49a12" name="de.slisson.mps.editor.multiline" version="0" />
     <use id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc" version="2" />
+    <use id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -46,6 +47,7 @@
     <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
     <import index="suqv" ref="r:9a28b49a-e98c-4186-a7e1-7e782b3f4fc3(de.itemis.mps.editor.diagram.layout.structure)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
+    <import index="oqvi" ref="r:d4fc365d-2731-4abe-97d6-18ce4700d823(com.mpsbasics.editor.utils.buttons)" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
     <import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
@@ -474,6 +476,7 @@
         <child id="8974276187400348171" name="commandClosureLiteral" index="1QHqEI" />
       </concept>
       <concept id="8974276187400348181" name="jetbrains.mps.lang.access.structure.ExecuteLightweightCommandStatement" flags="nn" index="1QHqEK" />
+      <concept id="8974276187400348183" name="jetbrains.mps.lang.access.structure.ExecuteWriteActionStatement" flags="nn" index="1QHqEM" />
       <concept id="8974276187400348177" name="jetbrains.mps.lang.access.structure.ExecuteCommandStatement" flags="nn" index="1QHqEO" />
       <concept id="8974276187400348179" name="jetbrains.mps.lang.access.structure.ExecuteEDTCommandStatement" flags="nn" index="1QHqEQ" />
     </language>
@@ -515,6 +518,14 @@
         <child id="8182547171709752112" name="expression" index="36biLW" />
       </concept>
     </language>
+    <language id="1919c723-b60b-4592-9318-9ce96d91da44" name="de.itemis.mps.editor.celllayout">
+      <concept id="8304752469786031156" name="de.itemis.mps.editor.celllayout.structure.VerticalLineCell" flags="ng" index="2up9LE" />
+      <concept id="8304752469786524965" name="de.itemis.mps.editor.celllayout.structure.VerticalLineColorStyle" flags="lg" index="2ur1lV" />
+      <concept id="8304752469786516942" name="de.itemis.mps.editor.celllayout.structure.VerticalLineWidthStyle" flags="lg" index="2ur3mg" />
+      <concept id="2728748097294192922" name="de.itemis.mps.editor.celllayout.structure.IntegerStyle" flags="lg" index="3To2jP">
+        <property id="1221209241505" name="value" index="1lJzqY" />
+      </concept>
+    </language>
     <language id="fa13cc63-c476-4d46-9c96-d53670abe7bc" name="de.itemis.mps.editor.diagram">
       <concept id="8433227566816385664" name="de.itemis.mps.editor.diagram.structure.ILayoutAlgorithm" flags="ng" index="35SPa">
         <child id="2064429317493348220" name="config" index="3pGojU" />
@@ -6748,6 +6759,91 @@
         <node concept="3F1sOY" id="4q8AAJKOiis" role="3EZMnx">
           <ref role="1NtTu8" to="py52:3GRi4m$qYoV" resolve="text" />
         </node>
+        <node concept="3XFhqQ" id="YXkTXVBn9B" role="3EZMnx" />
+        <node concept="2up9LE" id="YXkTXVC_VV" role="3EZMnx">
+          <node concept="2ur1lV" id="YXkTXVCA0c" role="3F10Kt">
+            <property role="Vb096" value="g1_eI4o/darkBlue" />
+          </node>
+          <node concept="2ur3mg" id="YXkTXVCA0h" role="3F10Kt">
+            <property role="1lJzqY" value="5" />
+          </node>
+        </node>
+        <node concept="3XFhqQ" id="YXkTXVBn9C" role="3EZMnx" />
+        <node concept="3gTLQM" id="YXkTXVBn9D" role="3EZMnx">
+          <node concept="3Fmcul" id="YXkTXVBn9E" role="3FoqZy">
+            <node concept="3clFbS" id="YXkTXVBn9F" role="2VODD2">
+              <node concept="3clFbF" id="YXkTXVBn9G" role="3cqZAp">
+                <node concept="2YIFZM" id="YXkTXVBn9H" role="3clFbG">
+                  <ref role="37wK5l" to="oqvi:3vv33A$ikDL" resolve="createStyledButton" />
+                  <ref role="1Pybhc" to="oqvi:3vv33A$ikzI" resolve="JButtonUtils" />
+                  <node concept="Xl_RD" id="YXkTXVBn9I" role="37wK5m">
+                    <property role="Xl_RC" value="format\n description" />
+                  </node>
+                  <node concept="2ShNRf" id="YXkTXVBn9J" role="37wK5m">
+                    <node concept="YeOm9" id="YXkTXVBn9K" role="2ShVmc">
+                      <node concept="1Y3b0j" id="YXkTXVBn9L" role="YeSDq">
+                        <property role="2bfB8j" value="true" />
+                        <property role="373rjd" value="true" />
+                        <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                        <node concept="3Tm1VV" id="YXkTXVBn9M" role="1B3o_S" />
+                        <node concept="3clFb_" id="YXkTXVBn9N" role="jymVt">
+                          <property role="TrG5h" value="actionPerformed" />
+                          <node concept="3Tm1VV" id="YXkTXVBn9O" role="1B3o_S" />
+                          <node concept="3cqZAl" id="YXkTXVBn9P" role="3clF45" />
+                          <node concept="37vLTG" id="YXkTXVBn9Q" role="3clF46">
+                            <property role="TrG5h" value="p1" />
+                            <node concept="3uibUv" id="YXkTXVBn9R" role="1tU5fm">
+                              <ref role="3uigEE" to="hyam:~ActionEvent" resolve="ActionEvent" />
+                            </node>
+                          </node>
+                          <node concept="3clFbS" id="YXkTXVBn9S" role="3clF47">
+                            <node concept="1QHqEM" id="YXkTXVBn9T" role="3cqZAp">
+                              <node concept="1QHqEC" id="YXkTXVBn9U" role="1QHqEI">
+                                <node concept="3clFbS" id="YXkTXVBn9V" role="1bW5cS">
+                                  <node concept="3clFbF" id="YXkTXVBn9W" role="3cqZAp">
+                                    <node concept="2OqwBi" id="YXkTXVBn9X" role="3clFbG">
+                                      <node concept="pncrf" id="YXkTXVBn9Y" role="2Oq$k0" />
+                                      <node concept="2qgKlT" id="YXkTXVBn9Z" role="2OqNvi">
+                                        <ref role="37wK5l" to="89jy:3vv33A$FW_c" resolve="performDescriptionAlignment" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbF" id="YXkTXVGxre" role="3cqZAp">
+                                    <node concept="2OqwBi" id="YXkTXVGyJw" role="3clFbG">
+                                      <node concept="2OqwBi" id="YXkTXVGxQN" role="2Oq$k0">
+                                        <node concept="1Q80Hx" id="YXkTXVGxrd" role="2Oq$k0" />
+                                        <node concept="liA8E" id="YXkTXVGyAU" role="2OqNvi">
+                                          <ref role="37wK5l" to="cj4x:~EditorContext.getEditorComponent()" resolve="getEditorComponent" />
+                                        </node>
+                                      </node>
+                                      <node concept="liA8E" id="YXkTXVGyXh" role="2OqNvi">
+                                        <ref role="37wK5l" to="cj4x:~EditorComponent.rebuildEditorContent()" resolve="rebuildEditorContent" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="2OqwBi" id="YXkTXVBna0" role="ukAjM">
+                                <node concept="1Q80Hx" id="YXkTXVBna1" role="2Oq$k0" />
+                                <node concept="liA8E" id="YXkTXVBna2" role="2OqNvi">
+                                  <ref role="37wK5l" to="cj4x:~EditorContext.getRepository()" resolve="getRepository" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2AHcQZ" id="YXkTXVBna3" role="2AJF6D">
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
     </node>
   </node>
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 abc7133b3..bd97443f1 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
@@ -1970,6 +1970,16 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="YXkTXVNg_7" role="3bR37C">
+          <node concept="3bR9La" id="YXkTXVNg_8" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="YXkTXVNg_9" role="3bR37C">
+          <node concept="3bR9La" id="YXkTXVNg_a" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2u7UHDC1RNf" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -4612,6 +4622,11 @@
             <ref role="3bR37D" to="al5i:Vtr7jyAKU4" resolve="com.mbeddr.mpsutil.filepicker" />
           </node>
         </node>
+        <node concept="1SiIV0" id="YXkTXVNgI0" role="3bR37C">
+          <node concept="3bR9La" id="YXkTXVNgI1" role="1SiIV1">
+            <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="6hyv0iVPlGv" 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 a30ada248..b34bdd43d 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
@@ -2028,6 +2028,16 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="YXkTXVNhjn" role="3bR37C">
+          <node concept="3bR9La" id="YXkTXVNhjo" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="YXkTXVNhjp" role="3bR37C">
+          <node concept="3bR9La" id="YXkTXVNhjq" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1TaHNgiIbIZ" resolve="MPS.Editor" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="2u7UHDC1RNf" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -9436,6 +9446,11 @@
             <ref role="3bR37D" to="al5i:Vtr7jyAKU4" resolve="com.mbeddr.mpsutil.filepicker" />
           </node>
         </node>
+        <node concept="1SiIV0" id="YXkTXVNhC4" role="3bR37C">
+          <node concept="3bR9La" id="YXkTXVNhC5" role="1SiIV1">
+            <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="7he_lUurzLh" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -17296,6 +17311,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="63c49URuxt2" role="3bR31x">
+          <node concept="3LXTmp" id="63c49URuxt3" role="3rtmxm">
+            <node concept="3qWCbU" id="63c49URuxt4" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="63c49URuxt5" role="3LXTmr">
+              <ref role="398BVh" node="1FMyjUPkmcT" resolve="mbeddr.formal.safety.code" />
+              <node concept="2Ry0Ak" id="63c49URuxt6" role="iGT6I">
+                <property role="2Ry0Am" value="tests" />
+                <node concept="2Ry0Ak" id="63c49URuxt7" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.mbeddr.formal.safety.argument.modelquery" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4ziKDEngCOU" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps
new file mode 100644
index 000000000..7178da7ce
--- /dev/null
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:147b62bc-b8fc-4db5-821a-dec9bc382ff5(test.mbeddr.formal.gsn._000_gsn_generic_tests@tests)">
+  <persistence version="9" />
+  <languages>
+    <use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
+    <use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn" version="3" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+  </languages>
+  <imports>
+    <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
+    <import index="z1c3" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.project(MPS.Core/)" />
+    <import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" />
+    <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="s9pq" ref="r:8ef909e6-5cd8-45b2-9793-5a70f4829a0a(com.mbeddr.formal.safety.gsn.external_evidence.structure)" />
+    <import index="kq9k" ref="r:26cf53ce-de1d-47e1-8acc-79dd464f660a(com.mbeddr.formal.safety.gsn.external_evidence.util)" />
+    <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" implicit="true" />
+    <import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" implicit="true" />
+  </imports>
+  <registry>
+    <language id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test">
+      <concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
+        <property id="5097124989038916363" name="projectPath" index="2XOHcw" />
+      </concept>
+      <concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
+        <property id="2616911529524314943" name="accessMode" index="3DII0k" />
+        <child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
+        <child id="1217501895093" name="testMethods" index="1SL9yI" />
+      </concept>
+      <concept id="1216989428737" name="jetbrains.mps.lang.test.structure.TestNode" flags="ng" index="1qefOq">
+        <child id="1216989461394" name="nodeToCheck" index="1qenE9" />
+      </concept>
+      <concept id="1210673684636" name="jetbrains.mps.lang.test.structure.TestNodeAnnotation" flags="ng" index="3xLA65" />
+      <concept id="1210674524691" name="jetbrains.mps.lang.test.structure.TestNodeReference" flags="nn" index="3xONca">
+        <reference id="1210674534086" name="declaration" index="3xOPvv" />
+      </concept>
+      <concept id="1225978065297" name="jetbrains.mps.lang.test.structure.SimpleNodeTest" flags="ng" index="1LZb2c" />
+    </language>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1068581517677" name="jetbrains.mps.baseLanguage.structure.VoidType" flags="in" index="3cqZAl" />
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+    </language>
+    <language id="92d2ea16-5a42-4fdf-a676-c7604efe3504" name="de.slisson.mps.richtext">
+      <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
+        <child id="2557074442922392302" name="words" index="19SJt6" />
+      </concept>
+      <concept id="2557074442922438156" name="de.slisson.mps.richtext.structure.Word" flags="ng" index="19SUe$">
+        <property id="2557074442922438158" name="escapedValue" index="19SUeA" />
+      </concept>
+    </language>
+    <language id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest">
+      <concept id="8427750732757990717" name="jetbrains.mps.baseLanguage.unitTest.structure.BinaryAssert" flags="nn" index="3tpDYu">
+        <child id="8427750732757990725" name="actual" index="3tpDZA" />
+        <child id="8427750732757990724" name="expected" index="3tpDZB" />
+      </concept>
+      <concept id="1171978097730" name="jetbrains.mps.baseLanguage.unitTest.structure.AssertEquals" flags="nn" index="3vlDli" />
+    </language>
+    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
+      <concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
+      <concept id="1145383075378" name="jetbrains.mps.lang.smodel.structure.SNodeListType" flags="in" index="2I9FWS">
+        <reference id="1145383142433" name="elementConcept" index="2I9WkF" />
+      </concept>
+      <concept id="1138056022639" name="jetbrains.mps.lang.smodel.structure.SPropertyAccess" flags="nn" index="3TrcHB">
+        <reference id="1138056395725" name="property" index="3TsBF5" />
+      </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
+        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+      </concept>
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+    <language id="8ca79d43-eb45-4791-bdd4-0d6130ff895b" name="de.itemis.mps.editor.diagram.layout">
+      <concept id="6720495385597071406" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Box" flags="ng" index="gqqVs">
+        <property id="6720495385597071504" name="bounds_height" index="gqqTy" />
+        <property id="6720495385597071502" name="bounds_y" index="gqqTW" />
+        <property id="6720495385597071503" name="bounds_width" index="gqqTX" />
+        <property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
+        <property id="4583510071007917016" name="portTransform" index="TgtnS" />
+      </concept>
+      <concept id="8963411245960991886" name="de.itemis.mps.editor.diagram.layout.structure.LayoutMap" flags="ng" index="37mRI7">
+        <child id="8963411245960991904" name="entries" index="37mRID" />
+      </concept>
+      <concept id="8963411245960991903" name="de.itemis.mps.editor.diagram.layout.structure.LayoutMapEntry" flags="ng" index="37mRIm">
+        <property id="8963411245960998400" name="key" index="37mO49" />
+        <child id="8963411245960998404" name="value" index="37mO4d" />
+      </concept>
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
+      <concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
+    </language>
+    <language id="e8a04d94-4307-4f88-95a2-25f7c4f39437" name="com.mbeddr.formal.safety.gsn">
+      <concept id="4266958635905267565" name="com.mbeddr.formal.safety.gsn.structure.Goal" flags="ng" index="2vn7WC" />
+      <concept id="4266958635905267510" name="com.mbeddr.formal.safety.gsn.structure.GoalStructure" flags="ng" index="2vn7XN">
+        <child id="4266958635905277632" name="content" index="2vn1q5" />
+      </concept>
+      <concept id="4266958635905286484" name="com.mbeddr.formal.safety.gsn.structure.GoalStructureElementBase" flags="ng" index="2vnc$h">
+        <child id="4266958635905312315" name="text" index="2vnaTY" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="2XOHcx" id="3vv33A$G6$6">
+    <property role="2XOHcw" value="${mbeddr.formal.home}/code/languages/com.mbeddr.formal.safety/" />
+  </node>
+  <node concept="1lH9Xt" id="3vv33A$G6$7">
+    <property role="TrG5h" value="_010_GSEB_align_text_tests" />
+    <property role="3DII0k" value="2hh8MJdVwqX/command" />
+    <node concept="1LZb2c" id="3vv33A$G6$8" role="1SL9yI">
+      <property role="TrG5h" value="_010_align_text" />
+      <node concept="3cqZAl" id="3vv33A$G6$b" role="3clF45" />
+      <node concept="3clFbS" id="3vv33A$G6$c" role="3clF47">
+        <node concept="3cpWs8" id="3T9YlBtr2ak" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtr2al" role="3cpWs9">
+            <property role="TrG5h" value="two_lines_1_formatted_description" />
+            <node concept="2I9FWS" id="3T9YlBtr20M" role="1tU5fm">
+              <ref role="2I9WkF" to="87nw:2dWzqxEBMSc" resolve="Word" />
+            </node>
+            <node concept="2OqwBi" id="3T9YlBtr2am" role="33vP2m">
+              <node concept="3xONca" id="3T9YlBtr2an" role="2Oq$k0">
+                <ref role="3xOPvv" node="3vv33A$G6VH" resolve="two_lines_1" />
+              </node>
+              <node concept="2qgKlT" id="3T9YlBtr2ao" role="2OqNvi">
+                <ref role="37wK5l" to="89jy:3T9YlBtnHHf" resolve="doFormatDescription" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="3T9YlBtr2dF" role="3cqZAp">
+          <node concept="3cmrfG" id="3T9YlBtr2ez" role="3tpDZB">
+            <property role="3cmrfH" value="1" />
+          </node>
+          <node concept="2OqwBi" id="3T9YlBtr3xJ" role="3tpDZA">
+            <node concept="37vLTw" id="3T9YlBtr2fa" role="2Oq$k0">
+              <ref role="3cqZAo" node="3T9YlBtr2al" resolve="two_lines_1_formatted_description" />
+            </node>
+            <node concept="34oBXx" id="3T9YlBtr6zI" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3vlDli" id="3vv33A$G7MZ" role="3cqZAp">
+          <node concept="Xl_RD" id="3vv33A$G7Nn" role="3tpDZB">
+            <property role="Xl_RC" value="22 333\n4444 m" />
+          </node>
+          <node concept="2OqwBi" id="3T9YlBtre2h" role="3tpDZA">
+            <node concept="2OqwBi" id="3T9YlBtr6D3" role="2Oq$k0">
+              <node concept="37vLTw" id="3T9YlBtr6Aw" role="2Oq$k0">
+                <ref role="3cqZAo" node="3T9YlBtr2al" resolve="two_lines_1_formatted_description" />
+              </node>
+              <node concept="1uHKPH" id="3T9YlBtrdmP" role="2OqNvi" />
+            </node>
+            <node concept="3TrcHB" id="3T9YlBtreC7" role="2OqNvi">
+              <ref role="3TsBF5" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3T9YlBtsKDT" role="3cqZAp" />
+        <node concept="3cpWs8" id="3T9YlBtsKJ0" role="3cqZAp">
+          <node concept="3cpWsn" id="3T9YlBtsKJ1" role="3cpWs9">
+            <property role="TrG5h" value="two_lines_2_formatted_description" />
+            <node concept="2I9FWS" id="3T9YlBtsKJ2" role="1tU5fm">
+              <ref role="2I9WkF" to="87nw:2dWzqxEBMSc" resolve="Word" />
+            </node>
+            <node concept="2OqwBi" id="3T9YlBtsKJ3" role="33vP2m">
+              <node concept="3xONca" id="3T9YlBtsKJ4" role="2Oq$k0">
+                <ref role="3xOPvv" node="3T9YlBtsKB6" resolve="two_lines_2" />
+              </node>
+              <node concept="2qgKlT" id="3T9YlBtsKJ5" role="2OqNvi">
+                <ref role="37wK5l" to="89jy:3T9YlBtnHHf" resolve="doFormatDescription" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="3T9YlBtsKJ6" role="3cqZAp">
+          <node concept="3cmrfG" id="3T9YlBtsKJ7" role="3tpDZB">
+            <property role="3cmrfH" value="1" />
+          </node>
+          <node concept="2OqwBi" id="3T9YlBtsKJ8" role="3tpDZA">
+            <node concept="37vLTw" id="3T9YlBtsKJ9" role="2Oq$k0">
+              <ref role="3cqZAo" node="3T9YlBtsKJ1" resolve="two_lines_2_formatted_description" />
+            </node>
+            <node concept="34oBXx" id="3T9YlBtsKJa" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3vlDli" id="3T9YlBtsKJb" role="3cqZAp">
+          <node concept="Xl_RD" id="3T9YlBtsKJc" role="3tpDZB">
+            <property role="Xl_RC" value="Function {X} is\ncorrectly implemented." />
+          </node>
+          <node concept="2OqwBi" id="3T9YlBtsKJd" role="3tpDZA">
+            <node concept="2OqwBi" id="3T9YlBtsKJe" role="2Oq$k0">
+              <node concept="37vLTw" id="3T9YlBtsKJf" role="2Oq$k0">
+                <ref role="3cqZAo" node="3T9YlBtsKJ1" resolve="two_lines_2_formatted_description" />
+              </node>
+              <node concept="1uHKPH" id="3T9YlBtsKJg" role="2OqNvi" />
+            </node>
+            <node concept="3TrcHB" id="3T9YlBtsKJh" role="2OqNvi">
+              <ref role="3TsBF5" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="YXkTXVy20a" role="3cqZAp" />
+      </node>
+    </node>
+    <node concept="1LZb2c" id="YXkTXVy44i" role="1SL9yI">
+      <property role="TrG5h" value="_020_last_line_empty" />
+      <node concept="3cqZAl" id="YXkTXVy44j" role="3clF45" />
+      <node concept="3clFbS" id="YXkTXVy44n" role="3clF47">
+        <node concept="3cpWs8" id="YXkTXVy1Ko" role="3cqZAp">
+          <node concept="3cpWsn" id="YXkTXVy1Kp" role="3cpWs9">
+            <property role="TrG5h" value="four_lines_last_line_empty" />
+            <node concept="2I9FWS" id="YXkTXVy1Kq" role="1tU5fm">
+              <ref role="2I9WkF" to="87nw:2dWzqxEBMSc" resolve="Word" />
+            </node>
+            <node concept="2OqwBi" id="YXkTXVy1Kr" role="33vP2m">
+              <node concept="3xONca" id="YXkTXVy3PE" role="2Oq$k0">
+                <ref role="3xOPvv" node="YXkTXVy1JA" resolve="four_lines_last_line_empty" />
+              </node>
+              <node concept="2qgKlT" id="YXkTXVy1Kt" role="2OqNvi">
+                <ref role="37wK5l" to="89jy:3T9YlBtnHHf" resolve="doFormatDescription" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="YXkTXVy1Kj" role="3cqZAp">
+          <node concept="3cmrfG" id="YXkTXVy1Kk" role="3tpDZB">
+            <property role="3cmrfH" value="1" />
+          </node>
+          <node concept="2OqwBi" id="YXkTXVy1Kl" role="3tpDZA">
+            <node concept="37vLTw" id="YXkTXVy1Km" role="2Oq$k0">
+              <ref role="3cqZAo" node="YXkTXVy1Kp" resolve="four_lines_last_line_empty" />
+            </node>
+            <node concept="34oBXx" id="YXkTXVy1Kn" role="2OqNvi" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="YXkTXV$t0I" role="3cqZAp">
+          <node concept="3cpWsn" id="YXkTXV$t0J" role="3cpWs9">
+            <property role="TrG5h" value="escapedValue" />
+            <node concept="17QB3L" id="YXkTXV$tOx" role="1tU5fm" />
+            <node concept="2OqwBi" id="YXkTXV$t0K" role="33vP2m">
+              <node concept="2OqwBi" id="YXkTXV$t0L" role="2Oq$k0">
+                <node concept="2OqwBi" id="YXkTXV$t0M" role="2Oq$k0">
+                  <node concept="37vLTw" id="YXkTXV$t0N" role="2Oq$k0">
+                    <ref role="3cqZAo" node="YXkTXVy1Kp" resolve="four_lines_last_line_empty" />
+                  </node>
+                  <node concept="1uHKPH" id="YXkTXV$t0O" role="2OqNvi" />
+                </node>
+                <node concept="3TrcHB" id="YXkTXV$t0P" role="2OqNvi">
+                  <ref role="3TsBF5" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
+                </node>
+              </node>
+              <node concept="liA8E" id="YXkTXV$t0Q" role="2OqNvi">
+                <ref role="37wK5l" to="wyt6:~String.replaceAll(java.lang.String,java.lang.String)" resolve="replaceAll" />
+                <node concept="Xl_RD" id="YXkTXV$t0R" role="37wK5m">
+                  <property role="Xl_RC" value="\n" />
+                </node>
+                <node concept="Xl_RD" id="YXkTXV$t0S" role="37wK5m">
+                  <property role="Xl_RC" value="\\\\n" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3vlDli" id="YXkTXVy1Kc" role="3cqZAp">
+          <node concept="Xl_RD" id="YXkTXVy1Kd" role="3tpDZB">
+            <property role="Xl_RC" value="Testing results\\nshow the correct\\nimplementation of\\nrequirements." />
+          </node>
+          <node concept="37vLTw" id="YXkTXV$ueD" role="3tpDZA">
+            <ref role="3cqZAo" node="YXkTXV$t0J" resolve="escapedValue" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="1qefOq" id="3vv33A$G6T6" role="1SKRRt">
+      <node concept="2vn7XN" id="3vv33A$G6T5" role="1qenE9">
+        <node concept="2vn7WC" id="3vv33A$G6Ue" role="2vn1q5">
+          <property role="TrG5h" value="G_two_lines_1" />
+          <node concept="19SGf9" id="3vv33A$G6Uf" role="2vnaTY">
+            <node concept="19SUe$" id="3vv33A$G6Ug" role="19SJt6">
+              <property role="19SUeA" value="22 333 4444&#10;m" />
+            </node>
+          </node>
+          <node concept="3xLA65" id="3vv33A$G6VH" role="lGtFl">
+            <property role="TrG5h" value="two_lines_1" />
+          </node>
+        </node>
+        <node concept="37mRI7" id="3vv33A$G6Ur" role="lGtFl">
+          <node concept="37mRIm" id="3vv33A$G6Us" role="37mRID">
+            <property role="37mO49" value="4025950033608208014" />
+            <node concept="gqqVs" id="3vv33A$G6Uq" role="37mO4d">
+              <property role="gqqTZ" value="38.0" />
+              <property role="gqqTW" value="28.0" />
+              <property role="gqqTX" value="216.0" />
+              <property role="gqqTy" value="60.0" />
+              <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
+            </node>
+          </node>
+          <node concept="37mRIm" id="3T9YlBtsKB7" role="37mRID">
+            <property role="37mO49" value="4488392668014119363" />
+            <node concept="gqqVs" id="3T9YlBtsKB8" role="37mO4d">
+              <property role="gqqTX" value="330.0" />
+              <property role="gqqTy" value="60.0" />
+              <property role="gqqTZ" value="38.0" />
+              <property role="gqqTW" value="119.0" />
+              <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
+            </node>
+          </node>
+          <node concept="37mRIm" id="YXkTXVy1Jl" role="37mRID">
+            <property role="37mO49" value="1134154625604656064" />
+            <node concept="gqqVs" id="YXkTXVy1Jk" role="37mO4d">
+              <property role="gqqTZ" value="31.0" />
+              <property role="gqqTW" value="214.0" />
+              <property role="gqqTX" value="378.0" />
+              <property role="gqqTy" value="92.0" />
+              <property role="TgtnS" value="1.0;0.0;0.0;1.0;0.0;0.0" />
+            </node>
+          </node>
+        </node>
+        <node concept="2vn7WC" id="3T9YlBtsKB3" role="2vn1q5">
+          <property role="TrG5h" value="G_two_lines_2" />
+          <node concept="19SGf9" id="3T9YlBtsKB4" role="2vnaTY">
+            <node concept="19SUe$" id="YXkTXVpEGb" role="19SJt6">
+              <property role="19SUeA" value="Function {X} is correctly&#10;implemented." />
+            </node>
+          </node>
+          <node concept="3xLA65" id="3T9YlBtsKB6" role="lGtFl">
+            <property role="TrG5h" value="two_lines_2" />
+          </node>
+        </node>
+        <node concept="2vn7WC" id="YXkTXVy1J0" role="2vn1q5">
+          <property role="TrG5h" value="G_4_lines_last_line_empty" />
+          <node concept="19SGf9" id="YXkTXVy1J1" role="2vnaTY">
+            <node concept="19SUe$" id="YXkTXVy1J2" role="19SJt6">
+              <property role="19SUeA" value="Testing results show&#13;&#10;the correct implementation&#10;of requirements.&#10;" />
+            </node>
+          </node>
+          <node concept="3xLA65" id="YXkTXVy1JA" role="lGtFl">
+            <property role="TrG5h" value="four_lines_last_line_empty" />
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+</model>
+
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd
index 55fb424f5..f5287f0f7 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/com.mpsbasics.editor.utils.msd
@@ -16,17 +16,22 @@
     <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
     <dependency reexport="false">5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)</dependency>
     <dependency reexport="false">1f4710e9-f074-4732-a0bd-6fa896d282b7(com.mpsbasics.project.utils)</dependency>
+    <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
+    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="14" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
+    <language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="9" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.buttons.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.buttons.mps
new file mode 100644
index 000000000..3abdca7e8
--- /dev/null
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.editor.utils/models/com.mpsbasics.editor.utils.buttons.mps
@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<model ref="r:d4fc365d-2731-4abe-97d6-18ce4700d823(com.mpsbasics.editor.utils.buttons)">
+  <persistence version="9" />
+  <languages>
+    <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
+    <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
+    <use id="63650c59-16c8-498a-99c8-005c7ee9515d" name="jetbrains.mps.lang.access" version="0" />
+  </languages>
+  <imports>
+    <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
+    <import index="cj4x" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor(MPS.Editor/)" />
+    <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
+    <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
+    <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
+    <import index="ewej" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.font(JDK/)" />
+  </imports>
+  <registry>
+    <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
+      <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
+        <child id="1197027771414" name="operand" index="2Oq$k0" />
+        <child id="1197027833540" name="operation" index="2OqNvi" />
+      </concept>
+      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
+        <child id="1145553007750" name="creator" index="2ShVmc" />
+      </concept>
+      <concept id="1070462154015" name="jetbrains.mps.baseLanguage.structure.StaticFieldDeclaration" flags="ig" index="Wx3nA" />
+      <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
+        <property id="1070475926801" name="value" index="Xl_RC" />
+      </concept>
+      <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
+      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
+        <reference id="1144433057691" name="classifier" index="1PxDUh" />
+      </concept>
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
+        <child id="1070534934091" name="type" index="10QFUM" />
+        <child id="1070534934092" name="expression" index="10QFUP" />
+      </concept>
+      <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
+      <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
+        <child id="1068431790190" name="initializer" index="33vP2m" />
+      </concept>
+      <concept id="1068498886296" name="jetbrains.mps.baseLanguage.structure.VariableReference" flags="nn" index="37vLTw">
+        <reference id="1068581517664" name="variableDeclaration" index="3cqZAo" />
+      </concept>
+      <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
+      <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
+        <child id="5680397130376446158" name="type" index="1tU5fm" />
+      </concept>
+      <concept id="1068580123132" name="jetbrains.mps.baseLanguage.structure.BaseMethodDeclaration" flags="ng" index="3clF44">
+        <child id="1068580123133" name="returnType" index="3clF45" />
+        <child id="1068580123134" name="parameter" index="3clF46" />
+        <child id="1068580123135" name="body" index="3clF47" />
+      </concept>
+      <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
+        <child id="1068580123156" name="expression" index="3clFbG" />
+      </concept>
+      <concept id="1068580123157" name="jetbrains.mps.baseLanguage.structure.Statement" flags="nn" index="3clFbH" />
+      <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
+        <child id="1068581517665" name="statement" index="3cqZAp" />
+      </concept>
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
+      <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
+      <concept id="1068581242864" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclarationStatement" flags="nn" index="3cpWs8">
+        <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
+      </concept>
+      <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
+      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
+        <child id="1079359253376" name="expression" index="1eOMHV" />
+      </concept>
+      <concept id="1204053956946" name="jetbrains.mps.baseLanguage.structure.IMethodCall" flags="ng" index="1ndlxa">
+        <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
+        <child id="1068499141038" name="actualArgument" index="37wK5m" />
+      </concept>
+      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
+      <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
+        <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
+      </concept>
+      <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
+        <reference id="1107535924139" name="classifier" index="3uigEE" />
+      </concept>
+      <concept id="1081773326031" name="jetbrains.mps.baseLanguage.structure.BinaryOperation" flags="nn" index="3uHJSO">
+        <child id="1081773367579" name="rightExpression" index="3uHU7w" />
+        <child id="1081773367580" name="leftExpression" index="3uHU7B" />
+      </concept>
+      <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
+        <child id="1178549979242" name="visibility" index="1B3o_S" />
+      </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
+      <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
+      <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
+        <property id="1169194664001" name="name" index="TrG5h" />
+      </concept>
+    </language>
+  </registry>
+  <node concept="312cEu" id="3vv33A$ikzI">
+    <property role="TrG5h" value="JButtonUtils" />
+    <node concept="2tJIrI" id="3vv33A$ixPr" role="jymVt" />
+    <node concept="Wx3nA" id="3vv33A$ixdk" role="jymVt">
+      <property role="TrG5h" value="HORIZONTAL_PADDING" />
+      <node concept="10Oyi0" id="3vv33A$ivuj" role="1tU5fm" />
+      <node concept="3Tm6S6" id="3vv33A$iw$Z" role="1B3o_S" />
+      <node concept="3cmrfG" id="3vv33A$iweX" role="33vP2m">
+        <property role="3cmrfH" value="16" />
+      </node>
+    </node>
+    <node concept="Wx3nA" id="3vv33A$iy7C" role="jymVt">
+      <property role="TrG5h" value="VERTICAL_PADDING" />
+      <node concept="10Oyi0" id="3vv33A$iy7D" role="1tU5fm" />
+      <node concept="3Tm6S6" id="3vv33A$iy7E" role="1B3o_S" />
+      <node concept="3cmrfG" id="3vv33A$iy7F" role="33vP2m">
+        <property role="3cmrfH" value="10" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3vv33A$ik_l" role="jymVt" />
+    <node concept="2YIFZL" id="3vv33A$ikDL" role="jymVt">
+      <property role="TrG5h" value="createStyledButton" />
+      <node concept="3clFbS" id="3vv33A$ikDO" role="3clF47">
+        <node concept="3cpWs8" id="4MlXWpxb3fR" role="3cqZAp">
+          <node concept="3cpWsn" id="4MlXWpxb3fS" role="3cpWs9">
+            <property role="TrG5h" value="button" />
+            <node concept="3uibUv" id="4MlXWpxb3fT" role="1tU5fm">
+              <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
+            </node>
+            <node concept="2ShNRf" id="4MlXWpxb3fU" role="33vP2m">
+              <node concept="1pGfFk" id="4MlXWpxb3fV" role="2ShVmc">
+                <ref role="37wK5l" to="dxuu:~JButton.&lt;init&gt;(java.lang.String)" resolve="JButton" />
+                <node concept="37vLTw" id="3vv33A$inrr" role="37wK5m">
+                  <ref role="3cqZAo" node="3vv33A$ikLw" resolve="label" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4MlXWpxb3fX" role="3cqZAp">
+          <node concept="2OqwBi" id="4MlXWpxb3fY" role="3clFbG">
+            <node concept="37vLTw" id="4MlXWpxb3fZ" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MlXWpxb3fS" resolve="button" />
+            </node>
+            <node concept="liA8E" id="4MlXWpxb3g0" role="2OqNvi">
+              <ref role="37wK5l" to="dxuu:~AbstractButton.addActionListener(java.awt.event.ActionListener)" resolve="addActionListener" />
+              <node concept="37vLTw" id="3vv33A$io8P" role="37wK5m">
+                <ref role="3cqZAo" node="3vv33A$ikNd" resolve="actionListener" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3vv33A$iC6s" role="3cqZAp" />
+        <node concept="3cpWs8" id="3vv33A$iofM" role="3cqZAp">
+          <node concept="3cpWsn" id="3vv33A$iofN" role="3cpWs9">
+            <property role="TrG5h" value="font" />
+            <node concept="3uibUv" id="3vv33A$iob8" role="1tU5fm">
+              <ref role="3uigEE" to="z60i:~Font" resolve="Font" />
+            </node>
+            <node concept="2ShNRf" id="3vv33A$iofO" role="33vP2m">
+              <node concept="1pGfFk" id="3vv33A$iofP" role="2ShVmc">
+                <ref role="37wK5l" to="z60i:~Font.&lt;init&gt;(java.lang.String,int,int)" resolve="Font" />
+                <node concept="Xl_RD" id="3vv33A$iofQ" role="37wK5m">
+                  <property role="Xl_RC" value="Arial" />
+                </node>
+                <node concept="10M0yZ" id="3vv33A$iofR" role="37wK5m">
+                  <ref role="3cqZAo" to="z60i:~Font.BOLD" resolve="BOLD" />
+                  <ref role="1PxDUh" to="z60i:~Font" resolve="Font" />
+                </node>
+                <node concept="3cmrfG" id="3vv33A$iofS" role="37wK5m">
+                  <property role="3cmrfH" value="9" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4MlXWpxb3go" role="3cqZAp">
+          <node concept="2OqwBi" id="4MlXWpxb3gp" role="3clFbG">
+            <node concept="37vLTw" id="4MlXWpxb3gq" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MlXWpxb3fS" resolve="button" />
+            </node>
+            <node concept="liA8E" id="4MlXWpxb3gr" role="2OqNvi">
+              <ref role="37wK5l" to="dxuu:~JComponent.setFont(java.awt.Font)" resolve="setFont" />
+              <node concept="37vLTw" id="3vv33A$iofT" role="37wK5m">
+                <ref role="3cqZAo" node="3vv33A$iofN" resolve="font" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3vv33A$ipSc" role="3cqZAp">
+          <node concept="3cpWsn" id="3vv33A$ipSb" role="3cpWs9">
+            <property role="TrG5h" value="affinetransform" />
+            <node concept="3uibUv" id="3vv33A$ipSd" role="1tU5fm">
+              <ref role="3uigEE" to="fbzs:~AffineTransform" resolve="AffineTransform" />
+            </node>
+            <node concept="2ShNRf" id="3vv33A$iqOq" role="33vP2m">
+              <node concept="1pGfFk" id="3vv33A$iqOt" role="2ShVmc">
+                <ref role="37wK5l" to="fbzs:~AffineTransform.&lt;init&gt;()" resolve="AffineTransform" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3vv33A$ipSg" role="3cqZAp">
+          <node concept="3cpWsn" id="3vv33A$ipSf" role="3cpWs9">
+            <property role="TrG5h" value="frc" />
+            <node concept="3uibUv" id="3vv33A$ipSh" role="1tU5fm">
+              <ref role="3uigEE" to="ewej:~FontRenderContext" resolve="FontRenderContext" />
+            </node>
+            <node concept="2ShNRf" id="3vv33A$ir_P" role="33vP2m">
+              <node concept="1pGfFk" id="3vv33A$irAb" role="2ShVmc">
+                <ref role="37wK5l" to="ewej:~FontRenderContext.&lt;init&gt;(java.awt.geom.AffineTransform,boolean,boolean)" resolve="FontRenderContext" />
+                <node concept="37vLTw" id="3vv33A$irAc" role="37wK5m">
+                  <ref role="3cqZAo" node="3vv33A$ipSb" resolve="affinetransform" />
+                </node>
+                <node concept="3clFbT" id="3vv33A$irAd" role="37wK5m">
+                  <property role="3clFbU" value="true" />
+                </node>
+                <node concept="3clFbT" id="3vv33A$irAe" role="37wK5m">
+                  <property role="3clFbU" value="true" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3vv33A$ipSu" role="3cqZAp">
+          <node concept="3cpWsn" id="3vv33A$ipSt" role="3cpWs9">
+            <property role="TrG5h" value="textwidth" />
+            <node concept="10Oyi0" id="3vv33A$ipSv" role="1tU5fm" />
+            <node concept="10QFUN" id="3vv33A$ipSw" role="33vP2m">
+              <node concept="1eOMI4" id="3vv33A$ipS_" role="10QFUP">
+                <node concept="2OqwBi" id="3vv33A$isY1" role="1eOMHV">
+                  <node concept="2OqwBi" id="3vv33A$isqx" role="2Oq$k0">
+                    <node concept="37vLTw" id="3vv33A$iqby" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3vv33A$iofN" resolve="font" />
+                    </node>
+                    <node concept="liA8E" id="3vv33A$isqy" role="2OqNvi">
+                      <ref role="37wK5l" to="z60i:~Font.getStringBounds(java.lang.String,java.awt.font.FontRenderContext)" resolve="getStringBounds" />
+                      <node concept="37vLTw" id="3vv33A$isqz" role="37wK5m">
+                        <ref role="3cqZAo" node="3vv33A$ikLw" resolve="label" />
+                      </node>
+                      <node concept="37vLTw" id="3vv33A$isq$" role="37wK5m">
+                        <ref role="3cqZAo" node="3vv33A$ipSf" resolve="frc" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3vv33A$isY2" role="2OqNvi">
+                    <ref role="37wK5l" to="fbzs:~RectangularShape.getWidth()" resolve="getWidth" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10Oyi0" id="3vv33A$ipSA" role="10QFUM" />
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="3vv33A$ipSC" role="3cqZAp">
+          <node concept="3cpWsn" id="3vv33A$ipSB" role="3cpWs9">
+            <property role="TrG5h" value="textheight" />
+            <node concept="10Oyi0" id="3vv33A$ipSD" role="1tU5fm" />
+            <node concept="10QFUN" id="3vv33A$ipSE" role="33vP2m">
+              <node concept="1eOMI4" id="3vv33A$ipSJ" role="10QFUP">
+                <node concept="2OqwBi" id="3vv33A$isGi" role="1eOMHV">
+                  <node concept="2OqwBi" id="3vv33A$iscQ" role="2Oq$k0">
+                    <node concept="37vLTw" id="3vv33A$iqbn" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3vv33A$iofN" resolve="font" />
+                    </node>
+                    <node concept="liA8E" id="3vv33A$iscR" role="2OqNvi">
+                      <ref role="37wK5l" to="z60i:~Font.getStringBounds(java.lang.String,java.awt.font.FontRenderContext)" resolve="getStringBounds" />
+                      <node concept="37vLTw" id="3vv33A$iscS" role="37wK5m">
+                        <ref role="3cqZAo" node="3vv33A$ikLw" resolve="label" />
+                      </node>
+                      <node concept="37vLTw" id="3vv33A$iscT" role="37wK5m">
+                        <ref role="3cqZAo" node="3vv33A$ipSf" resolve="frc" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="liA8E" id="3vv33A$isGj" role="2OqNvi">
+                    <ref role="37wK5l" to="fbzs:~RectangularShape.getHeight()" resolve="getHeight" />
+                  </node>
+                </node>
+              </node>
+              <node concept="10Oyi0" id="3vv33A$ipSK" role="10QFUM" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="4MlXWpxb3gx" role="3cqZAp">
+          <node concept="2OqwBi" id="4MlXWpxb3gy" role="3clFbG">
+            <node concept="37vLTw" id="4MlXWpxb3gz" role="2Oq$k0">
+              <ref role="3cqZAo" node="4MlXWpxb3fS" resolve="button" />
+            </node>
+            <node concept="liA8E" id="4MlXWpxb3g$" role="2OqNvi">
+              <ref role="37wK5l" to="dxuu:~JComponent.setPreferredSize(java.awt.Dimension)" resolve="setPreferredSize" />
+              <node concept="2ShNRf" id="4MlXWpxb3g_" role="37wK5m">
+                <node concept="1pGfFk" id="4MlXWpxb3gA" role="2ShVmc">
+                  <ref role="37wK5l" to="z60i:~Dimension.&lt;init&gt;(int,int)" resolve="Dimension" />
+                  <node concept="3cpWs3" id="3vv33A$izWM" role="37wK5m">
+                    <node concept="37vLTw" id="3vv33A$i$eT" role="3uHU7w">
+                      <ref role="3cqZAo" node="3vv33A$ixdk" resolve="HORIZONTAL_PADDING" />
+                    </node>
+                    <node concept="37vLTw" id="3vv33A$iyG7" role="3uHU7B">
+                      <ref role="3cqZAo" node="3vv33A$ipSt" resolve="textwidth" />
+                    </node>
+                  </node>
+                  <node concept="3cpWs3" id="3vv33A$i$YW" role="37wK5m">
+                    <node concept="37vLTw" id="3vv33A$i_kP" role="3uHU7w">
+                      <ref role="3cqZAo" node="3vv33A$iy7C" resolve="VERTICAL_PADDING" />
+                    </node>
+                    <node concept="37vLTw" id="3vv33A$i$Nl" role="3uHU7B">
+                      <ref role="3cqZAo" node="3vv33A$ipSB" resolve="textheight" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="3vv33A$iCGQ" role="3cqZAp" />
+        <node concept="3clFbF" id="4MlXWpxb3gD" role="3cqZAp">
+          <node concept="37vLTw" id="4MlXWpxb3gE" role="3clFbG">
+            <ref role="3cqZAo" node="4MlXWpxb3fS" resolve="button" />
+          </node>
+        </node>
+      </node>
+      <node concept="3Tm1VV" id="3vv33A$ik_Q" role="1B3o_S" />
+      <node concept="3uibUv" id="3vv33A$ikCI" role="3clF45">
+        <ref role="3uigEE" to="dxuu:~JButton" resolve="JButton" />
+      </node>
+      <node concept="37vLTG" id="3vv33A$ikLw" role="3clF46">
+        <property role="TrG5h" value="label" />
+        <node concept="17QB3L" id="3vv33A$ikLv" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="3vv33A$ikNd" role="3clF46">
+        <property role="TrG5h" value="actionListener" />
+        <node concept="3uibUv" id="3vv33A$ikWC" role="1tU5fm">
+          <ref role="3uigEE" to="hyam:~ActionListener" resolve="ActionListener" />
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="3vv33A$ik_q" role="jymVt" />
+    <node concept="3Tm1VV" id="3vv33A$ikzJ" role="1B3o_S" />
+  </node>
+</model>
+
diff --git a/gradle.lockfile b/gradle.lockfile
index fd15d9dbc..ba8564a55 100644
--- a/gradle.lockfile
+++ b/gradle.lockfile
@@ -9,7 +9,7 @@ com.fasterxml.jackson:jackson-bom:2.13.5=modelcheckBackend
 com.fasterxml.woodstox:woodstox-core:6.4.0=modelcheckBackend
 com.jetbrains.jdk:jbr_jcef:17.0.6-b469.82=jbrLinux,jbrMac,jbrWin
 com.jetbrains:mps:2022.3.2=mps
-com.mbeddr:platform:2022.3.24727.0d9b3f3=languageLibs
+com.mbeddr:platform:2022.3.24800.9b885e6=languageLibs
 com.xenomachina:kotlin-argparser:2.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 com.xenomachina:xenocom:0.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 de.itemis.mps.build-backends:execute-generators:1.15.1.98.8f853d3=generateBackend
@@ -29,5 +29,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=executeBackend,generateBackend,mo
 org.jetbrains.kotlin:kotlin-stdlib:1.6.21=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
 org.jetbrains.kotlin:kotlin-test:1.6.21=modelcheckBackend
 org.jetbrains:annotations:13.0=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
-org.mpsqa:all-in-one:2022.3.612.ce91256=languageLibs
+org.mpsqa:all-in-one:2022.3.652.43ee186=languageLibs
 empty=