diff --git a/ui/src/style/pages/data-explorer/font-scale.scss b/ui/src/style/pages/data-explorer/font-scale.scss
index f61f82af5..9ebf9a387 100644
--- a/ui/src/style/pages/data-explorer/font-scale.scss
+++ b/ui/src/style/pages/data-explorer/font-scale.scss
@@ -36,9 +36,6 @@ $breakpoint-c: 2100px;
     .query-builder--column-heading {
       font-size: 16px;
     }
-    .query-builder--query-preview pre code {
-      font-size: 13.5px;
-    }
     .toggle-sm .toggle-btn {
       font-size: 14px;
     }
@@ -54,6 +51,33 @@ $breakpoint-c: 2100px;
         width: 10px;
       }
     }
+    .query-builder--tabs-heading {
+      height: 80px;
+    }
+    .query-builder--query-preview pre {
+      height: calc(80px - 4px);
+    }
+    .query-builder--columns {
+      top: 80px;
+      height: calc(100% - 80px);
+    }
+    .raw-text--field,
+    .query-builder--query-preview pre,
+    .query-builder--query-preview pre code {
+      font-size: 14px !important;
+      line-height: 16px !important;
+    }
+    .raw-text--field {
+      height: 48px;
+      padding: 12px 10px 0 10px;
+    }
+    .raw-text--status {
+      height: 28px;
+      padding: 0 10px;
+    }
+    .query-builder--query-preview pre {
+      padding: 10px;
+    }
   }
 }
 @media only screen and (min-width: $breakpoint-c) {
@@ -75,9 +99,6 @@ $breakpoint-c: 2100px;
       font-weight: 400;
       text-transform: uppercase;
     }
-    .query-builder--query-preview pre code {
-      font-size: 14px;
-    }
     .toggle-sm .toggle-btn {
       font-size: 14px;
     }
@@ -96,5 +117,11 @@ $breakpoint-c: 2100px;
         width: 12px;
       }
     }
+    .raw-text--field,
+    .query-builder--query-preview pre,
+    .query-builder--query-preview pre code {
+      font-size: 16px !important;
+      line-height: 18px !important;
+    }
   }
 }
\ No newline at end of file
diff --git a/ui/src/style/pages/data-explorer/raw-text.scss b/ui/src/style/pages/data-explorer/raw-text.scss
index 6e49f5fb4..2899bc42e 100644
--- a/ui/src/style/pages/data-explorer/raw-text.scss
+++ b/ui/src/style/pages/data-explorer/raw-text.scss
@@ -26,17 +26,19 @@
 }
 
 $raw-text-color: $c-pool;
+$raw-text-height: 38px;
 
 .raw-text--field {
   @include custom-scrollbar($g2-kevlar, $raw-text-color);
   display: block;
   width: 100%;
-  height: ($query-builder--preview-height - 4px);
+  height: $raw-text-height;
   background-color: $g2-kevlar;
   border: 2px solid $g2-kevlar;
+  border-bottom: 0;
   color: $raw-text-color;
   padding: 7px;
-  border-radius: $radius;
+  border-radius: $radius $radius 0 0;
   margin: 0;
   transition:
     color 0.25s ease,
@@ -55,13 +57,55 @@ $raw-text-color: $c-pool;
   &:-moz-placeholder { /* Firefox 18- */
     color: $g8-storm;
   }
-  &:hover {
-    background-color: $g3-castle;
-    border-color: $g3-castle;
+  &:hover,
+  &:hover + .raw-text--status {
+    border-color: $g5-pepper;
   }
   &:focus {
     outline: none;
     color: $raw-text-color !important;
     border-color: $c-pool;
   }
-} 
\ No newline at end of file
+  &:focus + .raw-text--status {
+    border-color: $c-pool;
+  }
+}
+.raw-text--status {
+  width: 100%;
+  height: ($query-builder--preview-height - 2px - $raw-text-height);
+  line-height: 12px;
+  font-size: 12px;
+  background-color: $g2-kevlar;
+  border: 2px solid $g2-kevlar;
+  padding: 0 7px;
+  border-radius: 0 0 $radius $radius;
+  border-top: 0;
+  color: $g11-sidewalk;
+  font-family: $code-font;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  transition:
+    color 0.25s ease,
+    background-color 0.25s ease,
+    border-color 0.25s ease;
+
+  span.icon {
+    margin-right: 5px;
+  }
+
+  /* Error State */
+  &.raw-text--error {
+    color: $c-dreamsicle;
+  }
+
+  /* Warning State */
+  &.raw-text--warning {
+    color: $c-comet;
+  }
+
+  /* Success State */
+  &.raw-text--success {
+    color: $c-rainforest;
+  }
+}
\ No newline at end of file