diff --git a/app/layout.tsx b/app/layout.tsx
index 032b8b13e5..015acf2dba 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -23,9 +23,9 @@ export default function RootLayout({
         <script
           dangerouslySetInnerHTML={{
             __html: `
-              if (typeof window !== 'undefined') {
-                window.INITIAL_TIMESTAMP = ${Date.now()};
-              }
+              document.addEventListener('DOMContentLoaded', function() {
+                window.INITIAL_TIMESTAMP = Date.now();
+              });
             `,
           }}
         />
diff --git a/app/w/components/workflow-block/components/sub-block/components/switch.tsx b/app/w/components/workflow-block/components/sub-block/components/switch.tsx
index d6c917b9c4..b32996aced 100644
--- a/app/w/components/workflow-block/components/sub-block/components/switch.tsx
+++ b/app/w/components/workflow-block/components/sub-block/components/switch.tsx
@@ -1,18 +1,25 @@
 import { Switch as UISwitch } from '@/components/ui/switch'
 import { useSubBlockValue } from '../hooks/use-sub-block-value'
+import { Label } from '@/components/ui/label'
 
 interface SwitchProps {
   blockId: string
   subBlockId: string
+  title: string
 }
 
-export function Switch({ blockId, subBlockId }: SwitchProps) {
+export function Switch({ blockId, subBlockId, title }: SwitchProps) {
   const [value, setValue] = useSubBlockValue(blockId, subBlockId)
 
   return (
-    <UISwitch
-      checked={Boolean(value)}
-      onCheckedChange={(checked) => setValue(checked)}
-    />
+    <div className="flex flex-col gap-2">
+      <Label className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70">
+        {title}
+      </Label>
+      <UISwitch
+        checked={Boolean(value)}
+        onCheckedChange={(checked) => setValue(checked)}
+      />
+    </div>
   )
-} 
+}
diff --git a/app/w/components/workflow-block/components/sub-block/sub-block.tsx b/app/w/components/workflow-block/components/sub-block/sub-block.tsx
index 75c8b9e15a..27d4249c4b 100644
--- a/app/w/components/workflow-block/components/sub-block/sub-block.tsx
+++ b/app/w/components/workflow-block/components/sub-block/sub-block.tsx
@@ -73,10 +73,11 @@ export function SubBlock({ blockId, config, isConnecting }: SubBlockProps) {
         return <Code blockId={blockId} subBlockId={config.id} />
       case 'switch':
         return (
-          <div className="flex items-center justify-between">
-            <Label className="text-sm font-medium">{config.title}</Label>
-            <Switch blockId={blockId} subBlockId={config.id} />
-          </div>
+          <Switch
+            blockId={blockId}
+            subBlockId={config.id}
+            title={config.title}
+          />
         )
       default:
         return null
diff --git a/app/w/page.tsx b/app/w/page.tsx
deleted file mode 100644
index 3c0b44168d..0000000000
--- a/app/w/page.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-"use client"
-
-import { useState } from "react"
-import { WorkflowBlock } from "./components/workflow-block/workflow-block"
-import { BlockConfig, BlockCategory, BlockIcon } from "@/blocks/types"
-import { LayoutDashboard } from "lucide-react"
-
-const WorkflowIcon: BlockIcon = (props) => <LayoutDashboard {...props} />
-
-interface WorkflowBlockState {
-  id: string
-  type: string
-  position: { x: number; y: number }
-  config: BlockConfig
-  name: string
-}
-
-export default function Page() {
-  const [workflows, setWorkflows] = useState<WorkflowBlockState[]>([])
-
-  const createNewWorkflow = () => {
-    const newWorkflow: WorkflowBlockState = {
-      id: `workflow-${workflows.length + 1}`,
-      type: "default",
-      position: { x: 0, y: 0 },
-      config: {
-        type: "default",
-        toolbar: {
-          title: "New Workflow",
-          description: "Empty workflow",
-          bgColor: "#808080",
-          icon: WorkflowIcon,
-          category: "basic" as BlockCategory
-        },
-        tools: {
-          access: []
-        },
-        workflow: {
-          subBlocks: [],
-          inputs: {},
-          outputs: {}
-        }
-      },
-      name: `New Workflow ${workflows.length + 1}`
-    }
-    setWorkflows([...workflows, newWorkflow])
-  }
-
-  return (
-    <div>
-      <button onClick={createNewWorkflow}>New Workflow</button>
-      <div>
-        {workflows.map((workflow) => (
-          <WorkflowBlock
-            key={workflow.id}
-            id={workflow.id}
-            type={workflow.type}
-            position={workflow.position}
-            config={workflow.config}
-            name={workflow.name}
-          />
-        ))}
-      </div>
-    </div>
-  )
-}
diff --git a/components/ui/switch.tsx b/components/ui/switch.tsx
index c81058a3ef..bc69cf2dbf 100644
--- a/components/ui/switch.tsx
+++ b/components/ui/switch.tsx
@@ -1,5 +1,8 @@
+"use client"
+
 import * as React from "react"
 import * as SwitchPrimitives from "@radix-ui/react-switch"
+
 import { cn } from "@/lib/utils"
 
 const Switch = React.forwardRef<
@@ -8,7 +11,7 @@ const Switch = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <SwitchPrimitives.Root
     className={cn(
-      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-blue-500 data-[state=unchecked]:bg-gray-200",
+      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-input",
       className
     )}
     {...props}
@@ -16,11 +19,11 @@ const Switch = React.forwardRef<
   >
     <SwitchPrimitives.Thumb
       className={cn(
-        "pointer-events-none block h-5 w-5 rounded-full bg-white shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0"
+        "pointer-events-none block h-5 w-5 rounded-full bg-background shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0"
       )}
     />
   </SwitchPrimitives.Root>
 ))
 Switch.displayName = SwitchPrimitives.Root.displayName
 
-export { Switch } 
\ No newline at end of file
+export { Switch }