diff --git a/menu/SSG_LIB.cui b/menu/SSG_LIB.cui
index f8351a9..a15dafc 100644
--- a/menu/SSG_LIB.cui
+++ b/menu/SSG_LIB.cui
@@ -561,156 +561,168 @@
         </Macro>
       </MenuMacro>
       <MenuMacro UID="MM_00122">
+        <Macro>
+          <Name>Eingang</Name>
+          <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_EINGANG_INSERT</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00123">
+        <Macro>
+          <Name>Ausgang</Name>
+          <Command>^C^C(ssg-ensure "SSG_LIB_Commands") ILS_AUSGANG_INSERT</Command>
+        </Macro>
+      </MenuMacro>
+      <MenuMacro UID="MM_00124">
         <Macro>
           <Name>SPS Schliessen</Name>
           <Command>^C^C</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00124">
+      <MenuMacro UID="MM_00126">
         <Macro>
           <Name>Export Sivas</Name>
           <Command>^C^C(ssg-ensure "export") EXPORTSIVAS</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00125">
+      <MenuMacro UID="MM_00127">
         <Macro>
           <Name>Export CSV</Name>
           <Command>^C^C(ssg-ensure "export") EXPORTCSV</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00127">
+      <MenuMacro UID="MM_00129">
         <Macro>
           <Name>Umschalten 2D und 3D</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_SWITCH</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00128">
+      <MenuMacro UID="MM_00130">
         <Macro>
           <Name>Alle Bloecke auf 2D</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_ALL_2D</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00129">
+      <MenuMacro UID="MM_00131">
         <Macro>
           <Name>Alle Bloecke auf 3D</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_DIM_ALL_3D</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00130">
+      <MenuMacro UID="MM_00132">
         <Macro>
           <Name>Sprache</Name>
           <Command>^C^C(ssg-ensure "SSG_LIB_Commands") SSG_SPRACHE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00133">
+      <MenuMacro UID="MM_00135">
         <Macro>
           <Name>alle Tests ausfuehren und exportieren</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS_EXPORT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00134">
+      <MenuMacro UID="MM_00136">
         <Macro>
           <Name>Tests ausfuehren und stehen lassen</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_run_all.lsp")) SSG_RUN_ALL_TESTS_OFFEN</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00135">
+      <MenuMacro UID="MM_00137">
         <Macro>
           <Name>Export CSV/Sivas ALL</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_export_all.lsp")) TEST_EXPORT_ALL</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00137">
+      <MenuMacro UID="MM_00139">
         <Macro>
           <Name>Kreisel</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_kreisel.lsp")) TEST_KREISEL</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00138">
+      <MenuMacro UID="MM_00140">
         <Macro>
           <Name>Foerderer</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_foerderer.lsp")) TEST_FOERDERER</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00139">
+      <MenuMacro UID="MM_00141">
         <Macro>
           <Name>Foerderer-Linienzug</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_linienzug.lsp")) TEST_LINIENZUG</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00140">
+      <MenuMacro UID="MM_00142">
         <Macro>
           <Name>Omniflo</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo.lsp")) TEST_OMNIFLO</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00141">
+      <MenuMacro UID="MM_00143">
         <Macro>
           <Name>Omniflo Strecke</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_omniflo_strecke.lsp")) TEST_OMNIFLO_STRECKE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00142">
+      <MenuMacro UID="MM_00144">
         <Macro>
           <Name>Gefaellestrecke</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_gefaellestrecke.lsp")) TEST_GEFAELLESTRECKE</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00143">
+      <MenuMacro UID="MM_00145">
         <Macro>
           <Name>Mubea Gesamtmodell</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_mubea.lsp")) TEST_MUBEA</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00144">
+      <MenuMacro UID="MM_00146">
         <Macro>
           <Name>HundM05 Kreisel-Abschnitt</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/tests/test_hundm05.lsp")) TEST_HUNDM05</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00145">
+      <MenuMacro UID="MM_00147">
         <Macro>
           <Name>KS 2D/3D pruefen (CSV)</Name>
           <Command>^C^C(load (strcat (getenv "DXFMAKRO") "/Lisp/ks_pruefung.lsp")) KS_PRUEFEN</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00157">
