diff --git a/Layout/andom-tec/menu.php b/Layout/andom-tec/menu.php
index 3f322d5ed..b0400315c 100644
--- a/Layout/andom-tec/menu.php
+++ b/Layout/andom-tec/menu.php
@@ -18,23 +18,33 @@
             <li><a href="<?=self::getUrl("News")?>"><i class="far fa-th-list text-info"></i> News</a></li>
           </ul>
         </li>
+        <?php endif; ?>
         
+        <?php if($me->is(["Admin", "netowner"])): ?>
         <li class="has-submenu">
           <a href="#">
             <i class="far fa-database"></i>Stammdaten <div class="arrow-down"></div>
           </a>
           <ul class="submenu">
-            <li class="has-sub-submenu">
-              <a href="<?=self::getUrl("Address")?>"><i class="fad fa-user text-info"></i> Personen & Firmen</a>
-              <!--<ul class="sub-submenu">
-                <li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["employee"]]])?>"><i class="fas fa-"></i> Mitarbeiter</a></li>
-                <li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["supplier"]]])?>"><i class="fas fa-"></i> Lieferanten</a></li>
-              </ul>-->
-            </li>
+            <?php if($me->is(["Admin"])): ?>
+            <li class="has-sub-submenu font-weight-bold"><a>Betriebsstammdaten</a></li>
+            <li><a href="<?=self::getUrl("Address")?>"><i class="fad fa-user text-info"></i> Personen & Firmen</a></li>
             <li><a href="<?=self::getUrl("Product")?>"><i class="far fa-rectangle-list text-info"></i> Produkte</a></li>
-            <li><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-microchip text-info"></i> Technologien</a></li>
-            <li><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
+            <li><a href="<?=self::getUrl("Productgroup")?>"><i class="far fa-list-tree text-info"></i> Produktgruppen</a></li>
+            
             <li><a href="<?=self::getUrl("Network")?>"><i class="fad fa-network-wired text-info"></i> Netzgebiete</a></li>
+            <li class="has-sub-submenu"><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
+            
+            <li class="has-sub-submenu font-weight-bold mt-1"><a>Grundstammdaten</a></li>
+            <?php endif; ?>
+            <?php if(false && $me->is(["Admin", "netowner"])): ?>
+            <li><a href="<?=self::getUrl("AddressDB")?>"><i class="fas fa-city text-info"></i> GWR / AddressDB</a></li>
+            <?php endif; ?>
+            <?php if($me->is(["Admin"])): ?>
+            <li><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-microchip text-info"></i> Technologien</a></li>
+            <!--<li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fad fa-gear text-info"></i> ContractConfig</a></li>-->
+            <?php endif; ?>
+            
           </ul>
         </li>
         <?php endif; ?>
@@ -66,8 +76,7 @@
         </li>
         <?php endif; ?>
         
-        <!--
-        <?php if($me->is(["Admin"])): ?>
+        <?php if(false && $me->is(["Admin"])): ?>
         <li class="has-submenu">
           <a href="#">
             <i class="fad fa-phone"></i>Telefonie <div class="arrow-down"></div>
@@ -77,17 +86,19 @@
           </ul>
         </li>
         <?php endif; ?>
-        -->
-        <?php if($me->is(["Admin","salespartner"])): ?>
+        
+        <?php if($me->is(["Admin","netowner","salespartner"])): ?>
         <li class="has-submenu">
           <a href="#">
             <i class="fal fa-money-bill-wave"></i>Verkauf <div class="arrow-down"></div>
           </a>
           <ul class="submenu">
-            <?php if($me->is(["Admin"])): ?>
-              <!--<li><a href="<?=self::getUrl("Preordercampaign")?>"><i class="far fa-calendar-lines text-info"></i> Vorbestellung</a></li>-->
+            <?php if(false && $me->is(["Admin","netowner","salespartner"])): ?>
+              <li><a href="<?=self::getUrl("Preordercampaign")?>"><i class="far fa-calendar-lines text-info"></i> Vorbestellung</a></li>
+            <?php endif; ?>
+            <?php if($me->is(["Admin","salespartner"])): ?>
+              <li><a href="<?=self::getUrl("Order")?>"><i class="far fa-file-signature text-info"></i> Bestellungen</a></li>
             <?php endif; ?>
