diff --git a/sitemap.md b/sitemap.md
index e4fe361d..7650cd1f 100644
--- a/sitemap.md
+++ b/sitemap.md
@@ -7,17 +7,17 @@
 * [Documentation](/docs)
 
     * Try YunoHost
-       * [With demo](/try)    
-       * [With live usb](/try_at_home)
+       * [With the demo](/try)    
+       * [With a live USB stick](/try_at_home)
 
     * [Administrator guide](/admindoc)
         * [Self-hosting](/selfhosting_en)
         * [Hardware compatible](/hardware)
         * [Installation guide](/install)
-            * [On the Internet Brick](/install_brick_en)
+            * [On the Internet Cube](/install_brick_en)
             * [On a Raspberry Pi](/install_on_raspberry)
             * [On a Cubieboard](/install_on_cubieboard)
-            * [From ISO](/install_iso)
+            * [From an ISO](/install_iso)
             * [On Debian](/install_on_debian)
             * [On VirtualBox](/install_on_virtualbox)
             * [On Docker](/docker)
@@ -31,28 +31,34 @@
                * [Manual instalation](/install_manually)
                * [Plug and boot your server](/plug_and_boot)
                * [Post-instalation](/postinstall)
-               * [Diagnostic](/diagnostic)
-        * [DNS Settings](/dns)
+        * Access to YunoHost server: DNS, domain name, `hosts` file
+           * [Diagnostic the access to YunoHost server](/diagnostic)
+           * [DNS Settings](/dns)
            * [Registrar](registar)
            * [DNS Configuration](/dns_config)
            * [Use the YunoHost DNS resolver](/dns_resolver_en)
-           * [Configure a dynamic DNS with a dynamic IP address](dns_dynamicip_en)
+           * [Dynamic IP address: configure DynDNS](dns_dynamicip_en)
            * [Access his server on his local network](/dns_local_network_en)
-        * [Official applications](/apps)
-            * [Update aplications](app_update_en)
         * [Internet service provider](/isp)
-            * [Main configuration box](/isp_box_config)
-        * [Web administration](/admin)
+            * [Generic configuration of the ISP router](/isp_box_config)
+        * Applications
+            * [Official applications](/apps_en)
+            * [Non-official applications](/apps_in_progress_en)
+            * [Update applications](app_update_en)
+        * Administration
+            * Command-line
+                * [Connect to your server with SSH](/ssh)
+                * [Command line administration](/moulinette)
+            * [Web administration](/admin)
+            * [Change administration password](/change_admin_password)
+        * Email
+           * [Forms to remove blacklisting of your IP address](blacklist_forms_en)
+           * [DKIM](dkim)
+        * Certificates
+            * [Add a certificate certified by an authority](/certificate)
+            * [Regenerate self-signed certificate](/regenerate_certificate_en)
         * [Security](/security)
         * [Troubleshooting guide](/troubleshooting_guide_en)
-        * [Connect to your server with SSH](/ssh)
-        * [Command line administration](/moulinette)
-        * [Change administration password](/change_admin_password)
-        * Email:
-           * [Forms to remove blacklisting of his IP address](blacklist_forms_en)
-           * [DKIM](dkim)
-        * [Certificates](/certificate)
-            * [Regenerate certificate](/regenerate_certificate_en)
         * [YunoHost Tor Hidden Servicer](/torhiddenservice)
         * [Unblock an IP address with Fail2ban](/fail2ban_en)
 
@@ -71,11 +77,11 @@
     * [Contributor guide](/contribute)
         * Developement
            * [Package new application](/packaging_apps)
-           * [Packages in progress](/apps_in_progress_en)
-           * [Applications wishlist](/apps_wishlist_en)
+           * [Applications in progress](/apps_in_progress_en)
+           * [Wishlist of applications](/apps_wishlist_en)
            * [Creation of system packages](/build_system_en)
            * [Creation of Debian packages](/build_packages_en)
-           * [Create live usb](/create_live_usb)
+           * [Create a live USB image](/create_live_usb)
            * [Build Openresty](/build_openresty)
         * Documentation
            * [Write documentation](/write_documentation)