diff --git a/dev/scss/header/header.scss b/dev/scss/header/header.scss
index 8b4e0a5..c9d2c3d 100644
--- a/dev/scss/header/header.scss
+++ b/dev/scss/header/header.scss
@@ -69,7 +69,7 @@
       top: 0;
       right: 0;
       margin-right: 0;
-      width: 22px;
+      width: ($standard-margin / 2);
       background-color: $dark-green;
       text-align: center;
       height: 100%;
diff --git a/dev/scss/main/kwic.scss b/dev/scss/main/kwic.scss
index f04cf9b..3676663 100644
--- a/dev/scss/main/kwic.scss
+++ b/dev/scss/main/kwic.scss
@@ -90,12 +90,7 @@
 	  > * {
 	    background-color: transparent;
 	  }
-	  padding: {
-	    top: 0;
-	    right: 0;
-	    bottom: 5pt;
-	    left: 5pt;
-	  };
+	  padding: 2pt 0 5pt 5pt;
 	  margin: {
 	    top: 0;
 	    right: $right-match-distance; // 3em;
diff --git a/dev/scss/main/main.scss b/dev/scss/main/main.scss
index 9cadd4b..8f23bbd 100644
--- a/dev/scss/main/main.scss
+++ b/dev/scss/main/main.scss
@@ -18,7 +18,7 @@
 main {
   margin: {
     left: $standard-margin; 
-    right: $standard-margin; // Todo: -16px
+    right: ($standard-margin / 2);
   }
   padding-bottom: 20pt;
   &.embedded {
diff --git a/dev/scss/main/sidebar.scss b/dev/scss/main/sidebar.scss
index b454055..5d9d4df 100644
--- a/dev/scss/main/sidebar.scss
+++ b/dev/scss/main/sidebar.scss
@@ -33,7 +33,7 @@
     position: absolute;
     right: 0;
     bottom: 0;
-    margin-right: -30px;
+    margin-right: -1 * ($standard-margin / 2);
     background-color: $dark-green;
     font-family: FontAwesome;
     content: $fa-bars;
@@ -135,7 +135,7 @@
 
 
 aside:not(:focus):not(.active) {
-  margin-left: -1 * ($logo-left-distance - 15px);
+  margin-left: -1 * ($logo-left-distance - ($standard-margin / 2));
 //  box-shadow: none;
 /*
   overflow-y: hidden;
diff --git a/dev/scss/util.scss b/dev/scss/util.scss
index 7f5f723..a349bd4 100644
--- a/dev/scss/util.scss
+++ b/dev/scss/util.scss
@@ -90,9 +90,9 @@
 /**
  * Margins
  */
-$standard-margin: 30px;
-$right-distance: 30px;
-$right-match-distance: 20px;
+$standard-margin: 40px;
+$right-distance: 40px;
+$right-match-distance: $standard-margin / 2;
 $logo-left-distance: 230px;