diff --git a/desktop/plugins/public/ui-debugger/components/Controls.tsx b/desktop/plugins/public/ui-debugger/components/Controls.tsx
index 3085a4553..a34f17732 100644
--- a/desktop/plugins/public/ui-debugger/components/Controls.tsx
+++ b/desktop/plugins/public/ui-debugger/components/Controls.tsx
@@ -44,7 +44,7 @@ export const Controls: React.FC = () => {
     useState(false);
 
   return (
-    <Layout.Horizontal pad="small" gap="small">
+    <Layout.Horizontal gap="medium" pad="medium">
       <Input
         value={searchTerm}
         onChange={(e) => {
diff --git a/desktop/plugins/public/ui-debugger/components/Visualization2D.tsx b/desktop/plugins/public/ui-debugger/components/Visualization2D.tsx
index 6a82fbbb8..46d237a68 100644
--- a/desktop/plugins/public/ui-debugger/components/Visualization2D.tsx
+++ b/desktop/plugins/public/ui-debugger/components/Visualization2D.tsx
@@ -135,6 +135,8 @@ export const Visualization2D: React.FC<
         //this div is to ensure that the size of the visualiser doesnt change when focusings on a subtree
         style={
           {
+            backgroundColor: theme.backgroundWash,
+            borderRadius: theme.borderRadius,
             overflowY: 'auto',
             overflowX: 'hidden',
             position: 'relative', //this is for the absolutely positioned overlays
diff --git a/desktop/plugins/public/ui-debugger/components/main.tsx b/desktop/plugins/public/ui-debugger/components/main.tsx
index c06e6f6ae..cf6dd66f8 100644
--- a/desktop/plugins/public/ui-debugger/components/main.tsx
+++ b/desktop/plugins/public/ui-debugger/components/main.tsx
@@ -106,43 +106,49 @@ export function Component() {
 
   return (
     <QueryClientProvider client={queryClient}>
-      <Layout.Container grow padh="small" padv="medium">
-        <Layout.Top>
-          <>
-            <Controls />
-            <Layout.Horizontal grow pad="small">
-              <Tree2 nodes={nodes} rootId={rootId} />
+      <Layout.Horizontal
+        grow
+        style={{
+          borderRadius: theme.borderRadius,
+          backgroundColor: theme.backgroundWash,
+        }}>
+        <Layout.Container
+          grow
+          style={{
+            borderRadius: theme.borderRadius,
+            backgroundColor: theme.backgroundDefault,
+          }}>
+          <Controls />
+          <Tree2 nodes={nodes} rootId={rootId} />
+        </Layout.Container>
 
-              <ResizablePanel
-                position="right"
-                minWidth={200}
-                width={visualiserWidth + theme.space.large}
-                maxWidth={800}
-                onResize={(width) => {
-                  instance.uiActions.setVisualiserWidth(width);
-                }}
-                gutter>
-                <Visualization2D
-                  width={visualiserWidth}
-                  nodes={nodes}
-                  onSelectNode={instance.uiActions.onSelectNode}
-                />
-              </ResizablePanel>
-              <DetailSidebar width={350}>
-                <Inspector
-                  os={instance.os}
-                  metadata={metadata}
-                  nodes={nodes}
-                  showExtra={openBottomPanelWithContent}
-                />
-              </DetailSidebar>
-            </Layout.Horizontal>
-          </>
-          <BottomPanel dismiss={dismissBottomPanel}>
-            {bottomPanelComponent}
-          </BottomPanel>
-        </Layout.Top>
-      </Layout.Container>
+        <ResizablePanel
+          position="right"
+          minWidth={200}
+          width={visualiserWidth + theme.space.large}
+          maxWidth={800}
+          onResize={(width) => {
+            instance.uiActions.setVisualiserWidth(width);
+          }}
+          gutter>
+          <Visualization2D
+            width={visualiserWidth}
+            nodes={nodes}
+            onSelectNode={instance.uiActions.onSelectNode}
+          />
+        </ResizablePanel>
+        <DetailSidebar width={350}>
+          <Inspector
+            os={instance.os}
+            metadata={metadata}
+            nodes={nodes}
+            showExtra={openBottomPanelWithContent}
+          />
+        </DetailSidebar>
+        <BottomPanel dismiss={dismissBottomPanel}>
+          {bottomPanelComponent}
+        </BottomPanel>
+      </Layout.Horizontal>
     </QueryClientProvider>
   );
 }
diff --git a/desktop/plugins/public/ui-debugger/components/tree/Tree.tsx b/desktop/plugins/public/ui-debugger/components/tree/Tree.tsx
index 181a1cf7e..5e126abda 100644
--- a/desktop/plugins/public/ui-debugger/components/tree/Tree.tsx
+++ b/desktop/plugins/public/ui-debugger/components/tree/Tree.tsx
@@ -213,6 +213,7 @@ export function Tree2({
           //We use this normal divs flexbox sizing to measure how much vertical space we need for the child div
           ref={grandParentRef}
           style={{
+            paddingLeft: theme.space.medium,
             height: '100%',
             width: '100%',
           }}>