diff --git a/_config.yml b/_config.yml
index 9230e7963..2dfd950f5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -43,6 +43,7 @@ translation:
     totaltime: "Total"
     storage: "Storage"
     tip: "Tip"
+    more: "Discover more"
     browse_by: "Browse by:"
     collections: "Collections"
     collections_browse: "No recipes are marked as being part of a collection."
@@ -72,6 +73,7 @@ translation:
     totaltime: "Total"
     storage: "Conservation"
     tip: "Astuce"
+    more: "Découvrez plus"
     browse_by: "Naviguer par:"
     collections: "Collections"
     collections_browse: "Aucune recette n’a encore été ajoutée à une collection."
diff --git a/_includes/nav.html b/_includes/nav.html
index 3d1ce1bbb..479e008cd 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -21,7 +21,7 @@
 		</svg>
 		<p class="nav-label">{{ site.translation[site.language].search }}</p>
 	</a>
-	<a href="{{ site.baseurl }}/tags.html" class="nav-item nav-tags {% if current[0] == 'tags' or current[0] == 'courses' or current[0] == 'cuisines' or current[0] == 'diets' %}active{% endif %}">
+	<a href="{{ site.baseurl }}/tags.html" class="nav-item nav-tags {% if current[0] == 'tags' or current[0] == 'courses' or current[0] == 'cuisines' or current[0] == 'diets' or current[0] == 'collections' %}active{% endif %}">
 		<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg">
 		  <path d="M25.568 2.5H6.43C4.814 2.5 3.5 3.86 3.5 5.476v20.877a2.934 2.934 0 0 0 2.93 2.932h19.138a2.936 2.936 0 0 0 2.932-2.932V5.476c0-1.616-1.316-2.976-2.932-2.976zM18.38 4.88h3.571v7.049l-1.041-.833a1.189 1.189 0 0 0-1.488 0l-1.042.833V4.88zM5.88 26.354V5.433a.55.55 0 0 1 .549-.552h1.832v22.024H6.43a.55.55 0 0 1-.549-.551zm20.238 0a.55.55 0 0 1-.551.552H10.643V4.88H16v9.524a1.189 1.189 0 1 0 1.935.93l2.232-1.786 2.232 1.786a1.189 1.189 0 0 0 1.258.144c.414-.2.676-.616.676-1.074V4.88h1.235a.55.55 0 0 1 .551.55v20.922z"/>
 		</svg>
diff --git a/_includes/tag-navigation.html b/_includes/tag-navigation.html
index 640caff6d..d4454af32 100644
--- a/_includes/tag-navigation.html
+++ b/_includes/tag-navigation.html
@@ -5,6 +5,6 @@
   <a href="{{ site.baseurl }}/diets.html" class="button button-transparent {% if current == '/diets' %}is-active{% endif %}">{{ site.translation[site.language].diets }}</a>
   <a href="{{ site.baseurl }}/courses.html" class="button button-transparent {% if current == '/courses' %}is-active{% endif %}">{{ site.translation[site.language].courses }}</a>
   <a href="{{ site.baseurl }}/cuisines.html" class="button button-transparent {% if current == '/cuisines' %}is-active{% endif %}">{{ site.translation[site.language].cuisines }}</a>
-  <a href="{{ site.baseurl }}/tags.html" class="button button-transparent {% if current == '/tags' %}is-active{% endif %}">{{ site.translation[site.language].tags }}</a>
   <a href="{{ site.baseurl }}/collections.html" class="button button-transparent {% if current == '/collections' %}is-active{% endif %}">{{ site.translation[site.language].collections }}</a>
+  <a href="{{ site.baseurl }}/tags.html" class="button button-transparent {% if current == '/tags' %}is-active{% endif %}">{{ site.translation[site.language].tags }}</a>
 </nav>
