diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index a8c279d4c92fe7ed992657e7110aa587892ba055..05fe2f467064c356ca917d8c8c7a3d1eff374fa2 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -11,6 +11,20 @@ $body-background-color: $color-background !default
 $link-color: $color-text !default
 $link-underline-offset: 0.2em !default
 
+// Grid
+$grid-gutter: px2rem(64) !default
+$grid-max-width: px2rem(1980) !default
+$grid-gutter-sm: px2rem(44) !default
+
+// Spacing
+$spacing0: px2rem(12) !default
+$spacing1: px2rem(24) !default
+$spacing2: px2rem(48) !default
+$spacing3: px2rem(64) !default
+$spacing4: px2rem(128) !default
+$spacing5: px2rem(256) !default
+$spacing-section-y: px2rem(36) !default
+
 // TYPOGRAPHY
 
 // Fonts family
@@ -125,31 +139,17 @@ $quote-style: italic !default
 // Buttons
 $btn-font-size-desktop: px2rem(18) !default // TODO
 $btn-font-size: px2rem(14) !default
-$btn-padding-x-desktop: px2rem(50) !default
+$btn-padding-x-desktop: $spacing1 !default
 $btn-padding-y-desktop: px2rem(15) !default
-$btn-padding-x: px2rem(20) !default
-$btn-padding-y: px2rem(13) !default
+$btn-padding-x: $spacing1 !default
+$btn-padding-y: $spacing0 !default
 $btn-border-radius: px2rem(4) !default
 
-// Spacing
-$spacing0: px2rem(12) !default
-$spacing1: px2rem(24) !default
-$spacing2: px2rem(48) !default
-$spacing3: px2rem(64) !default
-$spacing4: px2rem(128) !default
-$spacing5: px2rem(256) !default
-$spacing-section-y: px2rem(36) !default
-
 // Form
 $form-btn-color: $color-background !default
 $form-btn-background-color: $color-accent !default
 $form-input-border-radius: 4px !default
 
-// Grid
-$grid-gutter: px2rem(64) !default
-$grid-max-width: px2rem(1980) !default
-$grid-gutter-sm: px2rem(44) !default
-
 // Z-index
 $zindex-nav-accessibility: 1010 !default
 $zindex-stretched-link: 2 !default
diff --git a/assets/sass/_theme/blocks/call_to_action.sass b/assets/sass/_theme/blocks/call_to_action.sass
index 32f2f4d99aa155cec805931c7692f4cdc33e6d0e..c28bc965884de7a0f0474f2553a2f85d7359b119 100644
--- a/assets/sass/_theme/blocks/call_to_action.sass
+++ b/assets/sass/_theme/blocks/call_to_action.sass
@@ -20,7 +20,7 @@
             a
                 @include meta
                 color: $block-call-to-action-color
-                margin-right: $spacing2
+                margin-right: $spacing1
                 margin-top: $spacing1
                 text-decoration-color: rgba($block-call-to-action-color, .3)
                 display: inline-block
@@ -49,7 +49,6 @@
             padding: $spacing3 0
             .actions
                 a
-                    margin-right: $spacing1
                     &:last-child
                         margin-bottom: 0
         .call_to_action--with-image
diff --git a/layouts/partials/GetSiteUrl b/layouts/partials/GetSiteUrl
deleted file mode 100644
index 607837ce2e27a42de79a90ff4826408a4a85f64f..0000000000000000000000000000000000000000
--- a/layouts/partials/GetSiteUrl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ $siteUrl := site.BaseURL }}
-{{ $lang := site.LanguageCode }}
-
-{{ if and $lang (gt (len site.Languages) 1) }}
-  {{ $siteUrl = printf "%s%s/" $siteUrl $lang }}
-{{ end }}
-
-{{ return $siteUrl }}
\ No newline at end of file
diff --git a/layouts/partials/footer/logo.html b/layouts/partials/footer/logo.html
index 6465a89642d7d8a9111726a1f01f4ed4e9b4d4f2..36e19f1aee1b66c0f92bb64f79c67eacae650c24 100644
--- a/layouts/partials/footer/logo.html
+++ b/layouts/partials/footer/logo.html
@@ -1,3 +1,3 @@
 {{ $file := site.Params.logo.footer }}
 {{ $fileDimensions := partial "GetImageDimensions" (dict "context" . "file" $file "static" true) }}
