diff --git a/pages/01.administrate/06.learn/02.guidelines/guidelines.fr.md b/pages/01.administrate/06.overview/02.guidelines/guidelines.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/02.guidelines/guidelines.fr.md
rename to pages/01.administrate/06.overview/02.guidelines/guidelines.fr.md
diff --git a/pages/01.administrate/06.learn/02.guidelines/guidelines.md b/pages/01.administrate/06.overview/02.guidelines/guidelines.md
similarity index 100%
rename from pages/01.administrate/06.learn/02.guidelines/guidelines.md
rename to pages/01.administrate/06.overview/02.guidelines/guidelines.md
diff --git a/pages/01.administrate/06.learn/03.admin/admin.es.md b/pages/01.administrate/06.overview/03.admin/admin.es.md
similarity index 100%
rename from pages/01.administrate/06.learn/03.admin/admin.es.md
rename to pages/01.administrate/06.overview/03.admin/admin.es.md
diff --git a/pages/01.administrate/06.learn/03.admin/admin.fr.md b/pages/01.administrate/06.overview/03.admin/admin.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/03.admin/admin.fr.md
rename to pages/01.administrate/06.overview/03.admin/admin.fr.md
diff --git a/pages/01.administrate/06.learn/03.admin/admin.md b/pages/01.administrate/06.overview/03.admin/admin.md
similarity index 100%
rename from pages/01.administrate/06.learn/03.admin/admin.md
rename to pages/01.administrate/06.overview/03.admin/admin.md
diff --git a/pages/01.administrate/06.learn/04.commandline/ssh.de.md b/pages/01.administrate/06.overview/04.commandline/ssh.de.md
similarity index 100%
rename from pages/01.administrate/06.learn/04.commandline/ssh.de.md
rename to pages/01.administrate/06.overview/04.commandline/ssh.de.md
diff --git a/pages/01.administrate/06.learn/04.commandline/ssh.es.md b/pages/01.administrate/06.overview/04.commandline/ssh.es.md
similarity index 100%
rename from pages/01.administrate/06.learn/04.commandline/ssh.es.md
rename to pages/01.administrate/06.overview/04.commandline/ssh.es.md
diff --git a/pages/01.administrate/06.learn/04.commandline/ssh.fr.md b/pages/01.administrate/06.overview/04.commandline/ssh.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/04.commandline/ssh.fr.md
rename to pages/01.administrate/06.overview/04.commandline/ssh.fr.md
diff --git a/pages/01.administrate/06.learn/04.commandline/ssh.it.md b/pages/01.administrate/06.overview/04.commandline/ssh.it.md
similarity index 100%
rename from pages/01.administrate/06.learn/04.commandline/ssh.it.md
rename to pages/01.administrate/06.overview/04.commandline/ssh.it.md
diff --git a/pages/01.administrate/06.learn/04.commandline/ssh.md b/pages/01.administrate/06.overview/04.commandline/ssh.md
similarity index 100%
rename from pages/01.administrate/06.learn/04.commandline/ssh.md
rename to pages/01.administrate/06.overview/04.commandline/ssh.md
diff --git a/pages/01.administrate/06.learn/05.users/users.fr.md b/pages/01.administrate/06.overview/05.users/users.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/05.users/users.fr.md
rename to pages/01.administrate/06.overview/05.users/users.fr.md
diff --git a/pages/01.administrate/06.learn/05.users/users.md b/pages/01.administrate/06.overview/05.users/users.md
similarity index 100%
rename from pages/01.administrate/06.learn/05.users/users.md
rename to pages/01.administrate/06.overview/05.users/users.md
diff --git a/pages/01.administrate/06.learn/06.apps/apps_overview.fr.md b/pages/01.administrate/06.overview/06.apps/apps_overview.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/06.apps/apps_overview.fr.md
rename to pages/01.administrate/06.overview/06.apps/apps_overview.fr.md
diff --git a/pages/01.administrate/06.learn/06.apps/apps_overview.md b/pages/01.administrate/06.overview/06.apps/apps_overview.md
similarity index 100%
rename from pages/01.administrate/06.learn/06.apps/apps_overview.md
rename to pages/01.administrate/06.overview/06.apps/apps_overview.md
diff --git a/pages/01.administrate/06.learn/07.domains/domains.fr.md b/pages/01.administrate/06.overview/07.domains/domains.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/07.domains/domains.fr.md
rename to pages/01.administrate/06.overview/07.domains/domains.fr.md
diff --git a/pages/01.administrate/06.learn/07.domains/domains.md b/pages/01.administrate/06.overview/07.domains/domains.md
similarity index 100%
rename from pages/01.administrate/06.learn/07.domains/domains.md
rename to pages/01.administrate/06.overview/07.domains/domains.md
diff --git a/pages/01.administrate/06.learn/08.emails/02.emailclients/email_configure_client.es.md b/pages/01.administrate/06.overview/08.emails/02.emailclients/email_configure_client.es.md
similarity index 100%
rename from pages/01.administrate/06.learn/08.emails/02.emailclients/email_configure_client.es.md
rename to pages/01.administrate/06.overview/08.emails/02.emailclients/email_configure_client.es.md
diff --git a/pages/01.administrate/06.learn/08.emails/02.emailclients/email_configure_client.fr.md b/pages/01.administrate/06.overview/08.emails/02.emailclients/email_configure_client.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/08.emails/02.emailclients/email_configure_client.fr.md
rename to pages/01.administrate/06.overview/08.emails/02.emailclients/email_configure_client.fr.md
diff --git a/pages/01.administrate/06.learn/08.emails/02.emailclients/email_configure_client.md b/pages/01.administrate/06.overview/08.emails/02.emailclients/email_configure_client.md
similarity index 100%
rename from pages/01.administrate/06.learn/08.emails/02.emailclients/email_configure_client.md
rename to pages/01.administrate/06.overview/08.emails/02.emailclients/email_configure_client.md
diff --git a/pages/01.administrate/06.learn/08.emails/email.de.md b/pages/01.administrate/06.overview/08.emails/email.de.md
similarity index 100%
rename from pages/01.administrate/06.learn/08.emails/email.de.md
rename to pages/01.administrate/06.overview/08.emails/email.de.md
diff --git a/pages/01.administrate/06.learn/08.emails/email.es.md b/pages/01.administrate/06.overview/08.emails/email.es.md
similarity index 100%
rename from pages/01.administrate/06.learn/08.emails/email.es.md
rename to pages/01.administrate/06.overview/08.emails/email.es.md
diff --git a/pages/01.administrate/06.learn/08.emails/email.fr.md b/pages/01.administrate/06.overview/08.emails/email.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/08.emails/email.fr.md
rename to pages/01.administrate/06.overview/08.emails/email.fr.md
diff --git a/pages/01.administrate/06.learn/08.emails/email.md b/pages/01.administrate/06.overview/08.emails/email.md
similarity index 100%
rename from pages/01.administrate/06.learn/08.emails/email.md
rename to pages/01.administrate/06.overview/08.emails/email.md
diff --git a/pages/01.administrate/06.learn/09.xmpp/XMPP.es.md b/pages/01.administrate/06.overview/09.xmpp/XMPP.es.md
similarity index 100%
rename from pages/01.administrate/06.learn/09.xmpp/XMPP.es.md
rename to pages/01.administrate/06.overview/09.xmpp/XMPP.es.md
diff --git a/pages/01.administrate/06.learn/09.xmpp/XMPP.fr.md b/pages/01.administrate/06.overview/09.xmpp/XMPP.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/09.xmpp/XMPP.fr.md
rename to pages/01.administrate/06.overview/09.xmpp/XMPP.fr.md
diff --git a/pages/01.administrate/06.learn/09.xmpp/XMPP.md b/pages/01.administrate/06.overview/09.xmpp/XMPP.md
similarity index 100%
rename from pages/01.administrate/06.learn/09.xmpp/XMPP.md
rename to pages/01.administrate/06.overview/09.xmpp/XMPP.md
diff --git a/pages/01.administrate/06.learn/10.backups/backup.fr.md b/pages/01.administrate/06.overview/10.backups/backup.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/10.backups/backup.fr.md
rename to pages/01.administrate/06.overview/10.backups/backup.fr.md
diff --git a/pages/01.administrate/06.learn/10.backups/backup.it.md b/pages/01.administrate/06.overview/10.backups/backup.it.md
similarity index 100%
rename from pages/01.administrate/06.learn/10.backups/backup.it.md
rename to pages/01.administrate/06.overview/10.backups/backup.it.md
diff --git a/pages/01.administrate/06.learn/10.backups/backup.md b/pages/01.administrate/06.overview/10.backups/backup.md
similarity index 100%
rename from pages/01.administrate/06.learn/10.backups/backup.md
rename to pages/01.administrate/06.overview/10.backups/backup.md
diff --git a/pages/01.administrate/06.learn/11.update/upgrade.fr.md b/pages/01.administrate/06.overview/11.update/upgrade.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/11.update/upgrade.fr.md
rename to pages/01.administrate/06.overview/11.update/upgrade.fr.md
diff --git a/pages/01.administrate/06.learn/11.update/upgrade.md b/pages/01.administrate/06.overview/11.update/upgrade.md
similarity index 100%
rename from pages/01.administrate/06.learn/11.update/upgrade.md
rename to pages/01.administrate/06.overview/11.update/upgrade.md
diff --git a/pages/01.administrate/06.learn/12.security/security.fr.md b/pages/01.administrate/06.overview/12.security/security.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/12.security/security.fr.md
rename to pages/01.administrate/06.overview/12.security/security.fr.md
diff --git a/pages/01.administrate/06.learn/12.security/security.md b/pages/01.administrate/06.overview/12.security/security.md
similarity index 100%
rename from pages/01.administrate/06.learn/12.security/security.md
rename to pages/01.administrate/06.overview/12.security/security.md
diff --git a/pages/01.administrate/06.learn/13.permissions/groups_and_permissions.fr.md b/pages/01.administrate/06.overview/13.permissions/groups_and_permissions.fr.md
similarity index 100%
rename from pages/01.administrate/06.learn/13.permissions/groups_and_permissions.fr.md
rename to pages/01.administrate/06.overview/13.permissions/groups_and_permissions.fr.md
diff --git a/pages/01.administrate/06.learn/13.permissions/groups_and_permissions.md b/pages/01.administrate/06.overview/13.permissions/groups_and_permissions.md
similarity index 100%
rename from pages/01.administrate/06.learn/13.permissions/groups_and_permissions.md
rename to pages/01.administrate/06.overview/13.permissions/groups_and_permissions.md
diff --git a/pages/01.administrate/06.learn/01.overview/overview.fr.md b/pages/01.administrate/06.overview/overview.fr.md
similarity index 98%
rename from pages/01.administrate/06.learn/01.overview/overview.fr.md
rename to pages/01.administrate/06.overview/overview.fr.md
index d5ce8251..358bdc68 100644
--- a/pages/01.administrate/06.learn/01.overview/overview.fr.md
+++ b/pages/01.administrate/06.overview/overview.fr.md
@@ -1,5 +1,6 @@
 ---
 title: Vue d'ensemble de l'écosystème YunoHost
