diff --git a/app/templates/moduls/navigation.html.j2 b/app/templates/moduls/navigation.html.j2
index 25eac33..7e5a7d1 100644
--- a/app/templates/moduls/navigation.html.j2
+++ b/app/templates/moduls/navigation.html.j2
@@ -10,7 +10,7 @@
                     {{ render_subitems(subitem.subitems) }}
                 </ul>
             </li>
-        {% elif subitem.identifier %}
+        {% elif subitem.identifier or subitem.warning or subitem.info %}
             <li>
                 <a class="dropdown-item" onclick='openDynamicPopup({{ subitem|tojson|safe }})' data-bs-toggle="tooltip" title="{{ subitem.description }}">
                     <i class="{{ subitem.icon.class }}"></i> {{ subitem.name }}
@@ -22,7 +22,7 @@
                     {% if subitem.icon is defined and subitem.icon.class is defined %}
                         <i class="{{ subitem.icon.class }}"></i> {{ subitem.name }}
                     {% else %}
-                        <p>Fehlendes Icon im Subitem: {{ subitem }}</p>
+                        <p>Missing icon in subitem: {{ subitem }}</p>
                     {% endif %}
                 </a>
             </li>
@@ -33,9 +33,6 @@
  <!-- Navigation Bar -->
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
     <div class="container-fluid">
-    <!--
-        <a class="navbar-brand" href="#">Navbar</a>
-    -->    
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav{{menu_type}}" aria-controls="navbarNav{{menu_type}}" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
@@ -53,7 +50,11 @@
                         <!-- Dropdown Menu -->
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown{{ loop.index }}" role="button" data-bs-toggle="dropdown" data-bs-display="dynamic" data-popper-placement="top" title="{{ item.description }}" aria-expanded="false">
-                                <i class="{{ item.icon.class }}" data-bs-toggle="tooltip"></i> {{ item.name }}
+                                {% if item.icon is defined and item.icon.class is defined %}
+                                    <i class="{{ item.icon.class }}" data-bs-toggle="tooltip"></i> {{ item.name }}
+                                {% else %}
+                                    <p>Missing icon in item: {{ item }}</p>
+                                {% endif %}
                             </a>
                             <ul class="dropdown-menu dropdown-menu-{{menu_type}}" aria-labelledby="navbarDropdown{{ loop.index }}">
                                 {{ render_subitems(item.subitems) }}