\ No newline at end of file
diff --git a/_layouts/recipe.html b/_layouts/recipe.html
index fdcbdfafb..d4ccc87e8 100644
--- a/_layouts/recipe.html
+++ b/_layouts/recipe.html
@@ -165,6 +165,7 @@ <h4>{{ direction.first[0] }}</h4>
     {% include nutritional-information.html %}
   </div>
   <div class="sm-col sm-col-6 lg-col-6 mt3">
+    <h4 class="accent mt0 mb2 xs-center">{{ site.translation[site.language].more }}</h4>
     <div class="flex-wrap">
       {% include cuisine.html cuisines=page.cuisines %}
       {% include course.html courses=page.courses %}
diff --git a/_recipes/PBB-bites.md b/_recipes/PBB-bites.md
index 58dab9760..0bc0504a5 100644
--- a/_recipes/PBB-bites.md
+++ b/_recipes/PBB-bites.md
@@ -1,7 +1,7 @@
 ---
 
 layout: recipe
-title: "PBB Frozen Sandwich Bites"
+title: "PB&B Frozen Sandwich Bites"
 image: pbb-bites/pbb-bites-1.jpg
 cuisines: [américaine]
 courses: [snack]
diff --git a/_recipes/brioche-myrtille.md b/_recipes/brioche-myrtille.md
index a377bd655..5aa5d8e6c 100644
--- a/_recipes/brioche-myrtille.md
+++ b/_recipes/brioche-myrtille.md
@@ -5,7 +5,7 @@ title: "Brioche aux myrtilles"
 image: bb-brioche/bb-brioche-1.jpg
 cuisines: [française]
 courses: [petit-déjeuner, goûter]
-tags: [brioche, roll, boulangerie]
+tags: [brioche, boulangerie]
 
 preptime: 30 min
 cooktime: 35 min
diff --git a/_recipes/crunchem-tartlets.md b/_recipes/crunchem-tartlets.md
index cc15c92f8..ef257c9db 100644
--- a/_recipes/crunchem-tartlets.md
+++ b/_recipes/crunchem-tartlets.md
@@ -1,11 +1,11 @@
 ---
 
 layout: recipe
-title: "Tartelettes Crunch’ Em"
+title: "Mini tartelettes Crunch’ Em"
 image: crunchem/crunchem-1.jpg
 cuisines: [américaine]
 courses: [snack]
-tags: [bouchée]
+tags: [bouchée, tarte]
 collections: [dino, Peanut Butter]
 
 preptime: 1 h
diff --git a/_recipes/tarte-cacao.md b/_recipes/tarte-cacao.md
index a303c24bf..9f313b372 100644
--- a/_recipes/tarte-cacao.md
+++ b/_recipes/tarte-cacao.md
@@ -1,7 +1,7 @@
 ---
 
 layout: recipe
-title: "Duo de tartes au cacao"
+title: "Tartelettes au cacao"
 image: tarte-cacao/tarte-cacao-1.jpg
 cuisines: [française]
 courses: [dessert, goûter]
diff --git a/_recipes/tartelette-avoine-caramel.md b/_recipes/tartelette-avoine-caramel.md
index 9f8c7cf1f..88fb7fdf5 100644
--- a/_recipes/tartelette-avoine-caramel.md
+++ b/_recipes/tartelette-avoine-caramel.md
@@ -1,7 +1,7 @@
 ---
 
 layout: recipe
-title: "Tartelettes avoine et caramel"
+title: "Mini tartelettes avoine et caramel"
 image: tartelette-avoine-caramel/tartelette-avoine-caramel-1.jpg
 cuisines: [française]
 courses: [snack]
diff --git a/collections.html b/collections.html
index cc43674fd..5e31ee0e0 100644
--- a/collections.html
+++ b/collections.html
@@ -25,7 +25,8 @@ <h1>{{ site.translation[site.language].collections }}</h1>
       {% for collection in allTags %}
       <div data-tagged="{{ collection }}" class="tag-result-container hide">
         <h2 class="capitalize"><a name="{{ collection | capitalize }}"></a>{{ collection | capitalize }}</h2>
