diff --git a/resources/public/styles/base.scss b/resources/public/styles/base.scss
index e9c70d172..c9e55ac8f 100644
--- a/resources/public/styles/base.scss
+++ b/resources/public/styles/base.scss
@@ -10,6 +10,7 @@ body {
 }
 
 * {
+  box-sizing: border-box;
   transition: all .4s ease;
 }
 
diff --git a/resources/public/styles/layouts/main-layout.scss b/resources/public/styles/layouts/main-layout.scss
index 01117b059..4953bd059 100644
--- a/resources/public/styles/layouts/main-layout.scss
+++ b/resources/public/styles/layouts/main-layout.scss
@@ -5,8 +5,8 @@
 }
 
 .dashboard-content {
-  box-sizing: border-box;
   display: flex;
   flex-direction: column;
+  height: calc(100vh - 60px);
   width: 100%;
 }
diff --git a/resources/public/styles/partials/activity-bar.scss b/resources/public/styles/partials/activity-bar.scss
index bbc5764f6..3fd0e6271 100644
--- a/resources/public/styles/partials/activity-bar.scss
+++ b/resources/public/styles/partials/activity-bar.scss
@@ -23,7 +23,6 @@
 
   .date-ribbon {
     background-color: lighten($color-gray-light, 12%);
-    box-sizing: border-box;
     color: $color-white;
     font-size: $fs12;
     font-weight: bold;
@@ -34,7 +33,6 @@
 
   .activity-input {
     border-bottom: 1px solid $color-gray-lighter;
-    box-sizing: border-box;
     display: flex;
     font-size: $fs13;
     padding: $small;
diff --git a/resources/public/styles/partials/color-palette.scss b/resources/public/styles/partials/color-palette.scss
index fe3474f73..1cee5378d 100644
--- a/resources/public/styles/partials/color-palette.scss
+++ b/resources/public/styles/partials/color-palette.scss
@@ -4,7 +4,6 @@
   background-color: $color-white;
   border-top: 1px solid $color-gray-lighter;
   bottom: 0;
-  box-sizing: border-box;
   display: flex;
   left: 0;
   padding: 1rem;
diff --git a/resources/public/styles/partials/dashboard-grid.scss b/resources/public/styles/partials/dashboard-grid.scss
index 3dbbace0d..f1541155a 100644
--- a/resources/public/styles/partials/dashboard-grid.scss
+++ b/resources/public/styles/partials/dashboard-grid.scss
@@ -3,9 +3,13 @@
   display: flex;
   flex-direction: column;
   font-size: $fs14;
-  padding: $medium 250px $medium $medium;
+  height: 100%;
+  padding: $medium;
+  // ACTIVITY BAR PADDING
+  //padding: $medium 250px $medium $medium;
 
   .dashboard-title {
+    margin: $medium 0;
     position: relative;
     width: 100%;
 
@@ -47,16 +51,12 @@
 
   .dashboard-grid-content {
     align-items: center;
-    box-sizing: border-box;
     display: flex;
     flex-wrap: wrap;
     height: 100%;
     justify-content: center;
-    margin: $big;
-    max-height: 77vh;
     min-height: 60vh;
     overflow: scroll;
-    padding-bottom: 30px;
     width: 100%;
 
     .grid-item {
@@ -72,11 +72,11 @@
       padding: $medium;
       position: relative;
       text-align: center;
-      width: 20%;
+      width: 18%;
 
       &.small-item {
         max-width: 12%;
-        min-width: 150px;
+        min-width: 190px;
       }
 
       &.add-project {
@@ -128,7 +128,6 @@
 
         .project-th-actions {
           align-items: center;
-          box-sizing: border-box;
           bottom: 0;
           display: flex;
           left: 0;
diff --git a/resources/public/styles/partials/library-bar.scss b/resources/public/styles/partials/library-bar.scss
index 9b029be64..320482351 100644
--- a/resources/public/styles/partials/library-bar.scss
+++ b/resources/public/styles/partials/library-bar.scss
@@ -54,6 +54,7 @@
         cursor: pointer;
         display: flex;
         flex-direction: column;
+        flex-shrink: 0;
         padding: 10px;
 
         .element-title {
diff --git a/resources/public/styles/partials/lightbox.scss b/resources/public/styles/partials/lightbox.scss
index 2f4628f8b..e76c5abb2 100644
--- a/resources/public/styles/partials/lightbox.scss
+++ b/resources/public/styles/partials/lightbox.scss
@@ -14,7 +14,6 @@
     align-items: center;
     background-color: $color-white;
     border-radius: $br-medium;
-    box-sizing: border-box;
     display: flex;
     flex-direction: column;
     padding: $medium $x-big;
diff --git a/resources/public/styles/partials/main-bar.scss b/resources/public/styles/partials/main-bar.scss
index 51191c3ed..fa13cebb6 100644
--- a/resources/public/styles/partials/main-bar.scss
+++ b/resources/public/styles/partials/main-bar.scss
@@ -2,7 +2,7 @@
   align-items: center;
   background-color: $primary-ui-bg;
   display: flex;
-  height: 50px;
+  height: 60px;
   padding: $x-small $medium;
   position: relative;
   z-index: 10;
@@ -71,7 +71,6 @@
     background-color: $color-white;
     border-radius: $br-small;
     border: 1px solid $soft-ui-border;
-    box-sizing: border-box;
     min-width: 150px;
     padding: 0 $small;
     position: absolute;
diff --git a/resources/public/styles/partials/project-bar.scss b/resources/public/styles/partials/project-bar.scss
index 0fcfb4575..a487ed458 100644
--- a/resources/public/styles/partials/project-bar.scss
+++ b/resources/public/styles/partials/project-bar.scss
@@ -21,7 +21,6 @@
 
     .project-name {
       border-bottom: 1px solid $color-gray-lighter;
-      box-sizing: border-box;
       font-size: $fs14;
       font-weight: bold;
       padding: 0 $small;
@@ -45,7 +44,6 @@
 
   li {
     align-items: center;
-    box-sizing: border-box;
     cursor: pointer;
     display: flex;
     padding: $x-small $small;
diff --git a/resources/public/styles/partials/sidebar-element-options.scss b/resources/public/styles/partials/sidebar-element-options.scss
index 271d9f3fe..dd28a9063 100644
--- a/resources/public/styles/partials/sidebar-element-options.scss
+++ b/resources/public/styles/partials/sidebar-element-options.scss
@@ -55,7 +55,6 @@
     margin-left: $x-small;
 
     .element-set-title {
-      box-sizing: border-box;
       border-bottom: 1px dashed $soft-ui-border;
       color: $medium-ui-text;
       font-weight: bold;
@@ -75,7 +74,6 @@
   .input-text {
     background-color: transparent;
     border-color: $soft-ui-border;
-    box-sizing: border-box;
     color: $intense-ui-text;
     font-size: $fs13;
     margin: $x-small;
diff --git a/resources/public/styles/partials/sidebar-layers.scss b/resources/public/styles/partials/sidebar-layers.scss
index 31583803e..fc13e6b60 100644
--- a/resources/public/styles/partials/sidebar-layers.scss
+++ b/resources/public/styles/partials/sidebar-layers.scss
@@ -55,7 +55,6 @@
   }
 
   li {
-    box-sizing: border-box;
     cursor: pointer;
     display: flex;
     flex-direction: column;
@@ -80,7 +79,6 @@
     .element-list-body {
       align-items: center;
       border-bottom: 1px solid $soft-ui-border;
-      box-sizing: border-box;
       display: flex;
       padding: $small;
       width: 100%;
diff --git a/resources/public/styles/partials/sidebar-sitemap.scss b/resources/public/styles/partials/sidebar-sitemap.scss
index f97ce5940..ae3c44e87 100644
--- a/resources/public/styles/partials/sidebar-sitemap.scss
+++ b/resources/public/styles/partials/sidebar-sitemap.scss
@@ -3,7 +3,6 @@
   .project-title {
     align-items: center;
     border-bottom: 1px solid $soft-ui-border;
-    box-sizing: border-box;
     display: flex;
     padding: $x-small;
     width: 100%;
@@ -49,7 +48,6 @@
     li {
       align-items: center;
       border-bottom: 1px solid $soft-ui-border;
-      box-sizing: border-box;
       display: flex;
       flex-direction: row;
       padding: $x-small;
diff --git a/resources/public/styles/partials/sidebar.scss b/resources/public/styles/partials/sidebar.scss
index ecd8443bc..2006c7cf8 100644
--- a/resources/public/styles/partials/sidebar.scss
+++ b/resources/public/styles/partials/sidebar.scss
@@ -1,7 +1,6 @@
 .settings-bar {
   background-color: $primary-ui-bg;
   bottom: 0;
-  box-sizing: border-box;
   height: 100%;
   position: fixed;
   right: 0;
@@ -14,7 +13,6 @@
 
   .settings-bar-inside {
     align-items: center;
-    box-sizing: border-box;
     display: flex;
     flex-direction: column;
     overflow-y: auto;
diff --git a/resources/public/styles/partials/workspace-bar.scss b/resources/public/styles/partials/workspace-bar.scss
index 240f0c8d6..f31af5b6a 100644
--- a/resources/public/styles/partials/workspace-bar.scss
+++ b/resources/public/styles/partials/workspace-bar.scss
@@ -3,7 +3,7 @@
   background-color: $primary-ui-bg;
   border-bottom: 1px solid  $soft-ui-border;
   display: flex;
-  height: 40px;
+  height: 50px;
   padding: $x-small $medium $x-small 65px;
   position: relative;
   z-index: 11;
@@ -46,7 +46,6 @@
     align-items: center;
     background-color: $secondary-ui-bg;
     border-radius: $br-small;
-    box-sizing: border-box;
     cursor: pointer;
     display: flex;
     min-width: 164px;
diff --git a/resources/public/styles/partials/workspace-canvas.scss b/resources/public/styles/partials/workspace-canvas.scss
index 88d58ce61..2b12c873f 100644
--- a/resources/public/styles/partials/workspace-canvas.scss
+++ b/resources/public/styles/partials/workspace-canvas.scss
@@ -1,6 +1,5 @@
 .workspace-content {
   background-color: $canvas-bg;
-  box-sizing: border-box;
   display: flex;
   height: 100%;
   width: 100%;
@@ -20,7 +19,6 @@
   }
 
   .workspace-canvas {
-    box-sizing: border-box;
     height: calc(100vh - 50px);
     overflow: scroll;
     transition: none;