-            <li><a href="<?=self::getUrl("Order")?>"><i class="far fa-file-signature text-info"></i> Bestellungen</a></li>
           </ul>
         </li>
         <?php endif; ?>
@@ -100,7 +111,7 @@
           <ul class="submenu">
             <li><a href="<?=self::getUrl("Contract")?>"><i class="fas fa-file-contract"></i> Verträge</a></li>
             <li><hr /></li>
-            <li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fas fa-wrench"></i> Vertragsconfig</a></li>
+            <li><a href="<?=self::getUrl("Contractconfiggroup")?>"><i class="fas fa-wrench"></i> Vertragsconfig</a></li>
           </ul>
         </li>
         <?php endif; ?>
diff --git a/Layout/andom-tec/menu_old.php b/Layout/andom-tec/menu_old.php
new file mode 100644
index 000000000..3f322d5ed
--- /dev/null
+++ b/Layout/andom-tec/menu_old.php
@@ -0,0 +1,117 @@
+<div class="topbar-menu">
+  <div class="container-fluid">
+    <div id="navigation">
+      <!-- Navigation Menu-->
+      <ul class="navigation-menu">
+
+        <?php if(!$me->is("Admin")): ?>
+        <li class="has-submenu">
+          <a href="<?=self::getUrl("Dashboard")?>"><i class="fe-airplay"></i> Dashboard</a>
+        </li>
+        <?php endif; ?>
+        
+        
+        <?php if($me->is("Admin")): ?>
+        <li class="has-submenu">
+          <a href="<?=self::getUrl("Dashboard")?>"><i class="fe-airplay"></i> Dashboard <div class="arrow-down"></div></a>
+          <ul class="submenu">
+            <li><a href="<?=self::getUrl("News")?>"><i class="far fa-th-list text-info"></i> News</a></li>
+          </ul>
+        </li>
+        
+        <li class="has-submenu">
+          <a href="#">
+            <i class="far fa-database"></i>Stammdaten <div class="arrow-down"></div>
+          </a>
+          <ul class="submenu">
+            <li class="has-sub-submenu">
+              <a href="<?=self::getUrl("Address")?>"><i class="fad fa-user text-info"></i> Personen & Firmen</a>
+              <!--<ul class="sub-submenu">
+                <li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["employee"]]])?>"><i class="fas fa-"></i> Mitarbeiter</a></li>
+                <li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["supplier"]]])?>"><i class="fas fa-"></i> Lieferanten</a></li>
+              </ul>-->
+            </li>
+            <li><a href="<?=self::getUrl("Product")?>"><i class="far fa-rectangle-list text-info"></i> Produkte</a></li>
+            <li><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-microchip text-info"></i> Technologien</a></li>
+            <li><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
+            <li><a href="<?=self::getUrl("Network")?>"><i class="fad fa-network-wired text-info"></i> Netzgebiete</a></li>
+          </ul>
+        </li>
+        <?php endif; ?>
+        
+        
+        <?php if($me->is(["Admin","netowner","lineplanner","pipeplanner","pipeworker","lineworker"])): ?>
+        <li class="has-submenu">
+          <a href="#">
+            <i class="fas fa-hard-hat"></i>Netzbau <div class="arrow-down"></div>
+          </a>
+          <ul class="submenu">
+            <?php if($me->is(["Admin","netowner","pipeplanner"])): ?><li><a href="<?=self::getUrl("Building")?>"><i class="fas fa-city text-info"></i> Objekte & Anschlüsse</a></li><?php endif; ?>
+            <?php if($me->is(["Admin","netowner","pipeplanner","pipeworker","lineplanner","lineworker"])): ?><li><a href="<?=self::getUrl("Pipework")?>"><i class="fad fa-wrench text-info"></i> Tiefbau</a></li><?php endif; ?>
+            <?php if($me->is(["Admin","netowner","lineplanner","lineworker"])): ?><li><a href="<?=self::getUrl("Linework")?>"><i class="fas fa-ethernet text-info"></i> Leitungsbau</a></li><?php endif; ?>
+            <?php if($me->is(["Admin", "netowner", "netoperator", "lineworker"])): ?><li><a href="<?=self::getUrl("Patching")?>"><i class="fas fa-plug text-info"></i> Patchungen</a></li><?php endif; ?>
+          </ul>
+        </li>
+        <?php endif; ?>
+        
+        <?php if($me->is(["Admin"])): ?>
+        <li class="has-submenu">
+          <a href="#">
+            <i class="fad fa-running"></i>Netzbetrieb <div class="arrow-down"></div>
+          </a>
+          <ul class="submenu">
+            <li><a href="<?=self::getUrl("Cpeprovisioning")?>"><i class="fad fa-hdd text-info"></i> CPE Provisioning</a></li>
+            <li><a href="<?=self::getUrl("Cpeshipping")?>"><i class="fad fa-shipping-fast text-info"></i> CPE Versand</a></li>
+          </ul>
+        </li>
+        <?php endif; ?>
+        
+        <!--
+        <?php if($me->is(["Admin"])): ?>
+        <li class="has-submenu">
+          <a href="#">
+            <i class="fad fa-phone"></i>Telefonie <div class="arrow-down"></div>
+          </a>
+          <ul class="submenu">
+            <li><a href="<?=self::getUrl("Voicenumberblock")?>"><i class="fad fa-blender-phone text-info"></i> Rufnummernblöcke</a></li>
+          </ul>
+        </li>
+        <?php endif; ?>
+        -->
+        <?php if($me->is(["Admin","salespartner"])): ?>
+        <li class="has-submenu">
+          <a href="#">
+            <i class="fal fa-money-bill-wave"></i>Verkauf <div class="arrow-down"></div>
+          </a>
+          <ul class="submenu">
+            <?php if($me->is(["Admin"])): ?>
+              <!--<li><a href="<?=self::getUrl("Preordercampaign")?>"><i class="far fa-calendar-lines text-info"></i> Vorbestellung</a></li>-->
+            <?php endif; ?>
+            <li><a href="<?=self::getUrl("Order")?>"><i class="far fa-file-signature text-info"></i> Bestellungen</a></li>
+          </ul>
+        </li>
+        <?php endif; ?>
+        <!--
+        <?php if($me->is(["Admin"])): ?>
+        <li class="has-submenu">
+          <a href="#">
+            <i class="fas fa-shopping-basket"></i>Verträge<div class="arrow-down"></div>
+          </a>
+          <ul class="submenu">
+            <li><a href="<?=self::getUrl("Contract")?>"><i class="fas fa-file-contract"></i> Verträge</a></li>
+            <li><hr /></li>
+            <li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fas fa-wrench"></i> Vertragsconfig</a></li>
+          </ul>
+        </li>
+        <?php endif; ?>
+        -->
+      </ul>
+      <!-- End navigation menu -->
+
+      <div class="clearfix"></div>
+    </div>
+    <!-- end #navigation -->
+  </div>
+  <!-- end container -->
+</div>
+<!-- end navbar-custom -->
\ No newline at end of file
diff --git a/Layout/default/Contractconfig/Index_old.php b/Layout/default/Contractconfig/Index_old.php
index eee3da959..14e4d550a 100644
--- a/Layout/default/Contractconfig/Index_old.php
+++ b/Layout/default/Contractconfig/Index_old.php
@@ -9,7 +9,7 @@
         <div class="page-title-box">
           <div class="page-title-right">
             <ol class="breadcrumb m-0">
-              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>">the-tool</a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
               <li class="breadcrumb-item"><a href="<?=self::getUrl("Contractconfig")?>">Contractconfig</a></li>
               <li class="breadcrumb-item">Contractconfig</li>
             </ol>
diff --git a/Layout/default/Contractconfiggroup/Index.php b/Layout/default/Contractconfiggroup/Index.php
index fa441c286..ec6e577af 100644
--- a/Layout/default/Contractconfiggroup/Index.php
+++ b/Layout/default/Contractconfiggroup/Index.php
@@ -9,7 +9,7 @@
         <div class="page-title-box">
           <div class="page-title-right">
             <ol class="breadcrumb m-0">
-              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>">the-tool</a></li>
+              <li class="breadcrumb-item"><a href="<?=self::getUrl("Dashboard")?>"><?=MFAPPNAME_SLUG?></a></li>
               <li class="breadcrumb-item"><a href="<?=self::getUrl("Contractconfig")?>">Contractconfig</a></li>
               <li class="breadcrumb-item">Contractconfig</li>
             </ol>