diff --git a/skyvern-frontend/src/routes/workflows/editor/Workspace.tsx b/skyvern-frontend/src/routes/workflows/editor/Workspace.tsx
index 1d26f313..c933839c 100644
--- a/skyvern-frontend/src/routes/workflows/editor/Workspace.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/Workspace.tsx
@@ -1,5 +1,11 @@
 import { AxiosError } from "axios";
-import { useEffect, useRef, useState, MutableRefObject } from "react";
+import {
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+  MutableRefObject,
+} from "react";
 import { nanoid } from "nanoid";
 import {
   ChevronRightIcon,
@@ -300,6 +306,33 @@ function Workspace({
     closeWorkflowPanel();
   });
 
+  // Centralized function to manage comparison and panel states
+  const clearComparisonViewAndShowFreshIfActive = useCallback(
+    (active: boolean) => {
+      setWorkflowPanelState({
+        active,
+        content: "history",
+        data: {
+          showComparison: false,
+          version1: undefined,
+          version2: undefined,
+        },
+      });
+    },
+    [setWorkflowPanelState],
+  );
+
+  // Clear comparison view when switching between browser mode and editor mode
+  useEffect(() => {
+    if (workflowPanelState.data?.showComparison) {
+      clearComparisonViewAndShowFreshIfActive(false);
+      setShowAllCode(false);
+    }
+    // We intentionally omit workflowPanelState.data?.showComparison from deps
+    // to avoid clearing comparison immediately when it's set
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [showBrowser, clearComparisonViewAndShowFreshIfActive]);
+
   useMountEffect(() => {
     const closePanelsWhenEscapeIsPressed = (e: KeyboardEvent) => {
       if (e.key === "Escape") {
@@ -572,19 +605,6 @@ function Workspace({
     }
   }
 
-  // Centralized function to manage comparison and panel states
-  function clearComparisonViewAndShowFreshIfActive(active: boolean) {
-    setWorkflowPanelState({
-      active,
-      content: "history",
-      data: {
-        showComparison: false,
-        version1: undefined,
-        version2: undefined,
-      },
-    });
-  }
-
   function toggleHistoryPanel() {
     // Capture current state before making changes
     const wasInComparisonMode = workflowPanelState.data?.showComparison;
@@ -895,39 +915,26 @@ function Workspace({
         />
       </div>
 
-      {/* infinite canvas and sub panels when not in debug mode */}
-      {!showBrowser && (
+      {/* comparison view (takes precedence over both browser and non-browser modes) */}
+      {workflowPanelState.data?.showComparison &&
+      workflowPanelState.data?.version1 &&
+      workflowPanelState.data?.version2 ? (
         <div className="relative flex h-full w-full overflow-hidden overflow-x-hidden">
-          {/* infinite canvas or comparison view */}
-          {workflowPanelState.data?.showComparison &&
-          workflowPanelState.data?.version1 &&
-          workflowPanelState.data?.version2 ? (
-            <div
-              className="absolute left-6 top-[6rem]"
-              style={{
-                width: "calc(100% - 32rem)",
-                height: "calc(100vh - 11rem)",
-              }}
-            >
-              <WorkflowComparisonPanel
-                key={`${workflowPanelState.data.version1.workflow_id}v${workflowPanelState.data.version1.version}-${workflowPanelState.data.version2.workflow_id}v${workflowPanelState.data.version2.version}`}
-                version1={workflowPanelState.data.version1}
-                version2={workflowPanelState.data.version2}
-                onSelectState={handleSelectState}
-              />
-            </div>
-          ) : (
-            <FlowRenderer
-              nodes={nodes}
-              edges={edges}
-              setNodes={setNodes}
-              setEdges={setEdges}
-              onNodesChange={onNodesChange}
-              onEdgesChange={onEdgesChange}
-              initialTitle={initialTitle}
-              workflow={workflow}
+          {/* comparison view */}
+          <div
+            className="absolute left-6 top-[6rem]"
+            style={{
+              width: "calc(100% - 32rem)",
+              height: "calc(100vh - 11rem)",
+            }}
+          >
+            <WorkflowComparisonPanel
+              key={`${workflowPanelState.data.version1.workflow_id}v${workflowPanelState.data.version1.version}-${workflowPanelState.data.version2.workflow_id}v${workflowPanelState.data.version2.version}`}
+              version1={workflowPanelState.data.version1}
+              version2={workflowPanelState.data.version2}
+              onSelectState={handleSelectState}
             />
-          )}
+          </div>
 
           {/* sub panels */}
           {workflowPanelState.active && (
@@ -984,46 +991,122 @@ function Workspace({
             </div>
           )}
         </div>
+      ) : (
+        <>
+          {/* infinite canvas and sub panels when not in debug mode */}
+          {!showBrowser && (
+            <div className="relative flex h-full w-full overflow-hidden overflow-x-hidden">
+              {/* infinite canvas */}
+              <FlowRenderer
+                nodes={nodes}
+                edges={edges}
+                setNodes={setNodes}
+                setEdges={setEdges}
+                onNodesChange={onNodesChange}
+                onEdgesChange={onEdgesChange}
+                initialTitle={initialTitle}
+                workflow={workflow}
+              />
+
+              {/* sub panels */}
+              {workflowPanelState.active && (
+                <div
+                  className="absolute right-6 top-[8.5rem] z-30"
+                  style={{
+                    height:
+                      workflowPanelState.content === "nodeLibrary"
+                        ? "calc(100vh - 14rem)"
+                        : "unset",
+                  }}
+                >
+                  {workflowPanelState.content === "cacheKeyValues" && (
+                    <WorkflowCacheKeyValuesPanel
+                      cacheKeyValues={cacheKeyValues}
+                      pending={cacheKeyValuesLoading}
+                      scriptKey={workflow.cache_key ?? "default"}
+                      onDelete={(cacheKeyValue) => {
+                        setToDeleteCacheKeyValue(cacheKeyValue);
+                        setOpenConfirmCacheKeyValueDeleteDialogue(true);
+                      }}
+                      onPaginate={(page) => {
+                        setPage(page);
+                      }}
+                      onSelect={(cacheKeyValue) => {
+                        setCacheKeyValue(cacheKeyValue);
+                        setCacheKeyValueFilter("");
+                        closeWorkflowPanel();
+                      }}
+                    />
+                  )}
+                  {workflowPanelState.content === "parameters" && (
+                    <div className="z-30">
+                      <WorkflowParametersPanel />
+                    </div>
+                  )}
+                  {workflowPanelState.content === "history" && (
+                    <div className="pointer-events-auto relative right-0 top-[3.5rem] z-30 h-[calc(100vh-14rem)]">
+                      <WorkflowHistoryPanel
+                        workflowPermanentId={workflowPermanentId!}
+                        onCompare={handleCompareVersions}
+                      />
+                    </div>
+                  )}
+                  {workflowPanelState.content === "nodeLibrary" && (
+                    <div className="z-30 h-full w-[25rem]">
+                      <WorkflowNodeLibraryPanel
+                        onNodeClick={(props) => {
+                          addNode(props);
+                        }}
+                      />
+                    </div>
+                  )}
+                </div>
+              )}
+            </div>
+          )}
+        </>
       )}
 
       {/* sub panels when in debug mode */}
-      {showBrowser && workflowPanelState.active && (
-        <div
-          className="absolute right-6 top-[8.5rem] z-30"
-          style={{
-            height:
-              workflowPanelState.content === "nodeLibrary"
-                ? "calc(100vh - 14rem)"
-                : "unset",
-          }}
-        >
-          {workflowPanelState.content === "cacheKeyValues" && (
-            <WorkflowCacheKeyValuesPanel
-              cacheKeyValues={cacheKeyValues}
-              pending={cacheKeyValuesLoading}
-              scriptKey={workflow.cache_key ?? "default"}
-              onDelete={(cacheKeyValue) => {
-                setToDeleteCacheKeyValue(cacheKeyValue);
-                setOpenConfirmCacheKeyValueDeleteDialogue(true);
-              }}
-              onPaginate={(page) => {
-                setPage(page);
-              }}
-              onSelect={(cacheKeyValue) => {
-                setCacheKeyValue(cacheKeyValue);
-                setCacheKeyValueFilter("");
-                closeWorkflowPanel();
-              }}
-            />
-          )}
-          {workflowPanelState.content === "parameters" && (
-            <WorkflowParametersPanel />
-          )}
-        </div>
-      )}
+      {showBrowser &&
+        !workflowPanelState.data?.showComparison &&
+        workflowPanelState.active && (
+          <div
+            className="absolute right-6 top-[8.5rem] z-30"
+            style={{
+              height:
+                workflowPanelState.content === "nodeLibrary"
+                  ? "calc(100vh - 14rem)"
+                  : "unset",
+            }}
+          >
+            {workflowPanelState.content === "cacheKeyValues" && (
+              <WorkflowCacheKeyValuesPanel
+                cacheKeyValues={cacheKeyValues}
+                pending={cacheKeyValuesLoading}
+                scriptKey={workflow.cache_key ?? "default"}
+                onDelete={(cacheKeyValue) => {
+                  setToDeleteCacheKeyValue(cacheKeyValue);
+                  setOpenConfirmCacheKeyValueDeleteDialogue(true);
+                }}
+                onPaginate={(page) => {
+                  setPage(page);
+                }}
+                onSelect={(cacheKeyValue) => {
+                  setCacheKeyValue(cacheKeyValue);
+                  setCacheKeyValueFilter("");
+                  closeWorkflowPanel();
+                }}
+              />
+            )}
+            {workflowPanelState.content === "parameters" && (
+              <WorkflowParametersPanel />
+            )}
+          </div>
+        )}
 
       {/* code, infinite canvas, browser, and timeline when in debug mode */}
-      {showBrowser && (
+      {showBrowser && !workflowPanelState.data?.showComparison && (
         <div className="relative flex h-full w-full overflow-hidden overflow-x-hidden">
           <Splitter
             className="splittah"
@@ -1032,82 +1115,64 @@ function Workspace({
             split={{ left: workflowWidth }}
             onResize={() => setContainerResizeTrigger((prev) => prev + 1)}
           >
-            {/* code and infinite canvas or comparison view */}
+            {/* code and infinite canvas */}
             <div className="relative h-full w-full">
-              {workflowPanelState.data?.showComparison &&
-              workflowPanelState.data?.version1 &&
-              workflowPanelState.data?.version2 ? (
+              <div
+                className={cn(
+                  "skyvern-split-left flex h-full w-[200%] translate-x-[-50%] transition-none duration-300",
+                  {
+                    "w-[100%] translate-x-0":
+                      leftSideLayoutMode === "side-by-side",
+                  },
+                  {
+                    "translate-x-0": showAllCode,
+                  },
+                )}
+                ref={dom.splitLeft}
+              >
+                {/* code */}
                 <div
-                  className="absolute inset-0 top-[8.5rem] p-6"
-                  style={{
-                    height: "calc(100vh - 14.5rem)",
-                  }}
+                  className={cn("h-full w-[50%]", {
+                    "w-[0%]":
+                      leftSideLayoutMode === "side-by-side" && !showAllCode,
+                  })}
                 >
-                  <WorkflowComparisonPanel
-                    key={`${workflowPanelState.data.version1.workflow_id}v${workflowPanelState.data.version1.version}-${workflowPanelState.data.version2.workflow_id}v${workflowPanelState.data.version2.version}`}
-                    version1={workflowPanelState.data.version1}
-                    version2={workflowPanelState.data.version2}
-                    onSelectState={handleSelectState}
-                  />
-                </div>
-              ) : (
-                <div
-                  className={cn(
-                    "skyvern-split-left flex h-full w-[200%] translate-x-[-50%] transition-none duration-300",
-                    {
-                      "w-[100%] translate-x-0":
-                        leftSideLayoutMode === "side-by-side",
-                    },
-                    {
-                      "translate-x-0": showAllCode,
-                    },
-                  )}
-                  ref={dom.splitLeft}
-                >
-                  {/* code */}
-                  <div
-                    className={cn("h-full w-[50%]", {
-                      "w-[0%]":
-                        leftSideLayoutMode === "side-by-side" && !showAllCode,
-                    })}
-                  >
-                    <div className="relative mt-[8.5rem] w-full p-6 pr-5 pt-0">
-                      <div className="absolute right-[1.25rem] top-0 z-20">
-                        <CopyText text={code} />
-                      </div>
-                      <CodeEditor
-                        className="w-full overflow-y-scroll"
-                        language="python"
-                        value={code}
-                        lineWrap={false}
-                        readOnly
-                        fontSize={10}
-                      />
+                  <div className="relative mt-[8.5rem] w-full p-6 pr-5 pt-0">
+                    <div className="absolute right-[1.25rem] top-0 z-20">
+                      <CopyText text={code} />
                     </div>
-                  </div>
-                  {/* infinite canvas */}
-                  <div
-                    className={cn("h-full w-[50%]", {
-                      "w-[100%]":
-                        leftSideLayoutMode === "side-by-side" && !showAllCode,
-                    })}
-                  >
-                    <FlowRenderer
-                      hideBackground={true}
-                      hideControls={true}
-                      nodes={nodes}
-                      edges={edges}
-                      setNodes={setNodes}
-                      setEdges={setEdges}
-                      onNodesChange={onNodesChange}
-                      onEdgesChange={onEdgesChange}
-                      initialTitle={initialTitle}
-                      workflow={workflow}
-                      onContainerResize={containerResizeTrigger}
+                    <CodeEditor
+                      className="w-full overflow-y-scroll"
+                      language="python"
+                      value={code}
+                      lineWrap={false}
+                      readOnly
+                      fontSize={10}
                     />
                   </div>
                 </div>
-              )}
+                {/* infinite canvas */}
+                <div
+                  className={cn("h-full w-[50%]", {
+                    "w-[100%]":
+                      leftSideLayoutMode === "side-by-side" && !showAllCode,
+                  })}
+                >
+                  <FlowRenderer
+                    hideBackground={true}
+                    hideControls={true}
+                    nodes={nodes}
+                    edges={edges}
+                    setNodes={setNodes}
+                    setEdges={setEdges}
+                    onNodesChange={onNodesChange}
+                    onEdgesChange={onEdgesChange}
+                    initialTitle={initialTitle}
+                    workflow={workflow}
+                    onContainerResize={containerResizeTrigger}
+                  />
+                </div>
+              </div>
             </div>
 
             {/* browser & timeline */}
diff --git a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowComparisonPanel.tsx b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowComparisonPanel.tsx
index 2f2bc4ba..10c58f3f 100644
--- a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowComparisonPanel.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowComparisonPanel.tsx
@@ -1,5 +1,4 @@
 import { useCallback, useMemo } from "react";
-import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Separator } from "@/components/ui/separator";
 import {
@@ -171,7 +170,6 @@ function getWorkflowElements(version: WorkflowVersion) {
 
 function WorkflowComparisonRenderer({
   version,
-  onSelectState,
   blockColors,
 }: {
   version: WorkflowVersion;
@@ -239,45 +237,19 @@ function WorkflowComparisonRenderer({
   );
 
   return (
-    <div className="h-full w-full">
-      <div className="mb-3 flex flex-col items-center justify-center gap-2">
-        <div className="text-center">
-          <div className="mb-1 flex items-center justify-center gap-2">
-            <Badge variant="secondary">
-              {version.title}, version: {version.version}
-            </Badge>
-            <Badge variant="secondary">
-              {version.workflow_definition?.blocks?.length || 0} block
-              {(version.workflow_definition?.blocks?.length || 0) !== 1
-                ? "s"
-                : ""}
-            </Badge>
-            {onSelectState && (
-              <Button
-                size="sm"
-                onClick={() => onSelectState(version)}
-                className="text-xs"
-              >
-                Select this state
-              </Button>
-            )}
-          </div>
-        </div>
-      </div>
-      <div className="h-[calc(100%-4rem)] rounded-lg border bg-white">
-        <FlowRenderer
-          hideBackground={false}
-          hideControls={true}
-          nodes={nodes}
-          edges={edges}
-          setNodes={setNodes}
-          setEdges={setEdges}
-          onNodesChange={handleNodesChange}
-          onEdgesChange={handleEdgesChange}
-          initialTitle={version.title}
-          workflow={version}
-        />
-      </div>
+    <div className="h-full w-full rounded-lg border bg-white">
+      <FlowRenderer
+        hideBackground={false}
+        hideControls={true}
+        nodes={nodes}
+        edges={edges}
+        setNodes={setNodes}
+        setEdges={setEdges}
+        onNodesChange={handleNodesChange}
+        onEdgesChange={handleEdgesChange}
+        initialTitle={version.title}
+        workflow={version}
+      />
     </div>
   );
 }
@@ -349,23 +321,70 @@ function WorkflowComparisonPanel({ version1, version2, onSelectState }: Props) {
     <div className="flex h-full w-full flex-col rounded-lg bg-slate-elevation2">
       {/* Header */}
       <div className="flex-shrink-0 p-4 pb-3">
-        <h2 className="mb-2 text-lg font-semibold">Version Comparison</h2>
-        <div className="flex gap-3 text-sm">
-          <div className="flex items-center gap-1">
-            <div className="h-3 w-3 rounded-full bg-green-300"></div>
-            <span>Identical ({stats.identical})</span>
+        {/* 3x3 Grid Layout */}
+        <div className="grid grid-cols-3 gap-4">
+          {/* Row 1: Workflow Names and Title */}
+          <h2 className="text-center text-xl font-semibold">
+            {version1.title}
+          </h2>
+          <h3 className="text-center text-lg font-medium text-muted-foreground">
+            Version Comparison
+          </h3>
+          <h2 className="text-center text-xl font-semibold">
+            {version2.title}
+          </h2>
+
+          {/* Row 2: Version Details and Statistics */}
+          <div className="text-center text-sm text-muted-foreground">
+            [Version {version1.version}] •{" "}
+            {new Date(version1.modified_at).toLocaleDateString()}
           </div>
-          <div className="flex items-center gap-1">
-            <div className="h-3 w-3 rounded-full bg-yellow-400"></div>
-            <span>Modified ({stats.modified})</span>
+          <div className="flex justify-center gap-3 text-sm">
+            <div className="flex items-center gap-1">
+              <div className="h-3 w-3 rounded-full bg-green-300"></div>
+              <span>Identical ({stats.identical})</span>
+            </div>
+            <div className="flex items-center gap-1">
+              <div className="h-3 w-3 rounded-full bg-yellow-400"></div>
+              <span>Modified ({stats.modified})</span>
+            </div>
+            <div className="flex items-center gap-1">
+              <div className="h-3 w-3 rounded-full bg-orange-700"></div>
+              <span>Added ({stats.added})</span>
+            </div>
+            <div className="flex items-center gap-1">
+              <div className="h-3 w-3 rounded-full bg-orange-700"></div>
+              <span>Removed ({stats.removed})</span>
+            </div>
           </div>
-          <div className="flex items-center gap-1">
-            <div className="h-3 w-3 rounded-full bg-orange-700"></div>
-            <span>Added ({stats.added})</span>
+          <div className="text-center text-sm text-muted-foreground">
+            [Version {version2.version}] •{" "}
+            {new Date(version2.modified_at).toLocaleDateString()}
           </div>
-          <div className="flex items-center gap-1">
-            <div className="h-3 w-3 rounded-full bg-orange-700"></div>
-            <span>Removed ({stats.removed})</span>
+
+          {/* Row 3: Select Buttons */}
+          <div className="flex justify-center">
+            {onSelectState && (
+              <Button
+                size="sm"
+                onClick={() => onSelectState(version1)}
+                className="text-xs"
+              >
+                Select this variant
+              </Button>
+            )}
+          </div>
+          <div></div>
+          <div className="flex justify-center">
+            {onSelectState && (
+              <Button
+                size="sm"
+                onClick={() => onSelectState(version2)}
+                className="text-xs"
+              >
+                Select this variant
+              </Button>
+            )}
           </div>
         </div>
       </div>
diff --git a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowHistoryPanel.tsx b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowHistoryPanel.tsx
index c23fe213..2be60dba 100644
--- a/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowHistoryPanel.tsx
+++ b/skyvern-frontend/src/routes/workflows/editor/panels/WorkflowHistoryPanel.tsx
@@ -101,6 +101,27 @@ function WorkflowHistoryPanel({ workflowPermanentId, onCompare }: Props) {
         </p>
       </div>
 
+      {/* Compare Buttons */}
+      <div className="flex-shrink-0 px-4 pb-3">
+        <div className="flex gap-2">
+          <Button
+            variant="secondary"
+            className="flex-1"
+            onClick={() => handleCompare("json")}
+            disabled={!canCompare || isLoading}
+          >
+            JSON Diff
+          </Button>
+          <Button
+            className="flex-1"
+            onClick={() => handleCompare("visual")}
+            disabled={!canCompare || isLoading}
+          >
+            Visual Compare
+          </Button>
+        </div>
+      </div>
+
       <Separator />
 
       {/* Version List */}
@@ -166,29 +187,6 @@ function WorkflowHistoryPanel({ workflowPermanentId, onCompare }: Props) {
           )}
         </div>
       </ScrollArea>
-
-      <Separator />
-
-      {/* Footer */}
-      <div className="flex-shrink-0 p-4 pt-3">
-        <div className="flex gap-2">
-          <Button
-            variant="secondary"
-            className="flex-1"
-            onClick={() => handleCompare("json")}
-            disabled={!canCompare || isLoading}
-          >
-            JSON Diff
-          </Button>
-          <Button
-            className="flex-1"
-            onClick={() => handleCompare("visual")}
-            disabled={!canCompare || isLoading}
-          >
-            Visual Compare
-          </Button>
-        </div>
-      </div>
     </div>
   );
 }