diff --git a/public/styles/style-old.css b/public/styles/style-old.css
index d236ca83..2ff27514 100644
--- a/public/styles/style-old.css
+++ b/public/styles/style-old.css
@@ -92,7 +92,7 @@
 }
 
 #page_content {
-    max-height: calc(100vh - 108px);
+    /*max-height: calc(100vh - 108px);*/
 }
     .fullscreen #page_content {
         position: absolute;
@@ -655,11 +655,7 @@
 }
 
 .chartViewCanvas {
-<<<<<<< HEAD
     width: 80px;
-=======
-    width: 60px;
->>>>>>> b375b9fdb2584c2cd6311834bd6c540545d075b4
     display: inline-block;
 }
 
diff --git a/public/styles/style.css b/public/styles/style.css
index 2ff27514..0713dfbd 100644
--- a/public/styles/style.css
+++ b/public/styles/style.css
@@ -195,11 +195,14 @@
 
     .fulldesk #column_l {
         width: 100%;
-        height: unset;
+        /*height: unset;*/
+        /*max-height: unset;*/
+        /*overflow-y: unset;*/
         margin-left: unset;
-        overflow-y: unset;
         padding: 0;
-        max-height: unset;
+        max-height:100vh;
+        height:100vh;
+        overflow-y:hidden;
     }
     .fulldesk #column_l_bottomgap {
         display: none;
@@ -763,7 +766,6 @@
     top: 0;
     right: 0;
     border-left: 2px solid lightgray;
-    display: none;
 }
 #DeskToolsRefreshButton {
     float: right;