diff --git a/assets/sass/_theme/blocks/organization_chart.sass b/assets/sass/_theme/blocks/organization_chart.sass
index dafec2c9ab95304bea50d28294dcae2b513bfe1a..6b2aea8528c2b55a068672942e3602b44143807e 100644
--- a/assets/sass/_theme/blocks/organization_chart.sass
+++ b/assets/sass/_theme/blocks/organization_chart.sass
@@ -1,4 +1,8 @@
 .block-organization_chart
+    @include media-breakpoint-up(desktop)
+        @include in-page-without-sidebar
+            .top .description
+                max-width: col(8)
     @include in-page-with-sidebar
         .persons
             @include grid(1, sm)
diff --git a/assets/sass/_theme/blocks/partners.sass b/assets/sass/_theme/blocks/partners.sass
index 00ee86245cf7744721ae630561219b93e2cbe12a..692a80b49e69f180a21d5f1f8e83956aa7df09cb 100644
--- a/assets/sass/_theme/blocks/partners.sass
+++ b/assets/sass/_theme/blocks/partners.sass
@@ -1,4 +1,8 @@
 .block-partners
+    @include media-breakpoint-up(desktop)
+        @include in-page-without-sidebar
+            .top .description
+                max-width: col(8)
     @include in-page-with-sidebar
         .organizations
             @include grid(4, xl)
diff --git a/assets/sass/_theme/blocks/posts.sass b/assets/sass/_theme/blocks/posts.sass
index 48e0a14db6667c1633a92f4029e56acfb4806f9e..43fbd107643e99fa0694b987316858bff2e25538 100644
--- a/assets/sass/_theme/blocks/posts.sass
+++ b/assets/sass/_theme/blocks/posts.sass
@@ -107,8 +107,6 @@
             .media
                 margin-bottom: $spacing0
                 background: none
-                &, img
-                    aspect-ratio: 1
         .list
             margin-top: half($spacing3)
             border-top: 1px solid $color-border
diff --git a/assets/sass/_theme/sections/organizations.sass b/assets/sass/_theme/sections/organizations.sass
index 22ebd94dbfb1674e0925b23ee5bf24e7c01c2245..0c080965a1dcb939456573a7ffa30caf5d01fa7d 100644
--- a/assets/sass/_theme/sections/organizations.sass
+++ b/assets/sass/_theme/sections/organizations.sass
@@ -8,9 +8,11 @@
             text-decoration: none
     .media
         background: $color-background-alt
-        aspect-ratio: 1/1
         padding: $spacing1
         margin-bottom: half($spacing0)
+        picture
+            aspect-ratio: 1/1
+            display: block
         img
             width: 100%
             height: 100%
diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass
index a61bc8ee93399a44a2dd5f970cd4b5b223cb0b17..ab64f87d03358010f2cc029ff9dfee214cb3ae9a 100644
--- a/assets/sass/_theme/sections/persons.sass
+++ b/assets/sass/_theme/sections/persons.sass
@@ -170,6 +170,8 @@ ol.persons--list
     .roles
         a
             @include small
+    .blocks
+        margin-top: $spacing3
     .person-programs
         margin-top: $spacing4
     @include media-breakpoint-down(lg)
diff --git a/layouts/organizations/list.html b/layouts/organizations/list.html
index 77d7a6d6eab549a42f5ad234f0d6a9dd86375207..32e04debdd4cc09f1a214a84f7ff90c95710192b 100644
--- a/layouts/organizations/list.html
+++ b/layouts/organizations/list.html
@@ -9,12 +9,14 @@
   {{ partial "organizations/hero.html" . }}
 
   <div class="document-content">
+    {{ partial "pages/summary.html" (dict
+      "context" .
+      "with_container" true
+    ) }}
+
     {{ partial "blocks/list.html" . }}
 
     <div class="container">
-      {{ partial "pages/summary.html" (dict
-          "context" .
-        ) }}
       {{- if not $is_partners_block_present -}}
         {{ partial "organizations/organizations.html" . }}
         {{ partial "commons/pagination.html" . }}
diff --git a/layouts/partials/commons/image-default.html b/layouts/partials/commons/image-default.html
index dc08e99b28680276be5fdf7ad964bf22b3a5290f..014f0eb47a2a95d79832653f25c60d2645eb6360 100644
--- a/layouts/partials/commons/image-default.html
+++ b/layouts/partials/commons/image-default.html
@@ -1,4 +1,4 @@
-{{ if os.FileExists "static/assets/images/default.png" }}
+{{- if os.FileExists "static/assets/images/default.png" -}}
   {{ $file := "/assets/images/default.png" }}
   {{ $fileDimensions := partial "GetImageDimensions" (dict "context" . "file" $file "static" true) }}
   {{- $lazy := default true .lazy -}}
@@ -14,4 +14,4 @@
     {{- if .class }} class="{{ .class }}"{{- end -}}
     {{- if $lazy }} loading="lazy"{{- end -}}
     >
-{{ end }}
+{{- end -}}
diff --git a/layouts/partials/organizations/contact-details.html b/layouts/partials/organizations/contact-details.html
index 66f8a713c0f8790b16495e421bf9d52dfa707e16..0fecc68df6efe8034fd8182729fb49e1a5decd3d 100644
--- a/layouts/partials/organizations/contact-details.html
+++ b/layouts/partials/organizations/contact-details.html
@@ -1,4 +1,4 @@
-{{ with .Params.contact_details }}
+{{ with .Params }}
   {{ if or .website .linkedin .twitter .email .address .city .zipcode .country .phone }}
     <div class="contacts-details">
       {{ if or .website .linkedin .twitter .email }}
diff --git a/layouts/partials/persons/contact-details.html b/layouts/partials/persons/contact-details.html
index 134e1207be396c9d230d4276afa20b452a05f030..129c68096858c1d592509a41c34e428762b902b1 100644
--- a/layouts/partials/persons/contact-details.html
+++ b/layouts/partials/persons/contact-details.html
@@ -1,4 +1,4 @@
-{{ with .Params.contact_details }}
+{{ with .Params }}
   {{ if or .website .linkedin .twitter .email .phone }}
     <div class="contacts-details contacts-details--person">
       {{ if or .website .linkedin .twitter .email .phone }}