diff --git a/assets/stylesheets/base/formhack.css b/assets/stylesheets/base/formhack.css
index a9b37e2..37b9b77 100644
--- a/assets/stylesheets/base/formhack.css
+++ b/assets/stylesheets/base/formhack.css
@@ -39,7 +39,7 @@
 
   /* Layout */
   --fh-layout-display: block;
-  --fh-layout-margin: var(--grid-gutter) 0; /* change to "10px auto" to center */
+  --fh-layout-margin: calc(var(--spacing) * 1) 0; /* change to "10px auto" to center */
   --fh-layout-text-align: left;
 }
 
@@ -83,7 +83,7 @@ label {
   font-size: 0.875em;
 
   & + input {
-    margin-top: calc(var(--grid-gutter) * 0.25)
+    margin-top: calc(var(--spacing) * 0.25)
   }
 }
 
@@ -136,6 +136,7 @@ input[type="url"],
 input[type="week"],
 input[list] {
   height: var(--fh-input-height);
+  line-height: var(--fh-input-height);
   -webkit-appearance: none;
 }
 
diff --git a/assets/stylesheets/base/forms.css b/assets/stylesheets/base/forms.css
index bc9e50f..c1a2029 100644
--- a/assets/stylesheets/base/forms.css
+++ b/assets/stylesheets/base/forms.css
@@ -1,10 +1,10 @@
 @block form-item {
   & + .form-item {
-    margin-top: var(--grid-gutter);
+    margin-top: var(--spacing);
   }
 
   & input {
-    margin-bottom: calc(var(--grid-gutter) * 0.25);
+    margin: 0 0 calc(var(--spacing) * 0.25);
   }
 
   @element help-text {
@@ -30,8 +30,8 @@
 
 @block status-block {
   display: flex;
-  margin: var(--grid-gutter) 0;
-  padding: calc(var(--grid-gutter) * 1);
+  margin: var(--spacing) 0;
+  padding: calc(var(--spacing) * 0.5);
   border-radius: var(--border-radius);
 
   font-size: 0.875em;
@@ -48,7 +48,7 @@
     flex: 0 0 auto;
     width: 24px;
     height: 24px;
-    margin-right: calc(var(--grid-gutter) * 0.5);
+    margin-right: calc(var(--spacing) * 0.25);
   }
 
   @element content {
diff --git a/assets/stylesheets/base/typography.css b/assets/stylesheets/base/typography.css
index a30e46f..53f5ea5 100644
--- a/assets/stylesheets/base/typography.css
+++ b/assets/stylesheets/base/typography.css
@@ -27,6 +27,9 @@ p, label, .form-item {
 }
 
 p {
+  &:first-child {
+    margin-top: 0;
+  }
   &:last-child {
     margin-bottom: 0;
   }
diff --git a/assets/stylesheets/course/card.css b/assets/stylesheets/course/card.css
index fe3676d..731ed7f 100644
--- a/assets/stylesheets/course/card.css
+++ b/assets/stylesheets/course/card.css
@@ -1,14 +1,14 @@
 @block course-card {
   display: flex;
   flex-direction: column;
-  padding: var(--grid-gutter);
+  padding: var(--spacing);
 
   border-radius: var(--border-radius);
   box-shadow: var(--card-box-shadow);
 
   @element categories {
     flex: 0 0 var(--line-height);
-    margin-bottom: var(--grid-gutter);
+    margin-bottom: calc(var(--spacing) * 0.5);
     height: var(--line-height);
   }
 
@@ -40,8 +40,8 @@
     margin: 0;
     overflow: hidden;
 
-    padding-bottom: var(--grid-gutter);
-    margin-bottom: var(--grid-gutter);
+    padding-bottom: calc(var(--spacing) * 0.5);
+    margin-bottom: calc(var(--spacing) * 0.5);
     border-bottom: 1px solid var(--color-bg-separator);
 
     font-family: var(--font-medium);
@@ -54,7 +54,7 @@
     flex: 0 1 15vh;
     max-height: 120px;
     overflow: hidden;
-    margin: 0 0 var(--grid-gutter);
+    margin: 0 0 calc(var(--spacing));
 
     line-height: 1.63;
     color: var(--color-course-card-description);
diff --git a/assets/stylesheets/course/index.css b/assets/stylesheets/course/index.css
index ad98f88..1a512b2 100644
--- a/assets/stylesheets/course/index.css
+++ b/assets/stylesheets/course/index.css
@@ -2,7 +2,7 @@
 
 @block course {
   @element title {
-    margin-bottom: calc(var(--grid-gutter));
+    margin-bottom: calc(var(--spacing));
   }
 
   @element overview {
@@ -13,13 +13,13 @@
       border-radius: var(--border-radius);
       box-shadow: var(--card-box-shadow);
       width: 228px;
-      margin: 0 0 var(--grid-gutter) var(--grid-gutter);
+      margin: 0 0 var(--spacing) var(--spacing);
     }
   }
 
   @element overview-title {
     border-bottom: 1px solid var(--color-sidebar-seperator);
-    padding: calc(var(--grid-gutter) / 2) 0;
+    padding: calc(var(--spacing) / 2) 0;
     margin: 0;
     line-height: 1.31;
     font-weight: normal;
@@ -30,7 +30,7 @@
   @element overview-item {
     display: flex;
     align-items: center;
-    padding: calc(var(--grid-gutter) / 2);
+    padding: calc(var(--spacing) / 2);
     border-bottom: 1px solid var(--color-sidebar-seperator);
 
     line-height: 1.54;
@@ -41,7 +41,7 @@
     flex: 0 0 auto;
     width: 24px;
     height: 24px;
-    padding-right: calc(var(--grid-gutter) / 2);
+    padding-right: calc(var(--spacing) / 2);
   }
 
   @element overview-value {
@@ -49,7 +49,7 @@
   }
 
   @element overview-cta-wrapper {
-    padding: calc(var(--grid-gutter) / 2) 0;
+    padding: calc(var(--spacing) / 2) 0;
     text-align: center;
   }
   @element overview-cta {
diff --git a/assets/stylesheets/global/breadcrumb.css b/assets/stylesheets/global/breadcrumb.css
index 8f80cc4..b24ab05 100644
--- a/assets/stylesheets/global/breadcrumb.css
+++ b/assets/stylesheets/global/breadcrumb.css
@@ -1,5 +1,5 @@
 @block breadcrumb {
-  margin-bottom: calc(var(--grid-gutter) * 0.25);
+  margin-bottom: calc(var(--spacing) * 0.25);
 
   font-size: 0.875em;
 
@@ -22,7 +22,7 @@
         background-repeat: no-repeat;
         width: 4px;
         height: 8px;
-        padding: 0 calc(var(--grid-gutter) / 4);
+        padding: 0 calc(var(--spacing) * 0.25);
       }
 
       &:last-child:after{
diff --git a/assets/stylesheets/global/footer.css b/assets/stylesheets/global/footer.css
index 8904125..7ecc2f2 100644
--- a/assets/stylesheets/global/footer.css
+++ b/assets/stylesheets/global/footer.css
@@ -1,6 +1,9 @@
 @block footer {
-  margin-top: var(--grid-gutter) 0;
-  padding: var(--grid-gutter) 0;
+  padding: var(--spacing) 0;
+
+  & p {
+    margin: 0;
+  }
 
   @element upper {
     display: flex;
@@ -32,7 +35,7 @@
       width: 138px;
 
       & + a {
-        margin-left: var(--grid-gutter);
+        margin-left: calc(var(--spacing) * 0.25);
       }
 
       & img {
@@ -57,7 +60,7 @@
     flex: 0 0 auto;
     width: 24px;
     height: 27px;
-    margin-right: var(--grid-gutter);
+    margin-right: calc(var(--spacing) * 0.5);
   }
 
   @element disclaimer-text {
@@ -72,10 +75,10 @@
     flex: 0 0 auto;
     display: flex;
     align-items: center;
-    padding: 0 var(--grid-gutter);
+    padding: 0 0 0 var(--spacing);
 
     & a + a {
-      margin-left: var(--grid-gutter);
+      margin-left: calc(var(--spacing) * 0.5);
     }
 
     & img {
diff --git a/assets/stylesheets/global/header.css b/assets/stylesheets/global/header.css
index 46d9028..a6d542f 100644
--- a/assets/stylesheets/global/header.css
+++ b/assets/stylesheets/global/header.css
@@ -1,5 +1,5 @@
 @block header {
-  margin-bottom: var(--grid-gutter);
+  margin-bottom: calc(var(--spacing) * 0.75);
 
   @media (--breakpoint-desktop) {
     flex-wrap: nowrap;
@@ -7,7 +7,7 @@
 
   @element upper-wrapper {
     background: var(--color-palette-blue-dark);
-    padding: calc(var(--grid-gutter) / 2) 0;
+    padding: calc(var(--spacing) * 0.25) 0;
     color: var(--color-header-upper-text-secondary);
   }
 
@@ -54,10 +54,10 @@
 
   @element upper-copy {
     display: inline-flex;
-    margin: 0 0 calc(var(--grid-gutter) / 2);
+    margin: 0 0 calc(var(--spacing) / 4);
 
     @media (--breakpoint-desktop) {
-      margin: 0 calc(var(--grid-gutter) / 2) 0 0;
+      margin: 0 calc(var(--spacing) / 2) 0 0;
     }
   }
 
@@ -65,7 +65,7 @@
     display: inline-block;
     width: 20px;
     height: 20px;
-    margin-right: calc(var(--grid-gutter) / 4);
+    margin-right: calc(var(--spacing) / 4);
   }
 
   @element lower-wrapper {
@@ -75,7 +75,7 @@
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
-    padding: var(--grid-gutter) 0 calc(var(--grid-gutter) / 4);
+    padding: calc(var(--spacing) * 0.5) 0 calc(var(--spacing) * 0.25);
     border-bottom: 1px solid var(--color-bg-separator);
   }
 
@@ -91,11 +91,11 @@
       display: inline-block;
       width: 24px;
       height: auto;
-      margin-right: calc(var(--grid-gutter) / 2);
+      margin-right: calc(var(--spacing) / 4);
     }
 
     @media (--breakpoint-desktop) {
-      margin: 0 calc(var(--grid-gutter) / 2) 0 0;
+      margin: 0 calc(var(--spacing) / 2) 0 0;
     }
   }
 
@@ -106,6 +106,7 @@
 
     @media (--breakpoint-desktop) {
       flex: 0 0 200px;
+      justify-content: start;
     }
 
     & img {
@@ -133,8 +134,8 @@
     position: relative;
 
     display: flex;
-    margin: 0 0 calc(var(--grid-gutter) / 2);
-    padding: 0 calc(var(--grid-gutter) / 2);
+    margin: 0 0 calc(var(--spacing) * 0.5);
+    padding: calc(var(--spacing) * 0.0625) calc(var(--spacing) / 2);
 
     border: none;
     background: var(--color-palette-blue-medium);
@@ -146,14 +147,13 @@
     }
 
     @media (--breakpoint-desktop) {
-      margin: 0 calc(var(--grid-gutter) / 2) 0 0;
+      margin: 0 calc(var(--spacing) * 0.75) 0 0;
     }
   }
 
   @element controls_label {
     position: relative;
     z-index: 1;
-    font-family: var(--font-medium);
     cursor: pointer;
   }
 
@@ -164,7 +164,7 @@
 
     width: 260px;
     max-width: 90vw;
-    margin: calc(var(--grid-gutter) / 2 - 4px) 0 0;
+    margin: calc(var(--spacing) / 2 - 4px) 0 0;
 
     opacity: 0;
     background: #fff;
@@ -193,7 +193,7 @@
   }
 
   @element controls_help_text {
-    padding: calc(var(--grid-gutter) / 2);
+    padding: calc(var(--spacing) / 2);
     color: var(--color-text-grey);
   }
 
diff --git a/assets/stylesheets/global/main-navigation.css b/assets/stylesheets/global/main-navigation.css
index 5095169..652319d 100644
--- a/assets/stylesheets/global/main-navigation.css
+++ b/assets/stylesheets/global/main-navigation.css
@@ -1,40 +1,40 @@
 @block main-navigation {
-    & ul {
-      display: flex;
-      list-style: none;
-      flex-wrap: wrap;
-      justify-content: center;
-      margin: 0;
-      padding: 0;
+  & ul {
+    display: flex;
+    list-style: none;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin: 0;
+    padding: 0;
 
-      @media (--breakpoint-desktop) {
-        justify-content: flex-end;
+    @media (--breakpoint-desktop) {
+      justify-content: flex-end;
+    }
+
+    & li {
+      margin: 0;
+
+      & + li {
+        margin-left: calc(var(--spacing) / 4);
       }
 
-      & li {
-        margin: 0;
+      & a {
+        display: block;
+        text-transform: uppercase;
+        font-weight: bold;
+        padding: 0.7em 1em;
+        color: var(--color-text-grey);
+        border-radius: var(--border-radius);
 
-        & + li {
-          margin-left: calc(var(--grid-gutter) / 4);
+        &.active,
+        &:hover {
+          background: var(--color-bg-grey);
         }
 
-        & a {
-          display: block;
-          text-transform: uppercase;
-          font-weight: bold;
-          padding: 0.7em 1em;
-          color: var(--color-text-grey);
-          border-radius: var(--border-radius);
-
-          &.active,
-          &:hover {
-            background: var(--color-bg-grey);
-          }
-
-          &.active {
-            color: var(--color-text-default);
-          }
+        &.active {
+          color: var(--color-text-default);
         }
       }
     }
   }
+}
diff --git a/assets/stylesheets/global/sidebar-menu.css b/assets/stylesheets/global/sidebar-menu.css
index bda62c7..cbfa4be 100644
--- a/assets/stylesheets/global/sidebar-menu.css
+++ b/assets/stylesheets/global/sidebar-menu.css
@@ -6,7 +6,7 @@
   }
 
   @element item {
-    margin: 0 0 calc(var(--grid-gutter) / 4);
+    margin: 0 0 calc(var(--spacing) * 0.5);
     padding: 0;
     font-size: 0.9em;
     line-height: 1.8;
diff --git a/assets/stylesheets/global/table-of-contents.css b/assets/stylesheets/global/table-of-contents.css
index effc65c..ab8037d 100644
--- a/assets/stylesheets/global/table-of-contents.css
+++ b/assets/stylesheets/global/table-of-contents.css
@@ -1,5 +1,6 @@
 :root {
-  --toc-gap-left: calc(var(--grid-gutter) / 2)
+  --toc-gap-left: calc(var(--spacing));
+  --toc-gap-total: calc(var(--toc-gap-left) + var(--spacing) * 0.5);
 }
 @block table-of-contents {
   @element list {
@@ -10,7 +11,7 @@
   }
 
   @element item {
-    margin: 0 0 calc(var(--grid-gutter) / 4);
+    margin: 0 0 calc(var(--spacing) * 0.25);
     padding: 0;
     font-size: 0.9em;
     line-height: 1.8;
@@ -36,7 +37,7 @@
       }
       &:before {
         content: '';
-        left: calc(var(--toc-gap-left) * 3 * -1);
+        left: calc(var(--toc-gap-total) * -1 + 4px);
         bottom: 0;
         width: 3px;
         background: var(--color-course-active);
@@ -57,7 +58,7 @@
         width: 16px;
         height: 16px;
         top: 50%;
-        left: calc(var(--toc-gap-left) * 2 * -1);
+        left: calc(var(--toc-gap-total) / 2 * -1 - 8px);
         transform: translateY(-50%);
 
         background: url('/images/icon-viewed.svg') no-repeat center center;
diff --git a/assets/stylesheets/landing-page/modules/copy.css b/assets/stylesheets/landing-page/modules/copy.css
index 2a1fa44..317aaf4 100644
--- a/assets/stylesheets/landing-page/modules/copy.css
+++ b/assets/stylesheets/landing-page/modules/copy.css
@@ -3,7 +3,7 @@
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
-    padding: calc(var(--grid-gutter) * 0.75) 0;
+    padding: calc(var(--spacing) * 0.75) 0;
     background-color: var(--module-copy-emphasized-bg);
     border-radius: var(--border-radius);
     color: var(--module-copy-emphasized-color);
@@ -24,10 +24,10 @@
     @modifier emphasized {
       flex: 1 1 auto;
       width: 50vw;
-      padding: 0 var(--grid-gutter);
+      padding: 0 var(--spacing);
 
       @media (--breakpoint-desktop) {
-        padding-left: var(--grid-gutter);
+        padding-left: var(--spacing);
       }
     }
   }
@@ -41,7 +41,7 @@
 
       @media (--breakpoint-desktop) {
         flex: 1 1 auto;
-        padding: 0 var(--grid-gutter);
+        padding: 0 var(--spacing);
         width: 20vw;
       }
     }
diff --git a/assets/stylesheets/landing-page/modules/highlighted-course.css b/assets/stylesheets/landing-page/modules/highlighted-course.css
index 2e56796..cb4f744 100644
--- a/assets/stylesheets/landing-page/modules/highlighted-course.css
+++ b/assets/stylesheets/landing-page/modules/highlighted-course.css
@@ -34,7 +34,7 @@
     display: flex;
     flex-direction: column;
 
-    padding: var(--grid-gutter) calc(var(--grid-gutter) * 2);
+    padding: var(--spacing) calc(var(--spacing) * 2);
 
     color: var(--color-text-dark-bg-grey);
   }
@@ -45,7 +45,7 @@
 
   @element category {
     display: inline-block;
-    margin-right: var(--grid-gutter);
+    margin-right: var(--spacing);
 
     font-size: 0.75em;
     letter-spacing: 2px;
@@ -53,7 +53,7 @@
 
   @element title {
     flex: 1 1 auto;
-    margin: 0;
+    margin: 0 0 calc(var(--spacing) * 0.25);
 
     color: var(--color-text-dark-bg);
     font-size: 4vw;
@@ -81,7 +81,7 @@
 
   @element link-wrapper {
     flex: 0 0 auto;
-    margin-top: var(--grid-gutter);
+    margin-top: var(--spacing);
   }
 
   @element link {
diff --git a/assets/stylesheets/landing-page/modules/index.css b/assets/stylesheets/landing-page/modules/index.css
index d469be1..ca56016 100644
--- a/assets/stylesheets/landing-page/modules/index.css
+++ b/assets/stylesheets/landing-page/modules/index.css
@@ -13,6 +13,6 @@
   }
 
   & + .module {
-    margin-top: var(--grid-gutter);
+    margin-top: var(--spacing);
   }
 }
diff --git a/assets/stylesheets/layout/grid-list.css b/assets/stylesheets/layout/grid-list.css
index 02cb275..50e0188 100644
--- a/assets/stylesheets/layout/grid-list.css
+++ b/assets/stylesheets/layout/grid-list.css
@@ -4,18 +4,18 @@
   justify-content: space-between;
 
   @media (--breakpoint-desktop) {
-    flex: 0 0 calc(50% - var(--grid-gutter));
-    margin: 0 calc(var(--grid-gutter) / 2 * -1);
+    flex: 0 0 calc(50% - var(--spacing));
+    margin: 0 calc(var(--spacing) / 2 * -1);
   }
 
   @element item {
     flex: 0 0 100%;
-    margin-bottom: var(--grid-gutter);
+    margin-bottom: var(--spacing);
 
     @media (--breakpoint-desktop) {
       box-sizing: border-box;
-      flex: 0 0 calc(50% - var(--grid-gutter));
-      margin: 0 calc(var(--grid-gutter) / 2) var(--grid-gutter);
+      flex: 0 0 calc(50% - var(--spacing));
+      margin: 0 calc(var(--spacing) / 2) var(--spacing);
     }
   }
 }
diff --git a/assets/stylesheets/layout/layout-no-sidebar.css b/assets/stylesheets/layout/layout-no-sidebar.css
index f28cd95..5b9448f 100644
--- a/assets/stylesheets/layout/layout-no-sidebar.css
+++ b/assets/stylesheets/layout/layout-no-sidebar.css
@@ -1,11 +1,11 @@
 @block layout-no-sidebar {
-  padding: 0 calc(var(--grid-gutter) / 2);
+  padding: 0 calc(var(--spacing) / 2);
   max-width: var(--content-max-width);
   margin: 0 auto;
   width: 100%;
   box-sizing: border-box;
 
   @media (--breakpoint-desktop) {
-    padding-left: calc(var(--layout-sidebar-sidebar-width) + var(--grid-gutter));
+    padding-left: calc(var(--layout-sidebar-sidebar-width) + var(--spacing));
   }
 }
diff --git a/assets/stylesheets/layout/layout-sidebar.css b/assets/stylesheets/layout/layout-sidebar.css
index 2b15ee1..d992f1b 100644
--- a/assets/stylesheets/layout/layout-sidebar.css
+++ b/assets/stylesheets/layout/layout-sidebar.css
@@ -1,5 +1,5 @@
 @block layout-sidebar {
-  padding: 0 calc(var(--grid-gutter) / 2);
+  padding: 0 calc(var(--spacing) / 2);
   max-width: var(--content-max-width);
   margin: 0 auto;
 
@@ -18,7 +18,7 @@
   }
 
   @element sidebar-header {
-    padding: calc(var(--grid-gutter) / 2) var(--grid-gutter);
+    padding: calc(var(--spacing) / 2) var(--spacing);
     border-bottom: 1px solid var(--color-sidebar-seperator);
   }
 
@@ -31,19 +31,18 @@
 
   @element sidebar-content {
     background: var(--color-sidebar-bg);
-    padding: var(--grid-gutter);
+    padding: calc(var(--spacing) * 0.5);
   }
 
   @element content {
     display: flex;
     flex-direction: column;
-    padding-top: calc(var(--grid-gutter) / 4);
 
     @media (--breakpoint-desktop) {
       flex: 0 1 var(--layout-sidebar-content-width);
       width: 100%;
       box-sizing: border-box;
-      margin-left: var(--grid-gutter);
+      margin-left: var(--spacing);
     }
 
     & > * {
diff --git a/assets/stylesheets/lesson/index.css b/assets/stylesheets/lesson/index.css
index c92fff6..0b997da 100644
--- a/assets/stylesheets/lesson/index.css
+++ b/assets/stylesheets/lesson/index.css
@@ -1,5 +1,5 @@
 @block lesson-module {
-  margin-top: var(--grid-gutter);
+  margin-top: var(--spacing);
 
   & img {
     width: 100%;
@@ -9,7 +9,7 @@
 
 @block lesson {
   @element title {
-    margin-bottom: calc(var(--grid-gutter));
+    margin-bottom: var(--spacing);
   }
 
   @element cta {
diff --git a/assets/stylesheets/variables.css b/assets/stylesheets/variables.css
index bae8656..9e251bb 100644
--- a/assets/stylesheets/variables.css
+++ b/assets/stylesheets/variables.css
@@ -2,7 +2,7 @@
 
 :root {
   --content-max-width: 980px;
-  --grid-gutter: 22px;
+  --spacing: 32px;
   --border-radius: 4px;
 
   --line-height: 1.5em;
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 7bf2aa3..18ef54f 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -524,6 +524,10 @@ p a:hover, label a:hover, .form-item a:hover {
   text-decoration: underline;
 }
 
+p:first-child {
+  margin-top: 0;
+}
+
 p:last-child {
   margin-bottom: 0;
 }
@@ -571,7 +575,7 @@ fieldset,
   vertical-align: top;
 
   display: block;
-  margin: 22px 0;
+  margin: 32px 0;
   text-align: left;
 }
 
@@ -582,14 +586,14 @@ datalist {
 
 label {
   display: block;
-  margin: 22px 0 0 0;
+  margin: 32px 0 0 0;
   text-align: left;
   font-weight: bold;
   font-size: 0.875em
 }
 
 label + input {
-  margin-top: 5.5px;
+  margin-top: 8px;
 }
 
 /* Input & Textarea ------------------ */
@@ -641,6 +645,7 @@ input[type="url"],
 input[type="week"],
 input[list] {
   height: 40px;
+  line-height: 40px;
   -webkit-appearance: none;
 }
 
@@ -772,11 +777,11 @@ input[type="reset"]:focus,
 }
 
 .form-item + .form-item {
-  margin-top: 22px;
+  margin-top: 32px;
 }
 
 .form-item input {
-  margin-bottom: 5.5px;
+  margin: 0 0 8px;
 }
 
 .form-item__help-text {
@@ -803,8 +808,8 @@ input[type="reset"]:focus,
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
-  margin: 22px 0;
-  padding: 22px;
+  margin: 32px 0;
+  padding: 16px;
   border-radius: 4px;
 
   font-size: 0.875em;
@@ -824,7 +829,7 @@ input[type="reset"]:focus,
             flex: 0 0 auto;
     width: 24px;
     height: 24px;
-    margin-right: 11px;
+    margin-right: 8px;
 }
 
 .status-block__content {
@@ -854,7 +859,7 @@ input[type="reset"]:focus,
 }
 
 .layout-no-sidebar {
-  padding: 0 11px;
+  padding: 0 16px;
   max-width: 980px;
   margin: 0 auto;
   width: 100%;
@@ -865,12 +870,12 @@ input[type="reset"]:focus,
 @media (min-width: 700px) {
 
   .layout-no-sidebar {
-    padding-left: 250px;
+    padding-left: 260px;
   }
 }
 
 .layout-sidebar {
-  padding: 0 11px;
+  padding: 0 16px;
   max-width: 980px;
   margin: 0 auto;
 }
@@ -901,7 +906,7 @@ input[type="reset"]:focus,
 }
 
 .layout-sidebar__sidebar-header {
-    padding: 11px 22px;
+    padding: 16px 32px;
     border-bottom: 1px solid #eeeeee;
 }
 
@@ -914,7 +919,7 @@ input[type="reset"]:focus,
 
 .layout-sidebar__sidebar-content {
     background: #f7f9fa;
-    padding: 22px;
+    padding: 16px;
 }
 
 .layout-sidebar__content {
@@ -925,7 +930,6 @@ input[type="reset"]:focus,
     -webkit-box-direction: normal;
         -ms-flex-direction: column;
             flex-direction: column;
-    padding-top: 5.5px;
 }
 
 @media (min-width: 700px) {
@@ -937,7 +941,7 @@ input[type="reset"]:focus,
     width: 100%;
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
-    margin-left: 22px;
+    margin-left: 32px;
   }
 }
 
@@ -961,9 +965,9 @@ input[type="reset"]:focus,
 
   .grid-list {
     -webkit-box-flex: 0;
-        -ms-flex: 0 0 calc(50% - 22px);
-            flex: 0 0 calc(50% - 22px);
-    margin: 0 -11px;
+        -ms-flex: 0 0 calc(50% - 32px);
+            flex: 0 0 calc(50% - 32px);
+    margin: 0 -16px;
   }
 }
 
@@ -971,7 +975,7 @@ input[type="reset"]:focus,
     -webkit-box-flex: 0;
         -ms-flex: 0 0 100%;
             flex: 0 0 100%;
-    margin-bottom: 22px;
+    margin-bottom: 32px;
 }
 
 @media (min-width: 700px) {
@@ -980,14 +984,14 @@ input[type="reset"]:focus,
     -webkit-box-sizing: border-box;
             box-sizing: border-box;
     -webkit-box-flex: 0;
-        -ms-flex: 0 0 calc(50% - 22px);
-            flex: 0 0 calc(50% - 22px);
-    margin: 0 11px 22px;
+        -ms-flex: 0 0 calc(50% - 32px);
+            flex: 0 0 calc(50% - 32px);
+    margin: 0 16px 32px;
   }
 }
 
 .header {
-  margin-bottom: 22px;
+  margin-bottom: 24px;
 }
 
 @media (min-width: 700px) {
@@ -1000,7 +1004,7 @@ input[type="reset"]:focus,
 
 .header__upper-wrapper {
     background: #3072be;
-    padding: 11px 0;
+    padding: 8px 0;
     color: #abc6e5;
 }
 
@@ -1098,13 +1102,13 @@ input[type="reset"]:focus,
     display: -webkit-inline-box;
     display: -ms-inline-flexbox;
     display: inline-flex;
-    margin: 0 0 11px;
+    margin: 0 0 8px;
 }
 
 @media (min-width: 700px) {
 
   .header__upper-copy {
-    margin: 0 11px 0 0;
+    margin: 0 16px 0 0;
   }
 }
 
@@ -1112,7 +1116,7 @@ input[type="reset"]:focus,
     display: inline-block;
     width: 20px;
     height: 20px;
-    margin-right: 5.5px;
+    margin-right: 8px;
 }
 
 .header__lower-wrapper {}
@@ -1126,7 +1130,7 @@ input[type="reset"]:focus,
     -webkit-box-pack: justify;
         -ms-flex-pack: justify;
             justify-content: space-between;
-    padding: 22px 0 5.5px;
+    padding: 16px 0 8px;
     border-bottom: 1px solid #e5ebed;
 }
 
@@ -1147,13 +1151,13 @@ input[type="reset"]:focus,
   display: inline-block;
   width: 24px;
   height: auto;
-  margin-right: 11px;
+  margin-right: 8px;
 }
 
 @media (min-width: 700px) {
 
   .header__title {
-    margin: 0 11px 0 0;
+    margin: 0 16px 0 0;
   }
 }
 
@@ -1175,6 +1179,9 @@ input[type="reset"]:focus,
     -webkit-box-flex: 0;
         -ms-flex: 0 0 200px;
             flex: 0 0 200px;
+    -webkit-box-pack: start;
+        -ms-flex-pack: start;
+            justify-content: start;
   }
 }
 
@@ -1224,8 +1231,8 @@ input[type="reset"]:focus,
     display: -ms-flexbox;
 
     display: flex;
-    margin: 0 0 11px;
-    padding: 0 11px;
+    margin: 0 0 16px;
+    padding: 2px 16px;
 
     border: none;
     background: #3c80cf;
@@ -1240,14 +1247,13 @@ input[type="reset"]:focus,
 @media (min-width: 700px) {
 
   .header__controls_group {
-    margin: 0 11px 0 0;
+    margin: 0 24px 0 0;
   }
 }
 
 .header__controls_label {
     position: relative;
     z-index: 1;
-    font-family: 'robotomedium', Helvetica, sans-serif;
     cursor: pointer;
 }
 
@@ -1259,7 +1265,7 @@ input[type="reset"]:focus,
 
     width: 260px;
     max-width: 90vw;
-    margin: 7px 0 0;
+    margin: 12px 0 0;
 
     opacity: 0;
     background: #fff;
@@ -1291,7 +1297,7 @@ input[type="reset"]:focus,
 }
 
 .header__controls_help_text {
-    padding: 11px;
+    padding: 16px;
     color: #8091a5;
 }
 
@@ -1319,8 +1325,11 @@ input[type="reset"]:focus,
 }
 
 .footer {
-  margin-top: 22px 0;
-  padding: 22px 0;
+  padding: 32px 0;
+}
+
+.footer p {
+  margin: 0;
 }
 
 .footer__upper {
@@ -1373,7 +1382,7 @@ input[type="reset"]:focus,
 }
 
 .footer__apps a + a {
-  margin-left: 22px;
+  margin-left: 8px;
 }
 
 .footer__apps a img {
@@ -1406,7 +1415,7 @@ input[type="reset"]:focus,
             flex: 0 0 auto;
     width: 24px;
     height: 27px;
-    margin-right: 22px;
+    margin-right: 16px;
 }
 
 .footer__disclaimer-text {
@@ -1429,11 +1438,11 @@ input[type="reset"]:focus,
     -webkit-box-align: center;
         -ms-flex-align: center;
             align-items: center;
-    padding: 0 22px;
+    padding: 0 0 0 32px;
 }
 
 .footer__social a + a {
-  margin-left: 22px;
+  margin-left: 16px;
 }
 
 .footer__social img {
@@ -1447,11 +1456,11 @@ input[type="reset"]:focus,
     list-style: none;
     margin: 0;
     padding: 0;
-    padding-left: 11px;
+    padding-left: 32px;
 }
 
 .table-of-contents__item {
-    margin: 0 0 5.5px;
+    margin: 0 0 8px;
     padding: 0;
     font-size: 0.9em;
     line-height: 1.8;
@@ -1480,7 +1489,7 @@ input[type="reset"]:focus,
 
 .table-of-contents__link.active:before {
   content: '';
-  left: -33px;
+  left: -44px;
   bottom: 0;
   width: 3px;
   background: #536171;
@@ -1502,7 +1511,7 @@ input[type="reset"]:focus,
   width: 16px;
   height: 16px;
   top: 50%;
-  left: -22px;
+  left: -32px;
   -webkit-transform: translateY(-50%);
           transform: translateY(-50%);
   background: url('/images/icon-viewed.svg') no-repeat center center;
@@ -1518,7 +1527,7 @@ input[type="reset"]:focus,
 }
 
 .sidebar-menu__item {
-    margin: 0 0 5.5px;
+    margin: 0 0 16px;
     padding: 0;
     font-size: 0.9em;
     line-height: 1.8;
@@ -1566,7 +1575,7 @@ input[type="reset"]:focus,
 }
 
 .main-navigation ul li + li {
-  margin-left: 5.5px;
+  margin-left: 8px;
 }
 
 .main-navigation ul li a {
@@ -1579,7 +1588,7 @@ input[type="reset"]:focus,
 }
 
 .main-navigation ul li a.active,
-          .main-navigation ul li a:hover {
+        .main-navigation ul li a:hover {
   background: #f7f9fa;
 }
 
@@ -1588,7 +1597,7 @@ input[type="reset"]:focus,
 }
 
 .breadcrumb {
-  margin-bottom: 5.5px;
+  margin-bottom: 8px;
 
   font-size: 0.875em;
 }
@@ -1617,7 +1626,7 @@ input[type="reset"]:focus,
   background-repeat: no-repeat;
   width: 4px;
   height: 8px;
-  padding: 0 5.5px;
+  padding: 0 8px;
 }
 
 .breadcrumb ul li:last-child:after {
@@ -1789,7 +1798,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
   -webkit-box-direction: normal;
       -ms-flex-direction: column;
           flex-direction: column;
-  padding: 22px;
+  padding: 32px;
 
   border-radius: 4px;
   -webkit-box-shadow: 0 1px 3px 1px rgba(0, 0, 0, .1);
@@ -1800,7 +1809,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
     -webkit-box-flex: 0;
         -ms-flex: 0 0 1.5em;
             flex: 0 0 1.5em;
-    margin-bottom: 22px;
+    margin-bottom: 16px;
     height: 1.5em;
 }
 
@@ -1834,8 +1843,8 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
     margin: 0;
     overflow: hidden;
 
-    padding-bottom: 22px;
-    margin-bottom: 22px;
+    padding-bottom: 16px;
+    margin-bottom: 16px;
     border-bottom: 1px solid #e5ebed;
 
     font-family: 'robotomedium', Helvetica, sans-serif;
@@ -1850,7 +1859,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
             flex: 0 1 15vh;
     max-height: 120px;
     overflow: hidden;
-    margin: 0 0 22px;
+    margin: 0 0 32px;
 
     line-height: 1.63;
     color: #536171;
@@ -1881,7 +1890,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 .course {}
 
 .course__title {
-    margin-bottom: 22px;
+    margin-bottom: 32px;
 }
 
 .course__overview {
@@ -1896,13 +1905,13 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
     -webkit-box-shadow: 0 1px 3px 1px rgba(0, 0, 0, .1);
             box-shadow: 0 1px 3px 1px rgba(0, 0, 0, .1);
     width: 228px;
-    margin: 0 0 22px 22px;
+    margin: 0 0 32px 32px;
   }
 }
 
 .course__overview-title {
     border-bottom: 1px solid #eeeeee;
-    padding: 11px 0;
+    padding: 16px 0;
     margin: 0;
     line-height: 1.31;
     font-weight: normal;
@@ -1917,7 +1926,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
     -webkit-box-align: center;
         -ms-flex-align: center;
             align-items: center;
-    padding: 11px;
+    padding: 16px;
     border-bottom: 1px solid #eeeeee;
 
     line-height: 1.54;
@@ -1930,7 +1939,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
             flex: 0 0 auto;
     width: 24px;
     height: 24px;
-    padding-right: 11px;
+    padding-right: 16px;
 }
 
 .course__overview-value {
@@ -1940,7 +1949,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 }
 
 .course__overview-cta-wrapper {
-    padding: 11px 0;
+    padding: 16px 0;
     text-align: center;
 }
 
@@ -1963,7 +1972,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
             justify-content: space-between;
     -ms-flex-wrap: wrap;
         flex-wrap: wrap;
-    padding: 16.5px 0;
+    padding: 24px 0;
     background-color: #8091a5;
     border-radius: 4px;
     color: #c3cfd5;
@@ -1992,13 +2001,13 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
           -ms-flex: 1 1 auto;
               flex: 1 1 auto;
       width: 50vw;
-      padding: 0 22px;
+      padding: 0 32px;
 }
 
 @media (min-width: 700px) {
 
   .module-copy__first--emphasized {
-    padding-left: 22px;
+    padding-left: 32px;
   }
 }
 
@@ -2025,7 +2034,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
     -webkit-box-flex: 1;
         -ms-flex: 1 1 auto;
             flex: 1 1 auto;
-    padding: 0 22px;
+    padding: 0 32px;
     width: 20vw;
   }
 }
@@ -2138,7 +2147,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
         -ms-flex-direction: column;
             flex-direction: column;
 
-    padding: 22px 44px;
+    padding: 32px 64px;
 
     color: #a9b9c0;
 }
@@ -2151,7 +2160,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 
 .module-higlighted-course__category {
     display: inline-block;
-    margin-right: 22px;
+    margin-right: 32px;
 
     font-size: 0.75em;
     letter-spacing: 2px;
@@ -2161,7 +2170,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
     -webkit-box-flex: 1;
         -ms-flex: 1 1 auto;
             flex: 1 1 auto;
-    margin: 0;
+    margin: 0 0 8px;
 
     color: #fff;
     font-size: 4vw;
@@ -2199,7 +2208,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
     -webkit-box-flex: 0;
         -ms-flex: 0 0 auto;
             flex: 0 0 auto;
-    margin-top: 22px;
+    margin-top: 32px;
 }
 
 .module-higlighted-course__link {
@@ -2226,7 +2235,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 }
 
 .module + .module {
-  margin-top: 22px;
+  margin-top: 32px;
 }
 
 .modules-container {
@@ -2236,7 +2245,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 }
 
 .lesson-module {
-  margin-top: 22px;
+  margin-top: 32px;
 }
 
 .lesson-module img {
@@ -2247,7 +2256,7 @@ github.com style (c) Vasily Polovnyov <vast@whiteants.net>
 .lesson {}
 
 .lesson__title {
-    margin-bottom: 22px;
+    margin-bottom: 32px;
 }
 
 .lesson__cta {