diff --git a/config.yaml b/config.yaml
index 746d884..1c38def 100644
--- a/config.yaml
+++ b/config.yaml
@@ -31,9 +31,3 @@ privacy:
 
 theme:
   - chosto
-
-menu:
-  main:
-    - identifier: categories
-      name: Catégories
-      url: /categories/
diff --git a/themes/chosto/layouts/_default/baseof.html b/themes/chosto/layouts/_default/baseof.html
index 9474255..17325aa 100644
--- a/themes/chosto/layouts/_default/baseof.html
+++ b/themes/chosto/layouts/_default/baseof.html
@@ -7,7 +7,6 @@
           {{- partial "header.html" . -}}
           <div class="container">
           {{- block "main" . }}{{- end }}
-          {{- partial "about.html" . -}}
           </div>
           {{- partial "footer.html" . -}}
         </div>
diff --git a/themes/chosto/layouts/_default/summary.html b/themes/chosto/layouts/_default/summary.html
index bc20ecc..a243e96 100644
--- a/themes/chosto/layouts/_default/summary.html
+++ b/themes/chosto/layouts/_default/summary.html
@@ -1,4 +1,4 @@
-<article class="post">
+<article class="block">
   <header>
     <h2><a href='{{ .Permalink }}'> {{ .Title }}</a> </h2>
     <div class="post-meta">
diff --git a/themes/chosto/layouts/index.html b/themes/chosto/layouts/index.html
index b0ed745..669aa29 100644
--- a/themes/chosto/layouts/index.html
+++ b/themes/chosto/layouts/index.html
@@ -1,14 +1,13 @@
 {{ define "main" }}
     <main>
+      {{ with .Content }}
       <div>
-        <!-- Note that the content for index.html, as a sort of list page, will pull from content/_index.md -->
-        {{ .Content }}
-      </div>
-      <div>
-        {{ range .Paginator.Pages }}
-            {{ .Render "summary" }}
-        {{ end }}
-        {{- partial "pagination.html" . -}}
+        {{ . }}
       </div>
+      {{ end }}
+      {{ range .Paginator.Pages }}
+          {{ .Render "summary" }}
+      {{ end }}
+      {{- partial "pagination.html" . -}}
     </main>
 {{ end }}
diff --git a/themes/chosto/layouts/partials/header.html b/themes/chosto/layouts/partials/header.html
index 2d7afda..7e008fb 100644
--- a/themes/chosto/layouts/partials/header.html
+++ b/themes/chosto/layouts/partials/header.html
@@ -5,6 +5,13 @@
       {{ with .Params.subtitle }}
         <p class="subtitle">{{ . }}</p>
       {{ end }}
+      {{ with .Params.categories }}
+      <div class="tags colums is-centered is-rounded">
+        {{ range . }}
+        <span class="tag is-large mx-2"><a href="{{ "categories" | absURL }}/{{ . | urlize }}">{{ . }}</a></span>
+        {{ end }}
+      </div>
+      {{ end }}
     </div>
   </section>
 </header>
diff --git a/themes/chosto/layouts/partials/listitem.html b/themes/chosto/layouts/partials/listitem.html
index 6f96f00..1f0853e 100644
--- a/themes/chosto/layouts/partials/listitem.html
+++ b/themes/chosto/layouts/partials/listitem.html
@@ -1,4 +1,4 @@
-<li>
+<div class="block">
     <a href="{{.Permalink}}">
       <time class="post-date" datetime="{{ .Date.Format `2006-01-02T15:04:05Z07:00` | safeHTML }}">
         {{ .Date.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Date.Month) }} {{ .Date.Year }}
@@ -28,4 +28,4 @@
       {{ end }}
       {{ .Title }}
     </a>
-</li>
+</div>
diff --git a/themes/chosto/layouts/partials/navbar.html b/themes/chosto/layouts/partials/navbar.html
index 613691b..2001a77 100644
--- a/themes/chosto/layouts/partials/navbar.html
+++ b/themes/chosto/layouts/partials/navbar.html
@@ -12,11 +12,24 @@
     <div id="navbar" class="navbar-menu">
       <div class="navbar-start">
         <a class="navbar-item {{ if eq .Permalink .Site.Home.Permalink }}is-active is-tab{{ end }}" href="{{ .Site.Home.Permalink }}">Accueil</a>
+        <div class="navbar-item has-dropdown is-hoverable">
+          <a class="navbar-link">
+            Catégories
+          </a>
+          <div class="navbar-dropdown">
+            {{ range $key, $value := .Site.Taxonomies.categories }}
+            <a class="navbar-item" href="{{ .Page.Permalink }}">
+              {{ $key | humanize }}
+              <span class="tag ml-2 is-rounded">{{ len . }}</span>
+            </a>
+            {{ end }}
+          </div>
+        </div>
         {{ $currentPage := . }}
         {{ range .Site.Menus.main }}
         {{ if .HasChildren }}
         <div class="navbar-item has-dropdown is-hoverable {{ if $currentPage.HasMenuCurrent "main" . }}is-active is-tab{{ end }}">
-          <a href="#" class="navbar-link">
+          <a class="navbar-link">
             {{ .Pre }}
             <span>{{ .Name }}</span>
           </a>
@@ -31,7 +44,9 @@
         {{ end }}
         {{ end }}
       </div>
