diff --git a/assets/sass/_theme/design-system/nav.sass b/assets/sass/_theme/design-system/nav.sass
index fa00504b5e60c8156742d5c600a102e5178ac869..bf3541613f265817706ad532a314c0e4ceea9197 100644
--- a/assets/sass/_theme/design-system/nav.sass
+++ b/assets/sass/_theme/design-system/nav.sass
@@ -93,6 +93,8 @@
         @if $header-dropdown-full
             .dropdown-menu
                 inset: 100% 0 auto 0
+                padding-left: 0
+                padding-right: 0
             .nav-level-2
                 @include container
                 @include grid(4, md)
diff --git a/layouts/pages/list.html b/layouts/pages/list.html
index 9488e7b703b4e71ff9703a494be04b5102b52330..9a66396ab61ae68b9faa7ce950d6c0b4bcb2b945 100644
--- a/layouts/pages/list.html
+++ b/layouts/pages/list.html
@@ -19,35 +19,15 @@
       }}
       {{ partial "hooks/after-page-hero.html" . }}
       {{ partial "blocks/list.html" . }}
-
     {{ else }}
-      <!-- FIXME -->
-      {{/*  {{- partial "blocks/templates/pages/grid.html" (dict 
-          "pages" .Params.children
-          "show_images" true
-          "show_descriptions" true
-          ) }}  */}}
       <section class="block block-pages block-pages--grid">
         <div class="container">
           <div class="block-content">
-            <div class="grid">
-              {{ range .Params.children }}
-                {{- $page := partial "GetPageByUrl" . -}}
-                {{ with $page }}
-                  <article>
-                    <h1>
-                      <a href="{{- .Permalink -}}">
-                        {{- partial "PrepareHTML" .Title -}}
-                      </a>
-                    </h1>
-                    {{ if .Params.description_short }}
-                      <p>{{ partial "PrepareHTML" .Params.description_short }}</p>
-                    {{ end }}
-                    {{- partial "pages/page-media.html" . -}}
-                  </article>
-                {{- end -}}
-              {{ end }}
-            </div>
+            {{- partial "blocks/templates/pages/grid.html" (dict 
+                "pages" .Params.children
+                "show_images" true
+                "show_descriptions" true
+                ) }}
           </div>
         </div>
       </section>
diff --git a/layouts/partials/blocks/templates/pages/grid.html b/layouts/partials/blocks/templates/pages/grid.html
index dc7abbedeadd23b93cf5524552b401090971c514..49d6100300524ad20e6c6e54d967f6ce17f0d84f 100644
--- a/layouts/partials/blocks/templates/pages/grid.html
+++ b/layouts/partials/blocks/templates/pages/grid.html
@@ -3,10 +3,19 @@
 
 <div class="grid">
   {{ range .pages }}
-    {{- $page := partial "GetPageByUrl" .page -}}
-    {{- if .slug -}}
-      {{- $page = partial "GetPageByUrl" .slug -}}
-    {{- end -}}
+    {{- $page := false -}}
+
+    {{/*  Check if . is a map or page url  */}}
+    {{ if reflect.IsMap . }}
+      {{- if .page -}}
+        {{- $page = partial "GetPageByUrl" .page -}}
+      {{- else if .slug -}}
+        {{- $page = partial "GetPageByUrl" .slug -}}
+      {{ end }}
+    {{ else }}
+      {{- $page =  partial "GetPageByUrl" . -}}
+    {{ end }}
+
     {{ with $page }}
       <article>
         <h1>
diff --git a/layouts/partials/diplomas/diplomas.html b/layouts/partials/diplomas/diplomas.html
index e4f78898b2ad0b8a5d52a33fd0909f3fff1c1ae3..16cfa85084861e28f87fd8f17bd6b04d021c8f54 100644
--- a/layouts/partials/diplomas/diplomas.html
+++ b/layouts/partials/diplomas/diplomas.html
@@ -8,7 +8,9 @@
       <a href="{{ .Permalink }}" aria-label="{{ i18n "commons.more_aria" (dict "Title" .Title) }}">
         {{- partial "PrepareHTML" .Title -}}
         {{ with .Params.short_name }}
-          ({{ partial "PrepareHTML" . }})
+          <span class="meta">
+            {{ partial "PrepareHTML" . }}
+          </span>
         {{ end }}
       </a>
       {{- if $show_programs }}