-<a class="logo" href="{{ partial "GetSiteUrl" }}"><img src="{{ $file }}" alt="{{ site.Title }}" height="{{ index $fileDimensions 1 }}" width="{{ index $fileDimensions 0 }}" loading="lazy"></a>
+<a class="logo" href="{{ site.Home.Permalink }}"><img src="{{ $file }}" alt="{{ site.Title }}" height="{{ index $fileDimensions 1 }}" width="{{ index $fileDimensions 0 }}" loading="lazy"></a>
diff --git a/layouts/partials/header/hero.html b/layouts/partials/header/hero.html
index d3c557c9e4868841836d6133966462ead8d3c026..773c013b04a32e07fbc0b2f3a93a70815be9c4ce 100644
--- a/layouts/partials/header/hero.html
+++ b/layouts/partials/header/hero.html
@@ -1,6 +1,7 @@
 {{- $direction := "" -}}
 {{- $breadcrumb_is_after_hero := eq site.Params.breadcrumb.position "after-hero"  -}}
 {{- $subtitle := .subtitle -}}
+{{- $description := .description -}}
 {{ if .image }}
   {{- $direction = partial "GetImageDirection" .image -}}
 {{ end }}
@@ -8,6 +9,7 @@
 {{- $summary := partial "PrepareText" .context.Params.summary -}}
 {{- $subtitle_is_summary := false -}}
 
+
 {{ if not $subtitle }}
   {{ if and (eq site.Params.summary.position "hero") $summary }}
    {{ $subtitle = $summary }}
@@ -23,10 +25,15 @@
       {{- end -}}
     {{- end -}}
     <div class="content">
-      {{- if $subtitle -}}
+      {{- if or $subtitle $description -}}
         <hgroup>
           <h1>{{ partial "PrepareHTML" .title }}</h1>
-          <p {{ if $subtitle_is_summary -}} class="lead" {{- end -}}>{{ partial "PrepareHTML" $subtitle }}</p>
+          {{- if $subtitle -}}
+            <p {{ if $subtitle_is_summary -}} class="lead" {{- end -}}>{{ partial "PrepareHTML" $subtitle }}</p>
+          {{- end -}}
+          {{- if $description -}}
+            <p class="h1">{{ partial "PrepareHTML" .description }}</p>
+          {{- end -}}
         </hgroup>
       {{- else -}}
         <h1>{{ partial "PrepareHTML" .title }}</h1>
diff --git a/layouts/partials/header/logo.html b/layouts/partials/header/logo.html
index c90b2a71426c9f1f18904b7ae02d461fb73e8ab1..50ed28873df3c6136dd59d12cbbe19c41d2bdab2 100644
--- a/layouts/partials/header/logo.html
+++ b/layouts/partials/header/logo.html
@@ -1,3 +1,3 @@
 {{ $file := site.Params.logo.header }}
 {{ $fileDimensions := partial "GetImageDimensions" (dict "context" . "file" $file "static" true) }}
-<a class="logo" href="{{ partial "GetSiteUrl" }}"><img src="{{ $file }}" alt="{{ site.Title }}" height="{{ index $fileDimensions 1 }}" width="{{ index $fileDimensions 0 }}"></a>
+<a class="logo" href="{{ site.Home.Permalink }}"><img src="{{ $file }}" alt="{{ site.Title }}" height="{{ index $fileDimensions 1 }}" width="{{ index $fileDimensions 0 }}"></a>