+      <MenuMacro UID="MM_00159">
         <Macro>
           <Name>Kreisel bearbeiten</Name>
           <Command>(ssg-ensure "KreiselInsert") KreiselEdit</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00158">
+      <MenuMacro UID="MM_00160">
         <Macro>
           <Name>Omniflo Element bearbeiten</Name>
           <Command>(ssg-ensure "OmniModulInsert") OMNI_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00159">
+      <MenuMacro UID="MM_00161">
         <Macro>
           <Name>Gefaellestrecke bearbeiten</Name>
           <Command>(ssg-ensure "Gefaellestrecke") GEFAELLESTRECKE_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00160">
+      <MenuMacro UID="MM_00162">
         <Macro>
           <Name>VarioFoerderer bearbeiten</Name>
           <Command>(ssg-ensure "VarioFoerderer") VARIOFOERDERER_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00161">
+      <MenuMacro UID="MM_00163">
         <Macro>
           <Name>TRO-Marker bearbeiten</Name>
           <Command>(ssg-ensure "Tro_Edit") TRO_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00162">
+      <MenuMacro UID="MM_00164">
         <Macro>
           <Name>Verbindung bearbeiten</Name>
           <Command>(ssg-ensure "Connection_Edit") CONNECTION_EDIT</Command>
         </Macro>
       </MenuMacro>
