diff --git a/assets/sass/_theme/blocks/base.sass b/assets/sass/_theme/blocks/base.sass
index d8fcbc9026b8539ead675736f670f6e0edaa2171..de7fde9df423590cda099643c8b117df1827805e 100644
--- a/assets/sass/_theme/blocks/base.sass
+++ b/assets/sass/_theme/blocks/base.sass
@@ -1,7 +1,11 @@
-[class^="block-"]
-    @include in-page-with-sidebar
-        h2, h3
-            @extend .h2
-    @include in-page-without-sidebar
-        h2, h3
-            @extend .h5
\ No newline at end of file
+.blocks
+    .block:first-of-type
+        margin-top: 0
+    .block
+        margin-top: $spacing5
+        @include in-page-with-sidebar
+            h2, h3
+                @extend .h2
+        @include in-page-without-sidebar
+            h2, h3
+                @extend .h5
\ No newline at end of file
diff --git a/layouts/partials/blocks/templates/call_to_action.html b/layouts/partials/blocks/templates/call_to_action.html
index fcd70e26d54428421dda0e218ec962960acb9a3d..2fae0fcd15833a1425802a055badca8d9b6c633b 100644
--- a/layouts/partials/blocks/templates/call_to_action.html
+++ b/layouts/partials/blocks/templates/call_to_action.html
@@ -3,7 +3,7 @@
 {{- $title := .block.title -}}
 {{- with .block.data -}}
   {{- $buttons := and .button.text .button_secondary.text -}}