+menu: Visite guidée
 template: docs
 taxonomy:
     category: docs
diff --git a/pages/01.administrate/06.learn/01.overview/overview.md b/pages/01.administrate/06.overview/overview.md
similarity index 98%
rename from pages/01.administrate/06.learn/01.overview/overview.md
rename to pages/01.administrate/06.overview/overview.md
index 8129c5ec..d1ac3688 100644
--- a/pages/01.administrate/06.learn/01.overview/overview.md
+++ b/pages/01.administrate/06.overview/overview.md
@@ -1,5 +1,6 @@
 ---
 title: Overview of the YunoHost ecosystem
+menu: Guided tour
 template: docs
 taxonomy:
     category: docs
diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css
index 8392158b..b6801a0b 100644
--- a/themes/yunohost-docs/css/custom.css
+++ b/themes/yunohost-docs/css/custom.css
@@ -107,6 +107,18 @@ h1, h2, h3, h4, h5, h6 {
    margin-left: 0.4em;
 }
 
+.simplebar-content h5 {
+   letter-spacing: 0em;
+   border-top: 1px solid #ddd;
+   padding: 0.8em 0;
+   margin: 0;
+}
+
+/* Hide home page in menu */
+.simplebar-content h5:first-child {
+    display: none;
+}
+
 @font-face {
     font-family: 'Source Sans Pro';
     src: url('../fonts/SourceSansPro-Bold-webfont.eot');
@@ -124,15 +136,11 @@ img#whitelogo {
     padding: 10px;
 }
 
