diff --git a/packs/Core.elementsdevpack/components/com.realmacsoftware.navbar/templates/include/mobile_item.html b/packs/Core.elementsdevpack/components/com.realmacsoftware.navbar/templates/include/mobile_item.html
index 2dd6c367..b47562f4 100644
--- a/packs/Core.elementsdevpack/components/com.realmacsoftware.navbar/templates/include/mobile_item.html
+++ b/packs/Core.elementsdevpack/components/com.realmacsoftware.navbar/templates/include/mobile_item.html
@@ -1,49 +1,45 @@
-<li x-data="{ open: false }" class="cursor-pointer">
-    <div
-        class="{{classes.mobile.item}} flex items-center justify-between"
-        @click="open = !open"
-        @if(page.isActive)
-        aria-current="page"
-        @endif
-        @if(page.hasActiveChild)
-        data-active-child
-        @endif
-    >
-        @if(page.isFolder)
-        <button
-            aria-expanded="false"
-            x-bind:aria-expanded="open.toString()"
-            class="flex justify-between items-center"
-            @if(page.isActive)
-            aria-current="page"
-            @endif
-        >
-            <span>{{page.title}}</span>
-            @include("mobile_submenu_indicator")
-        </button>
-        @else
+<li x-data="{ open: false }">
+    @if(page.hasPages)
+    <div class="flex items-stretch justify-between">
         <a
-            class="flex justify-between items-center"
+            class="{{classes.mobile.item}} flex flex-1 items-center"
             href="{{page.url}}"
             @if(page.isActive)
             aria-current="page"
             @endif
+            @if(page.hasActiveChild)
+            data-active-child
+            @endif
             @if(page.openInNewWindow)
             target="_blank"
             @endif
             >{{page.title}}</a
         >
-        @if(page.hasPages)
         <button
             @click.stop="open = !open"
             aria-expanded="false"
             x-bind:aria-expanded="open.toString()"
-            class="pl-2"
+            class="flex cursor-pointer items-center pl-2"
         >
             @include("mobile_submenu_indicator")
         </button>
-        @endif @endif
     </div>
+    @else
+    <a
+        class="{{classes.mobile.item}} block"
+        href="{{page.url}}"
+        @if(page.isActive)
+        aria-current="page"
+        @endif
+        @if(page.hasActiveChild)
+        data-active-child
+        @endif
+        @if(page.openInNewWindow)
+        target="_blank"
+        @endif
+        >{{page.title}}</a
+    >
+    @endif
 
     @includeIf(page.hasPages, template: "mobile_submenu")
 </li>
diff --git a/packs/Core.elementsdevpack/components/com.realmacsoftware.navbar/templates/include/mobile_submenu.html b/packs/Core.elementsdevpack/components/com.realmacsoftware.navbar/templates/include/mobile_submenu.html
index c55616c5..6a69076b 100644
--- a/packs/Core.elementsdevpack/components/com.realmacsoftware.navbar/templates/include/mobile_submenu.html
+++ b/packs/Core.elementsdevpack/components/com.realmacsoftware.navbar/templates/include/mobile_submenu.html
@@ -21,28 +21,49 @@
             <span>{{child.title}}</span>
             @include("mobile_submenu_indicator")
         </button>
-        @else
-        <div
-            class="{{classes.mobile.item}} flex justify-between items-center"
-            @if(child.isActive)
-            aria-current="page"
-            @endif
-            @if(child.hasActiveChild)
-            data-active-child
-            @endif
-        >
+        @else @if(child.hasPages)
+        <div class="flex items-stretch justify-between">
             <a
-                class="block"
+                class="{{classes.mobile.item}} flex flex-1 items-center"
                 href="{{child.url}}"
                 @click.stop
+                @if(child.isActive)
+                aria-current="page"
+                @endif
+                @if(child.hasActiveChild)
+                data-active-child
+                @endif
                 @if(child.openInNewWindow)
                 target="_blank"
                 @endif
                 >{{child.title}}</a
             >
-            @includeIf(child.hasPages, template: "mobile_submenu_indicator")
+            <button
+                @click.stop="open = !open"
+                aria-expanded="false"
+                x-bind:aria-expanded="open.toString()"
+                class="flex cursor-pointer items-center pl-2"
+            >
+                @include("mobile_submenu_indicator")
+            </button>
         </div>
-        @endif @includeIf(child.hasPages, template: "mobile_submenu_menu")
+        @else
+        <a
+            class="{{classes.mobile.item}} block"
+            href="{{child.url}}"
+            @click.stop
+            @if(child.isActive)
+            aria-current="page"
+            @endif
+            @if(child.hasActiveChild)
+            data-active-child
+            @endif
+            @if(child.openInNewWindow)
+            target="_blank"
+            @endif
+            >{{child.title}}</a
+        >
+        @endif @endif @includeIf(child.hasPages, template: "mobile_submenu_menu")
     </li>
     @endeach
 </ul>