-      <MenuMacro UID="MM_00164">
+      <MenuMacro UID="MM_00166">
         <Macro>
           <Name>SSG Bearbeiten (Auto)</Name>
           <Command>(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT</Command>
@@ -728,9 +740,9 @@
           <PopMenuRef pUID="PM_00005"/>
           <PopMenuRef pUID="PM_00031"/>
           <PopMenuRef pUID="PM_00113"/>
-          <PopMenuRef pUID="PM_00123"/>
-          <PopMenuRef pUID="PM_00126"/>
-          <PopMenuRef pUID="PM_00132"/>
+          <PopMenuRef pUID="PM_00125"/>
+          <PopMenuRef pUID="PM_00128"/>
+          <PopMenuRef pUID="PM_00134"/>
         </PopMenu>
         <PopMenu UID="PM_00005">
           <Name>ILS</Name>
@@ -1328,11 +1340,23 @@
           <PopMenuRef pUID="PM_00114"/>
           <PopMenuRef pUID="PM_00118"/>
           <PopMenuItem>
-            <NameRef>SPS Schliessen</NameRef>
+            <NameRef>Eingang</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00122"/>
             </MenuItem>
           </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Ausgang</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00123"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>SPS Schliessen</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00124"/>
+            </MenuItem>
+          </PopMenuItem>
         </PopMenu>
         <PopMenu UID="PM_00114">
           <Name>TRO</Name>
@@ -1376,174 +1400,174 @@
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00123">
+        <PopMenu UID="PM_00125">
           <Name>Export</Name>
           <PopMenuItem>
             <NameRef>Export Sivas</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00124"/>
+              <MacroRef MenuMacroID="MM_00126"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Export CSV</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00125"/>
-            </MenuItem>
-          </PopMenuItem>
-        </PopMenu>
-        <PopMenu UID="PM_00126">
-          <Name>Konfiguration</Name>
-          <PopMenuItem>
-            <NameRef>Umschalten 2D und 3D</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00127"/>
             </MenuItem>
           </PopMenuItem>
+        </PopMenu>
+        <PopMenu UID="PM_00128">
+          <Name>Konfiguration</Name>
           <PopMenuItem>
-            <NameRef>Alle Bloecke auf 2D</NameRef>
-            <MenuItem>
-              <MacroRef MenuMacroID="MM_00128"/>
-            </MenuItem>
-          </PopMenuItem>
-          <PopMenuItem>
-            <NameRef>Alle Bloecke auf 3D</NameRef>
+            <NameRef>Umschalten 2D und 3D</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00129"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
-            <NameRef>Sprache</NameRef>
+            <NameRef>Alle Bloecke auf 2D</NameRef>
             <MenuItem>
               <MacroRef MenuMacroID="MM_00130"/>
             </MenuItem>
           </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Alle Bloecke auf 3D</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00131"/>
+            </MenuItem>
+          </PopMenuItem>
+          <PopMenuItem>
+            <NameRef>Sprache</NameRef>
+            <MenuItem>
+              <MacroRef MenuMacroID="MM_00132"/>
+            </MenuItem>
+          </PopMenuItem>
           <PopMenuItem>
             <NameRef>Konfiguration Schliessen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00122"/>
+              <MacroRef MenuMacroID="MM_00124"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00132">
+        <PopMenu UID="PM_00134">
           <Name>Tests</Name>
           <PopMenuItem>
             <NameRef>alle Tests ausfuehren und exportieren</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00133"/>
+              <MacroRef MenuMacroID="MM_00135"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Tests ausfuehren und stehen lassen</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00134"/>
+              <MacroRef MenuMacroID="MM_00136"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Export CSV/Sivas ALL</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00135"/>
+              <MacroRef MenuMacroID="MM_00137"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>Kreisel</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00137"/>
+              <MacroRef MenuMacroID="MM_00139"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Foerderer</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00138"/>
+              <MacroRef MenuMacroID="MM_00140"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Foerderer-Linienzug</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00139"/>
+              <MacroRef MenuMacroID="MM_00141"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00140"/>
+              <MacroRef MenuMacroID="MM_00142"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo Strecke</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00141"/>
+              <MacroRef MenuMacroID="MM_00143"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Gefaellestrecke</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00142"/>
+              <MacroRef MenuMacroID="MM_00144"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Mubea Gesamtmodell</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00143"/>
+              <MacroRef MenuMacroID="MM_00145"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>HundM05 Kreisel-Abschnitt</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00144"/>
+              <MacroRef MenuMacroID="MM_00146"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>KS 2D/3D pruefen (CSV)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00145"/>
+              <MacroRef MenuMacroID="MM_00147"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
-        <PopMenu UID="PM_00156">
+        <PopMenu UID="PM_00158">
           <Alias>POP501</Alias>
           <Name>SSG_LIB Edit Context</Name>
           <PopMenuItem>
             <NameRef>Kreisel bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00157"/>
+              <MacroRef MenuMacroID="MM_00159"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Omniflo Element bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00158"/>
+              <MacroRef MenuMacroID="MM_00160"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Gefaellestrecke bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00159"/>
+              <MacroRef MenuMacroID="MM_00161"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>VarioFoerderer bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00160"/>
+              <MacroRef MenuMacroID="MM_00162"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>TRO-Marker bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00161"/>
+              <MacroRef MenuMacroID="MM_00163"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem>
             <NameRef>Verbindung bearbeiten</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00162"/>
+              <MacroRef MenuMacroID="MM_00164"/>
             </MenuItem>
           </PopMenuItem>
           <PopMenuItem IsSeparator="true"/>
           <PopMenuItem>
             <NameRef>SSG Bearbeiten (Auto)</NameRef>
             <MenuItem>
-              <MacroRef MenuMacroID="MM_00164"/>
+              <MacroRef MenuMacroID="MM_00166"/>
             </MenuItem>
           </PopMenuItem>
         </PopMenu>
diff --git a/menu/SSG_LIB.mnu b/menu/SSG_LIB.mnu
index d5cc958..1a1fc47 100644
--- a/menu/SSG_LIB.mnu
+++ b/menu/SSG_LIB.mnu
@@ -118,9 +118,9 @@
 [->Connections]
 [Verbindung einfuegen]^C^C(ssg-ensure "Connection_Edit") CONNECTION_INSERT
 [Verbindung bearbeiten]^C^C(ssg-ensure "Connection_Edit") CONNECTION_EDIT
+[<-Bearbeiten (Auto)]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT
 [Eingang]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_EINGANG_INSERT
 [Ausgang]^C^C(ssg-ensure "SSG_LIB_Commands") ILS_AUSGANG_INSERT
-[<-Bearbeiten (Auto)]^C^C(ssg-ensure "SSG_LIB_Commands") SSG_BLOCKEDIT
 [<-SPS Schliessen]^C^C
 [->Export]
 [Export Sivas]^C^C(ssg-ensure "export") EXPORTSIVAS