-        {% for recipe in site.recipes %}
+        {% assign sorted = site.recipes | sort:"title" %}
+        {% for recipe in sorted %}
         {% if recipe.collections contains collection %}
         <div class="sm-col sm-col-6 md-col-6 lg-col-4 xs-px1 xs-mb2">
             <a class="block relative bg-accent" href="{{ recipe.url | prepend: site.baseurl }}">
diff --git a/courses.html b/courses.html
index 5e1afc0d1..fb6db6051 100644
--- a/courses.html
+++ b/courses.html
@@ -25,7 +25,8 @@ <h1>{{ site.translation[site.language].courses }}</h1>
       {% for course in allTags %}
       <div data-tagged="{{ course }}" class="tag-result-container hide">
         <h2 class="capitalize"><a name="{{ course | capitalize }}"></a>{{ course }}</h2>
-        {% for recipe in site.recipes %}
+        {% assign sorted = site.recipes | sort:"title" %}
+        {% for recipe in sorted %}
         {% if recipe.courses contains course %}
         <div class="sm-col sm-col-6 md-col-6 lg-col-4 xs-px1 xs-mb2">
           <a class="block relative bg-accent" href="{{ recipe.url | prepend: site.baseurl }}">
diff --git a/cuisines.html b/cuisines.html
index 5cddc8dd2..5f8cdd251 100644
--- a/cuisines.html
+++ b/cuisines.html
@@ -25,7 +25,8 @@ <h1>{{ site.translation[site.language].cuisines }}</h1>
       {% for cuisine in allTags %}
       <div data-tagged="{{ cuisine }}" class="tag-result-container hide">
         <h2 class="capitalize"><a name="{{ cuisine | capitalize }}"></a>{{ cuisine | capitalize }}</h2>
-        {% for recipe in site.recipes %}
+        {% assign sorted = site.recipes | sort:"title" %}
+        {% for recipe in sorted %}
         {% if recipe.cuisines contains cuisine %}
         <div class="sm-col sm-col-6 md-col-6 lg-col-4 xs-px1 xs-mb2">
             <a class="block relative bg-accent" href="{{ recipe.url | prepend: site.baseurl }}">
diff --git a/diets.html b/diets.html
index 7eb3013ea..4bd82bd98 100644
--- a/diets.html
+++ b/diets.html
@@ -27,7 +27,8 @@ <h1>{{ site.translation[site.language].diets }}</h1>
         {% assign dietKey = diet | append:"Diet" %}
         <h2 class="capitalize"><a name="{{ diet | capitalize }}"></a>{{ site.data.diets[dietKey].name }}
         <sup class="h5" style="cursor: help; text-transform: none;" title="{{ site.data.diets[dietKey].description }}">&#9432;</sup></h2>
-        {% for recipe in site.recipes %}
+        {% assign sorted = site.recipes | sort:"title" %}
+        {% for recipe in sorted %}
         {% if recipe.diets contains diet %}
         <div class="sm-col sm-col-6 md-col-6 lg-col-4 xs-px1 xs-mb2">
           <a class="block relative bg-accent" href="{{ recipe.url | prepend: site.baseurl }}">
diff --git a/tags.html b/tags.html
index bcf90344b..e51ef42fc 100644
--- a/tags.html
+++ b/tags.html
@@ -25,7 +25,8 @@ <h1>{{ site.translation[site.language].tags }}</h1>
       {% for tag in allTags %}
       <div data-tagged="{{ tag }}" class="tag-result-container hide">
         <h2 class="capitalize"><a name="{{ tag | capitalize }}"></a>{{ tag }}</h2>
-        {% for recipe in site.recipes %}
+        {% assign sorted = site.recipes | sort:"title" %}
+        {% for recipe in sorted %}
         {% if recipe.tags contains tag %}
         <div class="sm-col sm-col-6 md-col-6 lg-col-4 xs-px1 xs-mb2">
             <a class="block relative bg-accent" href="{{ recipe.url | prepend: site.baseurl }}">