diff --git a/resources/public/styles/layouts/main-layout.scss b/resources/public/styles/layouts/main-layout.scss
index a481c2a26..01117b059 100644
--- a/resources/public/styles/layouts/main-layout.scss
+++ b/resources/public/styles/layouts/main-layout.scss
@@ -2,13 +2,6 @@
   display: flex;
   height: 100%;
   position: relative;
-
-  .workspace-content {
-    display: flex;
-    height: 100%;
-    width: 100%;
-  }
-
 }
 
 .dashboard-content {
diff --git a/resources/public/styles/main.scss b/resources/public/styles/main.scss
index e5e7da6e4..01ee6f102 100644
--- a/resources/public/styles/main.scss
+++ b/resources/public/styles/main.scss
@@ -31,7 +31,6 @@
 
 @import 'partials/main-bar';
 @import 'partials/workspace-bar';
-@import 'partials/workspace-rules';
 @import 'partials/workspace-canvas';
 @import 'partials/element-options';
 @import 'partials/tool-bar';
diff --git a/resources/public/styles/partials/workspace-canvas.scss b/resources/public/styles/partials/workspace-canvas.scss
index 2b1053f45..097c9ca49 100644
--- a/resources/public/styles/partials/workspace-canvas.scss
+++ b/resources/public/styles/partials/workspace-canvas.scss
@@ -1,11 +1,9 @@
-.workspace-canvas {
-  box-sizing: border-box;
-  height: calc(100vh - 50px);
-  margin: 0 230px 0 230px;
-  overflow: scroll;
+.workspace-content {
+  display: flex;
+  height: 100%;
   width: 100%;
-  transition: none;
   position: relative;
+  margin: 0 230px 0 230px;
 
   &.no-tool-bar-right {
     margin-right: 0;
@@ -15,33 +13,79 @@
     margin-left: 0;
   }
 
-  .viewport {
-    &.drawing {
-      cursor: cell;
+  .workspace-canvas {
+    box-sizing: border-box;
+    height: calc(100vh - 70px);
+
+    overflow: scroll;
+    width: 100%;
+
+    transition: none;
+    /* margin: 0 230px 0 230px; */
+
+    margin-top: 20px;
+    margin-left: 20px;
+    margin-right: 460px;
+
+    &.no-tool-bar-right.no-tool-bar-left{
+      margin-right: 0px;
     }
 
-    svg {
-      g.shape {
-        &.selected {
-          circle.top-left { cursor: nwse-resize; }
-          circle.bottom-right { cursor: nwse-resize; }
-          circle.top-right { cursor: nesw-resize; }
-          circle.bottom-left { cursor: nesw-resize; }
+    &.no-tool-bar-left {
+      margin-right: 230px;
+    }
+
+    &.no-tool-bar-right {
+      margin-right: 230px;
+    }
+
+    /* .viewport-container { */
+    /*   height: 4069px; */
+    /*   width: 4069px; */
+    /* } */
+
+    .viewport {
+      &.drawing {
+        cursor: cell;
+      }
+
+      svg {
+        g.shape {
+          &.selected {
+            circle.top-left { cursor: nwse-resize; }
+            circle.bottom-right { cursor: nwse-resize; }
+            circle.top-right { cursor: nesw-resize; }
+            circle.bottom-left { cursor: nesw-resize; }
+          }
+        }
+
+        rect.selection-rect {
+          fill: rgba(235, 215, 92, 0.1);
+          stroke: #000000;
+          stroke-width: 0.1px;
+
         }
       }
+    }
 
-      rect.selection-rect {
-        fill: rgba(235, 215, 92, 0.1);
-        stroke: #000000;
-        stroke-width: 0.1px;
-
-      }
+    .viewport, .page-canvas, .page-layout {
+      /* overflow: visible; */
     }
   }
 
-  .viewport, .page-canvas, .page-layout {
-    overflow: visible;
+  /* Rules */
+
+  .horizontal-rule {
+    transition: none;
+    position: absolute;
+    pointer-events: none;
+    top: 0px;
   }
 
-
-}
+  .vertical-rule {
+    transition: none;
+    position: absolute;
+    pointer-events: none;
+    left: 0px;
+  }
+}
\ No newline at end of file
diff --git a/resources/public/styles/partials/workspace-rules.scss b/resources/public/styles/partials/workspace-rules.scss
deleted file mode 100644
index 028cbbc70..000000000
--- a/resources/public/styles/partials/workspace-rules.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.workspace-content {
-  .horizontal-rule {
-    transition: none;
-    position: absolute;
-    pointer-events: none;
-  }
-  .vertical-rule {
-    transition: none;
-    position: absolute;
-    pointer-events: none;
-  }
-}