diff --git a/layouts/_partials/header.html b/layouts/_partials/header.html
index 30fde2e..a312279 100644
--- a/layouts/_partials/header.html
+++ b/layouts/_partials/header.html
@@ -1,14 +1,10 @@
 {{ partial "breadcrumb.html" . }}
 
-{{ partial "lsmenu.html" (cond .IsNode . .CurrentSection) }}
+{{ partial "lsmenu.html" . }}
 
 <div class="cmdblock">
   <p aria-hidden="true" class="prompt">
-    {{ if .IsNode }}
-      sommaire .
-    {{ else }}
-      cat {{ .LinkTitle }}
-    {{ end }}
+    cat {{ path.Base . }}
   </p>
 </div>
 {{/* vim: set tw=80 ts=2 sw=2 sts=2 ft=gohtmltmpl: */}}
diff --git a/layouts/_partials/lsline.html b/layouts/_partials/lsline.html
index 4cfed12..f721f0a 100644
--- a/layouts/_partials/lsline.html
+++ b/layouts/_partials/lsline.html
@@ -1,5 +1,7 @@
 {{ $page := .page }}
-<span aria-hidden="true">{{ cond $page.IsNode "drwxr-xr-x" "-rw-r--r--" }}</span>
+<span aria-hidden="true">
+  {{ cond (and $page.IsNode (not .forceFile)) "drwxr-xr-x" "-rw-r--r--" }}
+</span>
 <span aria-hidden="true" style="text-align: right">
   {{/* Nombre d'éléments dans le nœud, sinon 1 si c'est un fichier. */}}
   {{ cond $page.IsNode (len $page.Pages) "1" }}
@@ -24,15 +26,13 @@
 {{ end }}
 <span>
   <a class="{{ with $page.Params.class -}}{{ . }}{{ end }}"
-    {{ with .currentPage }}
-      {{ if .Eq $page }}
-        href=""
-      {{ else }}
-        href="{{ $page.RelPermalink }}"
-      {{ end }}
+    {{ if and .currentPage (.currentPage.Eq $page) }}
+      aria-current="page"
+      href=""
     {{ else }}
-        href="{{ $page.RelPermalink }}"
+      href="{{ $page.RelPermalink }}"
     {{ end }}
-     title="{{ $page.Title }}">{{ or .linkTitle $page.LinkTitle }}</a>
+        title="{{ $page.Title }}">{{ or .linkTitle (print
+        $page.File.BaseFileName "." $page.File.Ext) $page.LinkTitle }}</a>
 </span>
 {{/* vim: set tw=80 ts=2 sw=2 sts=2 ft=gohtmltmpl: */}}
diff --git a/layouts/_partials/lsmenu.html b/layouts/_partials/lsmenu.html
index 4d1ab5c..565000a 100644
--- a/layouts/_partials/lsmenu.html
+++ b/layouts/_partials/lsmenu.html
@@ -11,19 +11,24 @@
     {{/* La commande ls affiche total en Kio. */}}
     <p aria-hidden="true">total {{ math.Floor (div $sum 1024) }}</p>
     <ul class="lsresult">
-      <li class="directory">{{ partial "lsline.html" (dict "page" . "linkTitle" ".") }}</li>
-      <li class="directory">{{ partial "lsline.html" (dict "page" (or .Parent .) "linkTitle" "..") }}</li>
-      {{ range .Sections.ByLastmod.Reverse }}
+      <li class="directory">
+        {{ partial "lsline.html" (dict "page" .CurrentSection "linkTitle" "." "currentPage" $page) }}
+      </li>
+      <li class="directory">
+        {{ partial "lsline.html" (dict "page" (or .Parent .CurrentSection) "linkTitle" ".." "currentPage" $page) }}
+      </li>
+      {{ range .CurrentSection.Sections.ByLastmod.Reverse }}
         <li class="directory">
-          {{ partial "lsline.html" (dict "page" . "linkTitle" .LinkTitle) }}
+          {{ partial "lsline.html" (dict "page" . "linkTitle" .File.ContentBaseName "currentPage" $page ) }}
         </li>
       {{ end }}
-      {{ range .Pages.ByPublishDate.Reverse }}
-        {{ if .IsPage }}
+      <li class="file" aria-hidden="true">
+        {{ partial "lsline.html" (dict "page" .CurrentSection "forceFile" true "linkTitle" (path.Base .CurrentSection) "currentPage" $page) }}
+      </li>
+      {{ range .CurrentSection.RegularPages.ByPublishDate.Reverse }}
         <li class="file">
-          {{ partial "lsline.html" (dict "page" . "linkTitle" .LinkTitle "currentPage" $page) }}
+          {{ partial "lsline.html" (dict "page" . "linkTitle" .File.LogicalName "currentPage" $page) }}
         </li>
-        {{ end }}
       {{ end }}
     </ul>
   </nav>