diff --git a/assets/sass/_theme/sections/diplomas.sass b/assets/sass/_theme/sections/diplomas.sass
index 98f3b6c8a8d5dd7624507e4a8748a65c0b799558..a25876df4f58723a7147f7437861a744fd47cb0a 100644
--- a/assets/sass/_theme/sections/diplomas.sass
+++ b/assets/sass/_theme/sections/diplomas.sass
@@ -52,11 +52,11 @@ ul.diplomas
                     @include icon(list-hyphen, before)
                         margin-left: 1px
                         margin-right: half($spacing0)
-                        margin-top: 7px
+                        margin-top: 6px
                         @include media-breakpoint-up(sm)
                             margin-right: $spacing0
                         @include media-breakpoint-up(md)
-                            margin-top: 9px
+                            margin-top: 8px
                     display: flex
                     ol
                         margin-left: $spacing1
diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass
index cee274383e3067218ae558e0e20fd35185d16c94..076fa264a174891e236ea66c3c96d7c6f4b4bb11 100644
--- a/assets/sass/_theme/sections/programs.sass
+++ b/assets/sass/_theme/sections/programs.sass
@@ -10,6 +10,7 @@ ol.programs
     @include list-section
     li
         a:nth-child(2)
+            margin-top: unset
             white-space: nowrap
             @include media-breakpoint-up(desktop)
                 margin-left: $spacing1
@@ -30,6 +31,8 @@ ol.programs
 
     ol.programs
         margin-bottom: $spacing3
+        li
+            line-height: 1
     .dropdown-share
         position: relative
         > button
@@ -175,26 +178,30 @@ ol.programs
             position: relative
             padding-bottom: $spacing0
             padding-top: $spacing0
-            @include media-breakpoint-up(desktop)
+            @include media-breakpoint-up(sm)
                 @include grid(2)
-            @include icon(arrow-right, after, true)
-                color: inherit
-                position: absolute
-                right: 0
-                top: $spacing0
-                margin-top: px2rem(12)
             a
+                align-items: center
+                display: flex
                 color: inherit
                 text-decoration: none
                 @include stretched-link(before)
                 @include media-breakpoint-down(desktop)
                     margin-right: $spacing1
+                @include icon(arrow-right, after, true)
+                    color: inherit
+                    position: absolute
+                    right: 0
+                @include media-breakpoint-down(sm)
+                    width: 100%
             p
                 align-self: center
                 margin-top: unset
                 @include small
                 @include media-breakpoint-up(desktop)
                     margin-right: $spacing1
+                @include media-breakpoint-down(sm)
+                    display: block
             &:hover
                 color: $color-accent
             &:first-child
diff --git a/layouts/partials/blocks/templates/contact.html b/layouts/partials/blocks/templates/contact.html
index 41e3fd30c2d235337f2163e7d41c40c98a71de57..5a7c81d4149464747a2fcccf0438d0aaec3aa523 100644
--- a/layouts/partials/blocks/templates/contact.html
+++ b/layouts/partials/blocks/templates/contact.html
@@ -44,7 +44,7 @@
                   </span>
                   {{ end }}
                   {{ if .country }}
-                  <span itemprop="postalCode">
+                  <span itemprop="addressCountry">
                     {{ partial "PrepareHTML" .country }}
                   </span>
                   {{ end }}
diff --git a/layouts/partials/programs/toc.html b/layouts/partials/programs/toc.html
index 42a04f3a6432fbda54fdb92640d39db13838d21f..2a0746a92db9ca4bf80c5a44bc6a92e50412c671 100644
--- a/layouts/partials/programs/toc.html
+++ b/layouts/partials/programs/toc.html
@@ -42,7 +42,7 @@
         </ol>
     </li>
     <li>
-      <a href="#pedagogy">{{ i18n "programs.toc.pedagogy" }}</a>
+      <a href="#{{ urlize (i18n "programs.toc.pedagogy") }}">{{ i18n "programs.toc.pedagogy" }}</a>
       {{- if or $content $pedagogy $evaluation $teachers }}
       <ol>
         {{- if $content -}}
@@ -61,7 +61,7 @@
       {{ end -}}
     </li>
     <li>
-      <a href="#results">{{ i18n "programs.toc.results" }}</a>
+      <a href="#{{ urlize (i18n "programs.toc.results") }}">{{ i18n "programs.toc.results" }}</a>
       {{- if or $opportunities $results }}
       <ol>
         {{- if $opportunities -}}
@@ -74,7 +74,7 @@
       {{ end -}}
     </li>
     <li>
-      <a href="#admission">{{ i18n "programs.toc.admission" }}</a>
+      <a href="#{{ urlize (i18n "programs.toc.admission") }}">{{ i18n "programs.toc.admission" }}</a>
       {{- if or $prerequisites $pricing $registration $accessibility $other $roles $contacts }}
       <ol>
         {{- if $prerequisites -}}