3 files changed, 21 insertions, 29 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index d7bff57..b17f8ce 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -13,18 +13,16 @@ SPDX-License-Identifier: MIT
 </head>
 <body>
     <a class="skip-main" href="#main">{{ i18n "skipToContent" | humanize }}</a>
-    <div class="container">
-        <header class="common-header"> 
-            {{ block "header" . }}
-                {{ partial "header.html" . }}
-            {{ end }}
-        </header>
-        <main id="main" tabindex="-1"> 
-            {{ block "main" . }}{{ end }}
-        </main>
-        {{ block "footer" . }}
-            {{ partial "footer.html" . }}
+    <header> 
+        {{ block "header" . }}
+        {{ partial "header.html" . }}
         {{ end }}
-    </div>
+    </header>
+    <main tabindex="-1"> 
+        {{ block "main" . }}{{ end }}
+    </main>
+    {{ block "footer" . }}
+    {{ partial "footer.html" . }}
+    {{ end }}
 </body>
 </html>
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 8a60cb4..dfd346c 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -10,17 +10,14 @@ SPDX-License-Identifier: MIT
   </section>
   <section class="toc">
     <h1 class="post-title">{{ i18n .Title }}</h1>
-    {{ $pages := where .Pages "Type" "in" site.Params.mainSections }}
     <ol>
-      {{ range $pages }}
-        <li class="post-short-list h-entry">
-          <h2 class="p-name post-title{{ if .Params.draft }} draft{{end}}">
-            <a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a>
-          </h2>
+      {{ range sort .Pages "Weight" }}
+        <li>
+          <a href="{{ .RelPermalink }}">{{ trim .Title " " }}</a>
           {{ partial "post-language-switcher.html" . }}
           {{ partial "post-info.html" . }}
         </li>
       {{ end }}
-      <li>
+      <ol>
   </section>
 {{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index bd91a76..5d37444 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -5,21 +5,18 @@ SPDX-License-Identifier: MIT
 */}}
 
 {{ define "main" }}
-  <article class="post h-entry">
-    <header class="post-header">
-      <h1 class="p-name post-title{{ if .Params.draft }} draft{{end}}">{{ trim .Title  " " }}</h1>
+  <article>
+    <header>
+      <h1>{{ trim .Title  " " }}</h1>
       {{ partial "post-language-switcher.html" . }}
+      {{ partial "post-navigation.html" . }}
     </header>
-    <div class="content e-content">
-      {{ .Content }}
-    </div>
-    {{ partial "post-info.html" . }}
+    {{ .Content }}
   </article>
 
+
   {{ partial "single-extra.html" }}
 
-  {{ if and (.Site.Params.paginationSinglePost) (ne .Type "page") }}
-    {{ partial "post-pagination.html" . }}
-  {{ end }}
+  {{ partial "post-navigation.html" . }}
 
 {{ end }}