-  <section class="block-call_to_action{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-call_to_action{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         <div class="call_to_action call_to_action--with{{ if not .image }}out{{ end }}-image">
diff --git a/layouts/partials/blocks/templates/chapter.html b/layouts/partials/blocks/templates/chapter.html
index a7f5a881c8e5f91ee2061459de1a61f85a2f8791..417e27199f6bd13a63b6da9386ca077278d9bd8d 100644
--- a/layouts/partials/blocks/templates/chapter.html
+++ b/layouts/partials/blocks/templates/chapter.html
@@ -1,7 +1,7 @@
 {{- $context := .context -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
-{{- $class := "block-chapter" -}}
+{{- $class := "block block-chapter" -}}
 {{- with .block.data -}}
   {{ if .image }}
     {{- $class = printf "%s block-chapter--with-image" $class -}}
diff --git a/layouts/partials/blocks/templates/contact.html b/layouts/partials/blocks/templates/contact.html
index 26993d37d102386863e874ba81f9340396fc3ca8..75cb945c158594e47a97ec85d07770842a5ee79a 100644
--- a/layouts/partials/blocks/templates/contact.html
+++ b/layouts/partials/blocks/templates/contact.html
@@ -1,7 +1,7 @@
 {{- $context := .context -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
-{{- $class := "block-contact" -}}
+{{- $class := "block block-contact" -}}
 {{- with .block.data -}}
   <section class="{{ $class }}{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
diff --git a/layouts/partials/blocks/templates/datatable.html b/layouts/partials/blocks/templates/datatable.html
index b9a9fc927b8bf85e37fb2225939a1cd08107434a..a07cf8b9f0804b63826e360a47279e5d24fea368 100644
--- a/layouts/partials/blocks/templates/datatable.html
+++ b/layouts/partials/blocks/templates/datatable.html
@@ -3,7 +3,7 @@
 {{- $title := .block.title -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
-  <section class="block-datatable{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-datatable{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{- if $title }}
diff --git a/layouts/partials/blocks/templates/definitions.html b/layouts/partials/blocks/templates/definitions.html
index 46eb0adb17f07e3785729c91f28c5509b5db7981..4adc1babda0e78b4202a11aad2b771c8cc419bd5 100644
--- a/layouts/partials/blocks/templates/definitions.html
+++ b/layouts/partials/blocks/templates/definitions.html
@@ -2,7 +2,7 @@
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
-  <section class="block-definitions{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-definitions{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{- if $title }}
diff --git a/layouts/partials/blocks/templates/embed.html b/layouts/partials/blocks/templates/embed.html
index 157a4968ab61483d3119b387d58c80e11d3565ab..263eb21ec01aa8e47acd0342619eef9f455fb82c 100644
--- a/layouts/partials/blocks/templates/embed.html
+++ b/layouts/partials/blocks/templates/embed.html
@@ -2,7 +2,7 @@
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
-  <section class="block-embed{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-embed{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{- if $title }}
diff --git a/layouts/partials/blocks/templates/files.html b/layouts/partials/blocks/templates/files.html
index 2b81f50da4399100ffd360c599c68181ccda09f9..780fabc603bcb6a99ade72d2d710dae2f8215aa6 100644
--- a/layouts/partials/blocks/templates/files.html
+++ b/layouts/partials/blocks/templates/files.html
@@ -2,7 +2,7 @@
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
-  <section class="block-files{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-files{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{- if $title }}
diff --git a/layouts/partials/blocks/templates/gallery.html b/layouts/partials/blocks/templates/gallery.html
index 83aa6f6a4f038f5e98226e6f0a750df0e7a84a18..00dc4cafd559a8b66f1e07964da7c1a5e81efaaf 100644
--- a/layouts/partials/blocks/templates/gallery.html
+++ b/layouts/partials/blocks/templates/gallery.html
@@ -7,7 +7,7 @@
   {{- if $layout -}}
     {{- $layout_class = printf "block-gallery--%s" .layout -}}
   {{- end -}}
-  <section class="block-gallery{{ if $title }} block-with-title{{ end }} {{ $layout_class }}" id="block-{{ $position }}">
+  <section class="block block-gallery{{ if $title }} block-with-title{{ end }} {{ $layout_class }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{- if (or $title .description) }}
diff --git a/layouts/partials/blocks/templates/image.html b/layouts/partials/blocks/templates/image.html
index 84e1ab735b0012e8c16f444de2be6e6cdd902115..4b9f17696ac9b5ba898664b75e029315716e747f 100644
--- a/layouts/partials/blocks/templates/image.html
+++ b/layouts/partials/blocks/templates/image.html
@@ -3,7 +3,7 @@
 {{- $title := .block.title -}}
 {{- with .block.data -}}
   {{- $buttons := and .button.text .button_secondary.text -}}
-  <section class="block-image{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-image{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{/*  TODO: refactor  */}}
diff --git a/layouts/partials/blocks/templates/key_figures.html b/layouts/partials/blocks/templates/key_figures.html
index 856371fef76bdb6f767bdb7a4a98536af9e738df..97d107276609a6e533232df400fe4282d8641ae6 100644
--- a/layouts/partials/blocks/templates/key_figures.html
+++ b/layouts/partials/blocks/templates/key_figures.html
@@ -2,7 +2,7 @@
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
-  <section class="block-key_figures{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-key_figures{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{- if (or $title .description) }}
diff --git a/layouts/partials/blocks/templates/organization_chart.html b/layouts/partials/blocks/templates/organization_chart.html
index 0ffa8dc37fa98a107e00f04f2d71b90978c038a9..d2b27ac64f35ebcb801acf3b0f91551c41e3d116 100644
--- a/layouts/partials/blocks/templates/organization_chart.html
+++ b/layouts/partials/blocks/templates/organization_chart.html
@@ -3,7 +3,7 @@
 {{- $title := .block.title -}}
 {{- with .block.data -}}
   {{- $with_link := .with_link -}}
-<section class="block-organization_chart{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+<section class="block block-organization_chart{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
   <div class="container">
     <div class="block-content">
         {{ if (or $title .description) -}}
diff --git a/layouts/partials/blocks/templates/pages.html b/layouts/partials/blocks/templates/pages.html
index 4b9b233ae841f062fcff2d8640c499deaa6ecf73..aa73cd59e0a0465ba2b3b4c4bfa26515432f0964 100644
--- a/layouts/partials/blocks/templates/pages.html
+++ b/layouts/partials/blocks/templates/pages.html
@@ -1,7 +1,7 @@
 {{- $context := .context -}}
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
-{{- $layout_class := "block-pages--grid" -}}
+{{- $layout_class := "block block-pages--grid" -}}
 {{- with .block.data -}}
   {{- $layout := .layout -}}
 
@@ -36,7 +36,7 @@
     {{ end }}
   {{ end -}}
 
-  <section class="block-pages{{ if $title }} block-with-title{{ end }} {{ $layout_class }} {{ $page_class }}" id="block-{{ $position }}">
+  <section class="block block-pages{{ if $title }} block-with-title{{ end }} {{ $layout_class }} {{ $page_class }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
 
diff --git a/layouts/partials/blocks/templates/partners.html b/layouts/partials/blocks/templates/partners.html
index 213740936ef6e0d376c724a8f5bc4e501b0638d5..451ae964f0487d9e5a22146f47dcd1579094188c 100644
--- a/layouts/partials/blocks/templates/partners.html
+++ b/layouts/partials/blocks/templates/partners.html
@@ -2,7 +2,7 @@
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
-  <section class="block-partners{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-partners{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{ if (or $title .description) -}}
diff --git a/layouts/partials/blocks/templates/posts.html b/layouts/partials/blocks/templates/posts.html
index 210a807432df39c711abc8b2cc0f22220ab46cc5..b218bad19118a5adad4b9d67a66b05569775853c 100644
--- a/layouts/partials/blocks/templates/posts.html
+++ b/layouts/partials/blocks/templates/posts.html
@@ -6,7 +6,7 @@
   {{ if .category }}
     {{- $term = site.GetPage (printf "/categories%s" .category) -}}
   {{ end }}
-  <section class="block-posts{{ if $title }} block-with-title{{ end }} {{ if $term }} term-{{ replace $term.Slug "/" "" }} {{- end -}}" id="block-{{ $position }}">
+  <section class="block block-posts{{ if $title }} block-with-title{{ end }} {{ if $term }} term-{{ replace $term.Slug "/" "" }} {{- end -}}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{ if $title -}}
diff --git a/layouts/partials/blocks/templates/programs.html b/layouts/partials/blocks/templates/programs.html
index d32ed8c2ae9a05178dad8018ae34425cd5f28aa0..a783e9d5662c0d452285bda009ef7b8170b5976a 100644
--- a/layouts/partials/blocks/templates/programs.html
+++ b/layouts/partials/blocks/templates/programs.html
@@ -2,7 +2,7 @@
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
-  <section class="block-programs{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-programs{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{ if $title -}}
diff --git a/layouts/partials/blocks/templates/testimonials.html b/layouts/partials/blocks/templates/testimonials.html
index 0c09398a13e8abe7eb671e996d1fdd96c9a7bbad..b2ec3959f2ee00b93a8cc06533f009f3c9949852 100644
--- a/layouts/partials/blocks/templates/testimonials.html
+++ b/layouts/partials/blocks/templates/testimonials.html
@@ -7,7 +7,7 @@
   {{ if gt (len .testimonials) 1 }}
     {{- $is_carousel = true -}}
   {{ end }}
-  <section class="block-testimonials{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-testimonials{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         {{ if $title -}}
diff --git a/layouts/partials/blocks/templates/timeline.html b/layouts/partials/blocks/templates/timeline.html
index 611095715a4ea5cac7392b77fbc3878c0134e126..a66546ecb8dad079dccb4485753ff0d0ed1709ec 100644
--- a/layouts/partials/blocks/templates/timeline.html
+++ b/layouts/partials/blocks/templates/timeline.html
@@ -2,7 +2,7 @@
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- $layout := .block.data.layout | default "vertical" -}}
-<section class="block-timeline{{ if $title }} block-with-title{{ end }} block-timeline--{{ $layout }}" id="block-{{ $position }}">
+<section class="block block-timeline{{ if $title }} block-with-title{{ end }} block-timeline--{{ $layout }}" id="block-{{ $position }}">
   <div class="container">
     {{ $template := printf "blocks/templates/timeline/%s.html" $layout }}
     {{ partial $template (dict 
diff --git a/layouts/partials/blocks/templates/video.html b/layouts/partials/blocks/templates/video.html
index 60532489f79d896f7d1b833b8dd887238677716d..1d96d895b814cec8ff2f0f3442d1dd1d5945ef6f 100644
--- a/layouts/partials/blocks/templates/video.html
+++ b/layouts/partials/blocks/templates/video.html
@@ -2,7 +2,7 @@
 {{- $position := .block.position -}}
 {{- $title := .block.title -}}
 {{- with .block.data -}}
-  <section class="block-video{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
+  <section class="block block-video{{ if $title }} block-with-title{{ end }}" id="block-{{ $position }}">
     <div class="container">
       <div class="block-content">
         <div>