-      <div class="navbar-end"><!-- See later to differentiate --></div>
+      <div class="navbar-end">
+        <!-- See later to differentiate -->
+      </div>
     </div>
   </div>
 </nav>
diff --git a/themes/chosto/layouts/posts/single.html b/themes/chosto/layouts/posts/single.html
index 247faea..8274782 100644
--- a/themes/chosto/layouts/posts/single.html
+++ b/themes/chosto/layouts/posts/single.html
@@ -1,60 +1,59 @@
 {{ define "main" }}
-<div class="container">
-  <aside>
-      <div>
-      <section>
-        <time class="post-date" datetime="{{ .Date.Format `2006-01-02T15:04:05Z07:00` | safeHTML }}">
-          Article publié le {{ .Date.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Date.Month) }} {{ .Date.Year }} (dernière modification le {{ .Lastmod.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Lastmod.Month) }} {{ .Lastmod.Year }})
-        </time>
-        <h4>{{ .FuzzyWordCount }} mots </h4>
-      </section>
-      {{ with .Params.categories }}
-      <ul>
-        {{ range . }}
-          <li><a href="{{ "categories" | absURL }}/{{ . | urlize }}">{{ . }}</a> </li>
-        {{ end }}
-      </ul>
-      {{ end }}
-      </div>
-  </aside>
+<div class="columns mt-5 is-variable is-6">
   <!--
   If the current blog post belongs to a case, we will add a side menu
   with all other blog posts belonging to that case, emphasis to the current.
   -->
   {{ with .CurrentSection.Params.Title }}
-  <aside class="menu">
+  <aside class="menu box column is-3">
     <p class="menu-label">
       Dans le dossier « {{ . }} »...
     </p>
-    <ul class="menu-list">
+    <div class="menu-list">
       {{ $posts := (where $.Site.RegularPages "CurrentSection.Params.Code" "==" $.CurrentSection.Params.Code )}}
       {{ $postsSorted := (sort $posts "Date" )}}
       {{ range $postsSorted }}
-        <li><a
-        {{ if eq $.Title .Title }}
-          class="is-active"
-        {{ end }}
-        href="{{ .Permalink }}">{{ .Title }}</a></li>
+      <a {{ if eq $.Title .Title }} class="is-active" {{ end }} href="{{ .Permalink }}">{{ .Title }}</a>
       {{ end }}
-    </ul>
+    </div>
   </aside>
   {{ end }}
-  <section>
-    <div>
-          <article>
-             {{ .Content }}
-          </article>
-    </div>
-  </section>
-  <aside>
+  <section class="column is-7">
+    <aside>
       <div>
-          {{ with .PrevInSection }}
-            <a class="previous" href="{{ .Permalink }}"> {{ .Title }}</a>
-          {{ end }}
-          {{ with .NextInSection }}
-            <a class="next" href="{{ .Permalink }}"> {{ .Title }}</a>
-          {{ end }}
+        <section>
+          <time class="post-date" datetime="{{ .Date.Format `2006-01-02T15:04:05Z07:00` | safeHTML }}">
+            Article publié le {{ .Date.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Date.Month) }} {{ .Date.Year }} (dernière modification le {{ .Lastmod.Day }} {{ index $.Site.Data.months_fr (printf "%d" .Lastmod.Month) }}
+            {{ .Lastmod.Year }})
+          </time>
+          <h4>{{ .FuzzyWordCount }} mots </h4>
+        </section>
       </div>
+    </aside>
+    <div>
+      <article>
+        {{ .Content }}
+      </article>
+    </div>
+    <aside class="container level my-5">
+      <div class="level-left">
+        {{ with .PrevInSection }}
+        <div class="level-item">
+          <a class="button is-info" href="{{ .Permalink }}">&laquo;&laquo;&nbsp;{{ .Title }}</a>
+        </div>
+        {{ end }}
+      </div>
+      <div class="level-right">
+        {{ with .NextInSection }}
+        <div class="level-item">
+          <a class="button is-info" href="{{ .Permalink }}">{{ .Title }}&nbsp;&raquo;&raquo;</a>
+        </div>
+        {{ end }}
+      </div>
+    </aside>
+  </section>
+  <aside class="column is-3">
+    {{- partial "about.html" . -}}
   </aside>
 </div>
 {{ end }}
diff --git a/themes/chosto/layouts/taxonomy/list.html b/themes/chosto/layouts/taxonomy/list.html
index 34bd1b9..7b1722b 100644
--- a/themes/chosto/layouts/taxonomy/list.html
+++ b/themes/chosto/layouts/taxonomy/list.html
@@ -5,6 +5,5 @@
               <li><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a> {{ .Count }}</li>
       {{ end }}
   </ul>
-  {{- partial "pagination.html" . -}}
 </main>
 {{ end }}
diff --git a/themes/chosto/layouts/term/list.html b/themes/chosto/layouts/term/list.html
index 3484f29..c82ffef 100644
--- a/themes/chosto/layouts/term/list.html
+++ b/themes/chosto/layouts/term/list.html
@@ -6,7 +6,7 @@
     </article>
     <ul>
     <!-- Ranges through the term pages -->
-    {{ range .Pages }}
+    {{ range .Paginator.Pages }}
       {{- partial "listitem.html" . -}}
     {{ end }}
     </ul>