diff --git a/ui/src/flux/components/FuncArgsPreview.tsx b/ui/src/flux/components/FuncArgsPreview.tsx
index ac8c5a56cc..07b928230b 100644
--- a/ui/src/flux/components/FuncArgsPreview.tsx
+++ b/ui/src/flux/components/FuncArgsPreview.tsx
@@ -76,19 +76,19 @@ export default class FuncArgsPreview extends PureComponent<Props> {
       case 'period':
       case 'duration':
       case 'array': {
-        return <span className="variable-value--number">{argument}</span>
+        return <span className="func-arg--number">{argument}</span>
       }
       case 'bool': {
-        return <span className="variable-value--boolean">{argument}</span>
+        return <span className="func-arg--boolean">{argument}</span>
       }
       case 'string': {
-        return <span className="variable-value--string">"{argument}"</span>
+        return <span className="func-arg--string">"{argument}"</span>
       }
       case 'object': {
-        return <span className="variable-value--object">{argument}</span>
+        return <span className="func-arg--object">{argument}</span>
       }
       case 'invalid': {
-        return <span className="variable-value--invalid">{argument}</span>
+        return <span className="func-arg--invalid">{argument}</span>
       }
       default: {
         return <span>{argument}</span>
diff --git a/ui/src/flux/components/VariableName.tsx b/ui/src/flux/components/VariableName.tsx
index d07f4b3ab9..ca92a73070 100644
--- a/ui/src/flux/components/VariableName.tsx
+++ b/ui/src/flux/components/VariableName.tsx
@@ -22,7 +22,7 @@ export default class VariableName extends PureComponent<Props, State> {
   }
 
   public render() {
-    return <div className="variable-string">{this.nameElement}</div>
+    return <div className="variable-node">{this.nameElement}</div>
   }
 
   private get nameElement(): JSX.Element {
@@ -32,7 +32,7 @@ export default class VariableName extends PureComponent<Props, State> {
       return this.colorizeSyntax
     }
 
-    return <span className="variable-name">{name}</span>
+    return <span className="variable-node--name">{name}</span>
   }
 
   private get colorizeSyntax(): JSX.Element {
@@ -45,11 +45,11 @@ export default class VariableName extends PureComponent<Props, State> {
 
     return (
       <>
-        <span className="variable-name">{varName}</span>
+        <span className="variable-node--name">{varName}</span>
         {' = '}
         <span
           className={
-            valueIsString ? 'variable-value--string' : 'variable-value--number'
+            valueIsString ? 'variable-node--string' : 'variable-node--number'
           }
         >
           {varValue}
diff --git a/ui/src/style/components/time-machine/add-func-button.scss b/ui/src/style/components/time-machine/add-func-button.scss
index 0be530b189..e0dfaec063 100644
--- a/ui/src/style/components/time-machine/add-func-button.scss
+++ b/ui/src/style/components/time-machine/add-func-button.scss
@@ -10,25 +10,28 @@ $flux-func-selector--height: 30px;
   display: flex;
   align-items: center;
   position: relative;
+  flex-direction: column;
 
   &.open {
     z-index: 9999;
+    height: $flux-func-selector--height + $flux-func-selector--gap;
   }
 }
 
 .func-selector--connector {
-  width: $flux-func-selector--gap;
-  height: $flux-func-selector--height;
+  width: $flux-node-gap;
+  height: $flux-func-selector--gap;
   position: relative;
 
   &:after {
     content: '';
     position: absolute;
-    top: 50%;
-    width: 100%;
-    height: 4px;
-    transform: translateY(-50%);
-    @include gradient-h($g4-onyx, $c-pool);
+    top: -130%;
+    width: $flux-connector-line;
+    left: 50%;
+    height: 230%;
+    transform: translateX(-50%);
+    @include gradient-v($g4-onyx, $c-pool);
   }
 }
 
@@ -51,7 +54,7 @@ $flux-func-selector--height: 30px;
   top: 0;
 
   .func-selector--connector + & {
-    left: $flux-func-selector--gap;
+    top: $flux-func-selector--gap;
   }
 }
 
diff --git a/ui/src/style/components/time-machine/flux-builder.scss b/ui/src/style/components/time-machine/flux-builder.scss
index fa5bade6cf..b5a0c69ec7 100644
--- a/ui/src/style/components/time-machine/flux-builder.scss
+++ b/ui/src/style/components/time-machine/flux-builder.scss
@@ -1,18 +1,23 @@
+/*
+  Flux Builder Styles
+  ------------------------------------------------------------------------------
+*/
+
+$flux-builder-min-width: 440px;
 $flux-node-height: 30px;
 $flux-node-tooltip-gap: 4px;
-$flux-node-gap: 5px;
+$flux-connector-line: 2px;
+$flux-node-gap: 30px;
 $flux-node-padding: 10px;
 $flux-arg-min-width: 120px;
+
 $flux-number-color: $c-neutrino;
 $flux-object-color: $c-viridian;
 $flux-string-color: $c-honeydew;
 $flux-boolean-color: $c-viridian;
 $flux-invalid-color: $c-viridian;
-/*
-  Shared Node styles
-  ------------------
-*/
 
+// Shared Node styles
 %flux-node {
   min-height: $flux-node-height;
   border-radius: $radius;
@@ -22,66 +27,81 @@ $flux-invalid-color: $c-viridian;
   position: relative;
   background-color: $g4-onyx;
   transition: background-color 0.25s ease;
+  margin-bottom: $flux-node-tooltip-gap / 2;
+  margin-top: $flux-node-tooltip-gap / 2;
 
   &:hover {
+    cursor: pointer;
     background-color: $g6-smoke;
   }
 }
 
-.body-builder {
-  padding: 30px;
-  min-width: 440px;
-  overflow: hidden;
-  height: 100%;
-  width: 100%;
+.body-builder--container {
   background-color: $g1-raven;
 }
+.body-builder {
+  padding: $flux-node-height;
+  padding-bottom: 0;
+  min-width: $flux-builder-min-width;
+  width: 100%;
+}
 
 .declaration {
   width: 100%;
-  margin-bottom: 24px;
+  margin-bottom: $flux-node-gap;
+  padding-bottom: $flux-node-gap;
+  border-bottom: 2px solid $g2-kevlar;
   display: flex;
   flex-wrap: nowrap;
-  align-items: center;
+  flex-direction: column;
+  align-items: flex-start;
 
   &:last-of-type {
     margin-bottom: 0;
+    border: 0;
   }
 }
 
-.variable-string {
+.variable-node {
   @extend %flux-node;
   color: $g11-sidewalk;
   line-height: $flux-node-height;
   white-space: nowrap;
   @include no-user-select();
+  margin-top: 0;
+
+  &:hover {
+    background-color: $g4-onyx;
+    cursor: default;
+  }
 }
 
-.variable-blank {
-  font-style: italic;
-}
-
-.variable-name {
+.variable-node--name {
   color: $c-pool;
 }
 
-.variable-value--string {
+.variable-node--string,
+.func-arg--string {
   color: $flux-string-color;
 }
 
-.variable-value--boolean {
+.variable-node--boolean,
+.func-arg--boolean {
   color: $flux-boolean-color;
 }
 
-.variable-value--number {
+.variable-node--number,
+.func-arg--number {
   color: $flux-number-color;
 }
 
-.variable-value--object {
+.variable-node--object,
+.func-arg--object {
   color: $flux-object-color;
 }
 
-.variable-value--invalid {
+.variable-node--invalid,
+.func-arg--invalid {
   color: $flux-invalid-color;
 }
 
@@ -92,21 +112,42 @@ $flux-invalid-color: $c-viridian;
 
   margin-left: $flux-node-gap;
 
-  // Connection Line
+  // Connection Lines
+  &:before,
   &:after {
     content: '';
-    height: 4px;
-    width: $flux-node-gap;
     background-color: $g4-onyx;
     position: absolute;
+  }
+  // Vertical Line
+  &:before {
+    width: $flux-connector-line;
+    height: calc(100% + #{$flux-node-tooltip-gap});
+    top: -$flux-node-tooltip-gap / 2;
+    left: -$flux-node-gap / 2;
+    transform: translateX(-50%);
+  }
+  // Horizontal Line
+  &:after {
+    height: $flux-connector-line;
+    width: $flux-node-gap / 2;
     top: 50%;
     left: 0;
     transform: translate(-100%, -50%);
   }
-
-  &:first-child:after {
-    content: none;
+  
+  // When there is no variable name for the declaration
+  &:first-child {
     margin-left: 0;
+
+    &:before {
+      left: $flux-node-gap / 2;
+      top: 100%;
+      height: $flux-node-tooltip-gap / 2;
+    }
+    &:after {
+      content: none;
+    }
   }
 }