diff --git a/layouts/partials/assets/helpers/image-definition.html b/layouts/partials/assets/helpers/image-definition.html
index 3e963194..210074b4 100644
--- a/layouts/partials/assets/helpers/image-definition.html
+++ b/layouts/partials/assets/helpers/image-definition.html
@@ -50,24 +50,26 @@
 <!-- Generate image definition -->
 {{- if $caption -}}
     <figure {{ with $wrapper }}class="{{ . }}"{{ end }}>
+{{ else }}
+    {{ with $wrapper }}<div class="{{ . }}">{{ end }}
+{{ end }}
+{{- if not $anchor -}}
+    <img class="img-fluid {{ $class }}"
+        src="{{ $fallbackURL }}"
+        {{ if $lazy }}loading="lazy"{{ end }}
+        {{ with $priority }}fetchpriority="{{ . }}"{{ end }}
+        {{ with $imgset -}}srcset="{{ . }}" sizes="{{ $sizes }}"{{- end }}
+        {{ with $height }}height="{{ . }}"{{ end }}
+        {{ with $width }}width="{{ . }}"{{ end }}
+        {{ with (or $title $caption) }}alt="{{ . }}"{{ end }}>
+{{- else }}
+    <svg class="{{ $class }}">
+        <use href="{{ $fallbackURL }}#{{ $anchor }}"></use>
+    </svg>
 {{ end }}
-<div class="{{ if not $caption }}{{ $wrapper }}{{ end }}">        
-    {{- if not $anchor -}}
-        <img class="img-fluid {{ $class }}"
-            src="{{ $fallbackURL }}"
-            {{ if $lazy }}loading="lazy"{{ end }}
-            {{ with $priority }}fetchpriority="{{ . }}"{{ end }}
-            {{ with $imgset -}}srcset="{{ . }}" sizes="{{ $sizes }}"{{- end }}
-            {{ with $height }}height="{{ . }}"{{ end }}
-            {{ with $width }}width="{{ . }}"{{ end }}
-            {{ with (or $title $caption) }}alt="{{ . }}"{{ end }}>
-    {{- else }}
-        <svg class="{{ $class }}">
-            <use href="{{ $fallbackURL }}#{{ $anchor }}"></use>
-        </svg>
-    {{ end }}
-</div>
 {{- if $caption -}}
         <figcaption class="figure-caption{{ with $figclass }} {{ . }}{{ end }}">{{ $caption | safeHTML }}</figcaption>
     </figure>
+{{ else if $wrapper }}
+    </div>
 {{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/assets/navbar-item.html b/layouts/partials/assets/navbar-item.html
index 43f0a1af..16617185 100644
--- a/layouts/partials/assets/navbar-item.html
+++ b/layouts/partials/assets/navbar-item.html
@@ -50,7 +50,7 @@
 {{ else }}
     {{ $ref := partial "utilities/GetPage.html" (dict "url" $url.Path "page" $page) }}
     {{- if not $ref -}}
-        {{- warnf "partial [assets/navbar-item.html] - Cannot find page of menu item '%s': %s" $menu $url -}}
+        {{- warnf "partial [assets/navbar-item.html] - Cannot find page of menu item '%s': %s" $menu.Name $url -}}
     {{ end }}
 {{ end -}}
 
diff --git a/package-lock.json b/package-lock.json
index 17f80494..39022c98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.24.16",
+  "version": "0.24.17",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.24.16",
+      "version": "0.24.17",
       "license": "MIT",
       "dependencies": {
         "@fullhuman/postcss-purgecss": "^6.0.0",
diff --git a/package.json b/package.json
index 00612bc6..4eb74399 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.24.16",
+  "version": "0.24.17",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",