diff --git a/src/index.html b/src/index.html
index 985ce3b7..a5bf768f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -69,7 +69,9 @@
             <span data-i18n="redo"></span>
           </button>
         </div>
-        <div id="tree-view-output"></div>
+        <div class="tree-content">
+          <div id="tree-view-output"></div>
+        </div>
       </div>
       <div class="source" id="source-view">
         <div class="source-controls">
diff --git a/src/styles/global.css b/src/styles/global.css
index e3675eba..ee8e7302 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -149,10 +149,14 @@ body {
 }
 
 .tree {
-  padding: 1rem;
+  position: relative;
+}
+
+.tree-content {
   overflow-y: auto;
   padding-bottom: 50vh;
-  position: relative;
+  height: 100%;
+  padding: 1rem;
 }
 
 .source {
@@ -167,7 +171,6 @@ body {
 
 .source textarea {
   width: 100%;
-  /* height: calc(100vh - 56px); */
   height: 100%;
   padding: 1.3rem 0.4rem;
   border: none;
@@ -182,7 +185,7 @@ body {
   resize: none;
   background-color: var(--background);
   color: var(--text);
-  /* transition:all var(--style-transition); */
+  transition: background-color var(--style-transition), color var(--style-transition)
 }
 
 .source textarea::selection {
@@ -194,7 +197,7 @@ body {
   display: flex;
   flex-direction: row-reverse;
   position: absolute;
-  right: 0;
+  right: 17px;
   top: 0;
   padding: 5px;
 }
@@ -210,16 +213,11 @@ body {
   visibility: hidden;
   flex-direction: column;
   position: absolute;
-  right: 0;
+  right: 17px;
   top: 37px;
   padding: 5px;
 }
 
-.source-controls,
-.source-controls-menu {
-  right: 17px
-}
-
 .gutter {
   border-color: var(--border) !important;
   transition: border-color var(--style-transition);
@@ -301,6 +299,7 @@ body {
   background-color: var(--errors-background);
   color: var(--errors-text);
   fill: var(--errors-text);
+  transition: fill var(--style-transition);
 }
 
 .errors:not(.active) .error-list {
diff --git a/src/styles/nodes.css b/src/styles/nodes.css
index 300a0f7f..d2f0f325 100644
--- a/src/styles/nodes.css
+++ b/src/styles/nodes.css
@@ -38,12 +38,12 @@
   --category-function-border: #6b6b6b;
 }
 
-.tree > div > .object-node > .node-body {
+#tree-view-output > .object-node > .node-body {
   border-left: none;
   padding-left: 0;
 }
 
-.tree > div > .node > .node-body {
+#tree-view-output > .node > .node-body {
   margin-top: -5px; /* no idea why this is necessary */
 }