diff --git a/dashboard/nav.php b/dashboard/nav.php
index 4cdd85e..d42e87f 100644
--- a/dashboard/nav.php
+++ b/dashboard/nav.php
@@ -76,13 +76,14 @@ while ($row = $result->fetch_array()) {
                      FROM jumi_menu_entries
                     WHERE mhid=$row2[mhid]
                       AND sup != meid
+                      AND sup = $row2[sup]
                       AND meid IN (SELECT DISTINCT meid
 		                    FROM jumi_admin_rollen_rechte_zuord a, jumi_admin_rollen_user_zuord b
 		                   WHERE a.rid = b.rid
                                      AND b.uid = $uid)
                     ORDER BY meid ASC
                    ";
-            
+#echo "<br><br><br><br><br><br><br><br>----------------------------------------$query3<br>";
             $result3 = $db->query($query3) or die("Cannot execute query3");
             $ln3 = 0;
             
diff --git a/templates/modern/dashboard/nav.html b/templates/modern/dashboard/nav.html
index 474bd84..8391bbc 100644
--- a/templates/modern/dashboard/nav.html
+++ b/templates/modern/dashboard/nav.html
@@ -8,7 +8,7 @@
             {/if}
             {section name=inner loop=$table_data[table_data].inner}
             {if $table_data[table_data].inner[inner].link == '#'}
-            <a class="nav-link collapsed" href="#" data-bs-toggle="collapse" data-bs-target="#collapse{$smarty.section.inner.rownum}" aria-expanded="false" aria-controls="collapse{$smarty.section.inner.rownum}">
+            <a class="nav-link collapsed" href="#" data-bs-toggle="collapse" data-bs-target="#collapse{$smarty.section.table_data.rownum}{$smarty.section.inner.rownum}" aria-expanded="false" aria-controls="collapse{$smarty.section.table_data.rownum}{$smarty.section.inner.rownum}">
             {else}
             <a class="nav-link" href="{$table_data[table_data].inner[inner].link}">
                {/if}
@@ -20,7 +20,7 @@
             </a>
             {section name=inner2 loop=$table_data[table_data].inner[inner].inner2}
             {if $smarty.section.inner2.rownum == 1}
-            <div class="collapse" id="collapse{$smarty.section.inner.rownum}" aria-labelledby="headingOne" data-bs-parent="#sidenavAccordion">
+            <div class="collapse" id="collapse{$smarty.section.table_data.rownum}{$smarty.section.inner.rownum}" aria-labelledby="headingOne" data-bs-parent="#sidenavAccordion">
                {/if}
                <nav class="sb-sidenav-menu-nested nav">
                   <a class="nav-link" href="{$table_data[table_data].inner[inner].inner2[inner2].link}">{$table_data[table_data].inner[inner].inner2[inner2].headline}</a>