-/* Hide home page in menu */
-.simplebar-content h5:first-child {
-    display: none;
-}
-
 /* Sidebar */
 
 #sidebar-id {
     background-color: #fffefe;
+    border-right: 0.05rem solid #ddd;
 }
 
 body .off-canvas .learn-sidebar a {
@@ -148,6 +156,19 @@ body .off-canvas .learn-sidebar .learn-brand #logo path {
     fill: black!important;
 }
 
+body #top-bar {
+    background: none;
+    border-bottom: none;
+}
+
+body #top-bar #navigation {
+    width: auto;
+}
+body #top-bar #navigation > a {
+    width: 3em;
+    border-left: none;
+}
+
 body #top-bar #breadcrumbs > span span, #top-bar #breadcrumbs > a span {
     font-size: 0.7rem;
 }
@@ -164,6 +185,14 @@ body .off-canvas .learn-sidebar .searchbox ::placeholder {
     color: rgba(68, 68, 68, 0.8);
 }
 
+body .off-canvas .learn-sidebar .learn-nav ul.searched a {
+    color: black;
+}
+
+body .off-canvas .learn-sidebar .learn-nav ul.searched .search-match a:hover, .off-canvas .learn-sidebar .learn-nav ul.searched .search-match a {
+    color: blueviolet;
+}
+
 body .off-canvas .learn-sidebar a:hover {
     color: #37419a;
 }
@@ -173,13 +202,21 @@ body #header .off-canvas .learn-sidebar a:hover {
     text-decoration: underline black;
 }
 
+body .off-canvas .learn-sidebar .learn-nav ul .parent ul {
+    margin-left: 0.5rem;
+}
+
 body .off-canvas .learn-sidebar .learn-nav ul li a > span > b {
     color: black;
 }
 
+body .off-canvas .learn-sidebar .learn-nav ul.topics > li.parent {
+    background-color: rgba(0, 0, 0, 0.1);
+}
+
 body .off-canvas .learn-sidebar .learn-nav ul li ul li.active > a {
-    background-color: #7f7f7f3d;
-    border-left: black 2px solid;
+    background-color: rgba(0, 0, 0, 0.1);
+    border-left: 4px solid mediumturquoise;
 }
 
 body .off-canvas .learn-sidebar .learn-nav .read-icon, body .off-canvas .learn-sidebar .searchbox, body .off-canvas .learn-sidebar .search-options .version-chooser select {