diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index 68e56d06..c5e96bf4 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -2611,6 +2611,8 @@ textarea {
     line-height: 1.71428571;
     color: var(--color-primary);
     font-weight: 100;
+    text-align: right;
+    position: absolute;
     right: 0;
     padding: 12.5px
 }
diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 0bab5b53..29028b36 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -438,3 +438,43 @@ div.log {
 .error-list {
     margin-top: 5px;
   }
+
+body > div.container-fluid > div.row-fluid > div.col-sm-10 {
+  max-height: calc(100vh - 111px);
+  overflow-y: auto;
+}
+
+body > div.container-fluid > div.row-fluid > div.col-sm-2 {
+  max-height: calc(100vh - 111px);
+  overflow-y: auto;
+  /* hide scrollbar in IE, Edge */
+  -ms-overflow-style: none;
+
+  /* hide scrollbar in Firefox */
+  scrollbar-width: none;
+}
+
+/* hide scrollbar in WebKit browsers (Chrome, Safari, Opera) */
+body > div.container-fluid > div.row-fluid > div.col-sm-2::-webkit-scrollbar {
+  display: none;
+}
+
+.scrollable-col {
+  /* keep vertical scrolling */
+  overflow-y: auto;
+
+  /* hide scrollbar in IE, Edge */
+  -ms-overflow-style: none;
+
+  /* hide scrollbar in Firefox */
+  scrollbar-width: none;
+}
+
+/* hide scrollbar in WebKit browsers (Chrome, Safari, Opera) */
+.scrollable-col::-webkit-scrollbar {
+  display: none;
+}
+
+body > div.container-fluid  {
+  padding-right: 0px;
+}
\ No newline at end of file
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 815246a8..9138d80e 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -410,17 +410,17 @@ $(function() {
         });
 
         // fix for infinite scroll on CaliBlur Theme (#981)
-        if ($("body").hasClass("blur")) {
-            $(".col-sm-10").bind("scroll", function () {
-                if (
-                    $(this).scrollTop() + $(this).innerHeight() >=
-                    $(this)[0].scrollHeight
-                ) {
-                    $loadMore.infiniteScroll("loadNextPage");
-                    window.history.replaceState({}, null, $loadMore.infiniteScroll("getAbsolutePath"));
-                }
-            });
-        }
+
+        $(".col-sm-10").bind("scroll", function () {
+            if (
+                $(this).scrollTop() + $(this).innerHeight() >=
+                $(this)[0].scrollHeight
+            ) {
+                $loadMore.infiniteScroll("loadNextPage");
+                window.history.replaceState({}, null, $loadMore.infiniteScroll("getAbsolutePath"));
+            }
+        });
+
     }
 
     $("#restart").click(function() {