diff --git a/layouts/partials/assets/navbar-item.html b/layouts/partials/assets/navbar-item.html
index 002e2f93..77677198 100644
--- a/layouts/partials/assets/navbar-item.html
+++ b/layouts/partials/assets/navbar-item.html
@@ -70,20 +70,29 @@
 
 <!-- Main code -->
 {{ if not $error }}
-    <a class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{. }}{{ end }}" 
-        {{ if $isIcon }}aria-label="{{ $menu.Name }}"{{ end }}
-        data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
-        href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }} {{ $button | safeHTMLAttr }}>
-        
-        {{- with $menu.Pre }}
-            {{ if hasPrefix . "<i" }}
-                {{ . | safeHTML }}
-            {{ else }}
-                {{ partial "assets/icon.html" (dict "icon" (string .) )}}
-            {{ end }}
-        {{ end -}}
-        <span {{ if $isActive }} class="active"{{ end }}>{{ if not $isIcon }}{{ $menu.Name }}{{ end }}</span>
-        {{- with $menu.Post }}{{ . }}{{ end -}}
-        {{- if not $isIcon }}&nbsp;{{ $suffix }}{{ end -}}
-    </a>
+    {{ if $menu.Params.button }}
+        {{ partial "assets/button.html" (dict 
+            "title" $menu.Name
+            "icon" $menu.Pre
+            "href" $menuURL
+            "size" "sm"
+        )}}
+    {{ else }}
+        <a class="{{ $anchorClass }}{{ if $isActive }} active{{ end }}{{ with $class }} {{. }}{{ end }}" 
+            {{ if $isIcon }}aria-label="{{ $menu.Name }}"{{ end }}
+            data-nav="main" data-nav-main="{{ $mainNav }}"{{ with $childNav }} data-nav-child="{{ . }}"{{ end }} 
+            href="{{ $menuURL }}{{ $params | safeHTMLAttr }}"{{ with $externalHref }} {{ . | safeHTMLAttr }}{{ end }} {{ $button | safeHTMLAttr }}>
+            
+            {{- with $menu.Pre }}
+                {{ if hasPrefix . "<i" }}
+                    {{ . | safeHTML }}
+                {{ else }}
+                    {{ partial "assets/icon.html" (dict "icon" (string .) )}}
+                {{ end }}
+            {{ end -}}
+            <span {{ if $isActive }} class="active"{{ end }}>{{ if not $isIcon }}{{ $menu.Name }}{{ end }}</span>
+            {{- with $menu.Post }}{{ . }}{{ end -}}
+            {{- if not $isIcon }}&nbsp;{{ $suffix }}{{ end -}}
+        </a>
+    {{ end }}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/partials/assets/navbar.html b/layouts/partials/assets/navbar.html
index a3e5d0b1..f3337b0b 100644
--- a/layouts/partials/assets/navbar.html
+++ b/layouts/partials/assets/navbar.html
@@ -164,6 +164,11 @@
 {{- $contrast := false -}}
 {{- if in (slice "primary" "secondary" "success" "danger") $color }}{{ $contrast = true }}{{ end -}}
 
+{{- $flex := false }}
+{{ if gt (where $menus "Params.spacing" true | len) 0 }}
+    {{ $flex = true }}
+{{ end }}
+
 <!-- Main code -->
 <div class="container-fluid {{ if $fixed }}fixed-top{{ end }} p-0{{ with $class }} {{ . }}{{ end }}">
     {{- partial "assets/page-alert.html" (dict "page" $page) -}}
@@ -225,23 +230,27 @@
                 {{- if and $search (not $searchModal)  }}{{ partial "assets/search-input.html" }}{{ end -}}
                 
                 <!-- Render top-menu items (maximum depth of 2) -->
-                <ul class="navbar-nav ms-auto">
+                <ul class="navbar-nav {{ if $flex }}d-flex w-100{{ else }}ms-auto{{ end }}">
                     {{- range $menu := $menus -}}
-                        <li class="nav-item{{ if .HasChildren }} dropdown{{ if $horizontal }} dropdown-horizontal-{{ $size }}{{ end }}{{ end }}">
-                            {{- partial "assets/navbar-item.html" (dict "menu" $menu "page" $page) -}}
-                            {{- if .HasChildren -}}
-                                <ul class="dropdown-menu">
-                                    {{- range .Children -}}
-                                        <li>{{- partial "assets/navbar-item.html" (dict "menu" . "parent" $menu "page" $page) -}}</li>
-                                    {{- end -}}
-                                </ul>
-                            {{- end -}}
-                        </li>
+                        {{ if $menu.Params.spacing }}
+                            <li class="nav-item flex-grow-1"></li>
+                        {{ else }}
+                            <li class="nav-item {{ if .HasChildren }} dropdown{{ if $horizontal }} dropdown-horizontal-{{ $size }}{{ end }}{{ end }}">
+                                {{- partial "assets/navbar-item.html" (dict "menu" $menu "page" $page) -}}
+                                {{- if .HasChildren -}}
+                                    <ul class="dropdown-menu">
+                                        {{- range .Children -}}
+                                            <li>{{- partial "assets/navbar-item.html" (dict "menu" . "parent" $menu "page" $page) -}}</li>
+                                        {{- end -}}
+                                    </ul>
+                                {{- end -}}
+                            </li>
+                        {{- end -}}
                     {{- end -}}
     
                     <!-- Insert divider if applicable -->
                     {{- if and $menus (or $enableLanguage $enableVersions) -}}
-                        <li class="nav-item py-2 py-md-1 col-12 col-md-auto d-none d-{{ $size }}-block">
+                        <li class="nav-item py-2 py-md-1 col-12 col-md-auto d-none d-{{ $size }}-block me-auto">
                             <div class="vr d-none d-md-flex h-100 mx-md-2"></div>
                         </li>
                         <li><hr class="dropdown-divider-bg"></li>
@@ -256,7 +265,7 @@
                     <!-- Insert language switcher if applicable -->
                     {{- if $enableLanguage -}}
                         {{- $currentLang := $page.Language.Lang -}}
-                        <li class="nav-item dropdown">
+                        <li class="nav-item dropdown me-auto">
                             <a class="nav-link dropdown-toggle d-{{ $size }}-none" href="#!" role="button" data-bs-toggle="dropdown" aria-label="{{ T "languageSwitcherLabel" }}" aria-expanded="false">
                                 {{- partial "assets/icon.html" (dict "icon" "fas globe fa-fw" "spacing" false) }}&nbsp;{{ T "languageSwitcherLabel" }}
                             </a>
@@ -284,7 +293,7 @@
 
                     <!-- Insert modal search button -->
                     {{- if $searchModal }}
-                        <li class="nav-item py-2 py-md-1 col-12 col-md-auto d-none d-{{ $size }}-block">
+                        <li class="nav-item py-2 py-md-1 col-12 col-md-auto d-none d-{{ $size }}-block me-auto">
                             <div class="vr d-none d-md-flex h-100 mx-md-2"></div>
                         </li>
                         <li><hr class="dropdown-divider-bg"></li>