diff --git a/layouts/partials/GetMenu b/layouts/partials/GetMenu
index f743ee705db93df4dc4802fa7cd5249becd12a34..3f4b24fa72881a80499611762cca619c3b6443a6 100644
--- a/layouts/partials/GetMenu
+++ b/layouts/partials/GetMenu
@@ -1,12 +1,12 @@
 {{ $kind := . }}
 {{ $menus := index site.Data.menus (printf "%s" site.Language) }}
 {{ $menu := "" }}
-// Try to get menus from the data/menus/<lang> directory
+{{/*  Try to get menus from the data/menus/<lang> directory  */}}
 {{ if (and $menus (isset $menus $kind)) }}
-  // Menu found in data/menus/<lang>
+  {{/* Menu found in data/menus/<lang>  */}}
   {{ $menu = index $menus $kind }}
 {{ else }}
-  // Fallback to menu in the data/menus directory
+  {{/*  Fallback to menu in the data/menus directory  */}}
   {{ $menu = index site.Data.menus $kind }}
 {{ end }}
 
diff --git a/layouts/partials/footer/legals.html b/layouts/partials/footer/legals.html
index 6f01a6c33fed46456e33ccf63833fe49e2932d5d..9faf4ad75385d6e74eda00c3da605e35719f1969 100644
--- a/layouts/partials/footer/legals.html
+++ b/layouts/partials/footer/legals.html
@@ -1,12 +1,10 @@
-<div class="footer-legal">
-  {{ $menu := partial "GetMenu" "legal" }}
-  {{ if $menu }}
-    {{ partial "commons/menu.html"
-      (dict
-        "kind"        "legal"
-        "level"       1
-        "class"       "nav-legal"
-      )}}
-  {{ end }}
-  {{ partial "footer/credit.html" }}
-</div>
\ No newline at end of file
+{{ $menu := partial "GetMenu" "legal" }}
+{{ if $menu }}
+  {{ partial "commons/menu.html"
+    (dict
+      "kind"        "legal"
+      "level"       1
+      "class"       "nav-legal"
+    )}}
+{{ end }}
+{{ partial "footer/credit.html" }}
diff --git a/layouts/partials/footer/social.html b/layouts/partials/footer/social.html
index 0a977cef7eae7a274b51fa93d4c6d802f54d89b2..4b7cb175f65b328a081e31a50adbe295f0e4c890 100644
--- a/layouts/partials/footer/social.html
+++ b/layouts/partials/footer/social.html
@@ -1,11 +1,10 @@
-<div class="footer-social">
-  {{ $menu := partial "GetMenu" "social" }}
-  {{ if $menu }}
-    {{ partial "commons/menu.html"
-      (dict
-        "kind"        "social"
-        "level"       1
-        "class"       "nav-social"
-      )}}
-  {{ end }}
-</div>
+{{ $menu := partial "GetMenu" "social" }}
+{{ if $menu }}
+  {{ partial "commons/menu.html"
+    (dict
+      "kind"        "social"
+      "level"       1
+      "class"       "nav-social"
+    )}}
+{{ end }}
+
diff --git a/layouts/partials/header/header.html b/layouts/partials/header/header.html
index cb886f37287a56fbd65bc672ab0f84793fef4a4b..f0ab7dce143b4e88d003861bd9cff212c7f9dda6 100644
--- a/layouts/partials/header/header.html
+++ b/layouts/partials/header/header.html
@@ -3,7 +3,6 @@
   <nav aria-label="{{ i18n "commons.menu.main" }}">
     <div class="container">
       {{ partial "header/logo.html" }}
-      {{ $menu := partial "GetMenu" "primary" }}
       {{ partial "header/button.html" }}
       <div class="menu" id="navigation">
         {{ partial "commons/menu.html"