diff --git a/apps/web/src/app/(v2)/chat/page.tsx b/apps/web/src/app/(v2)/chat/page.tsx
index 6bb06c6e..c529d673 100644
--- a/apps/web/src/app/(v2)/chat/page.tsx
+++ b/apps/web/src/app/(v2)/chat/page.tsx
@@ -17,7 +17,7 @@ export default function ChatPage() {
   const displayThreads: ThreadDisplayInfo[] = threads.map(threadToDisplayInfo);
 
   return (
-    <div className="bg-background h-screen overflow-y-hidden">
+    <div className="bg-background h-screen">
       <Suspense>
         <Toaster />
         <GitHubAppProvider>
diff --git a/apps/web/src/components/gen-ui/initialize-step.tsx b/apps/web/src/components/gen-ui/initialize-step.tsx
index b895dfc8..1dec7355 100644
--- a/apps/web/src/components/gen-ui/initialize-step.tsx
+++ b/apps/web/src/components/gen-ui/initialize-step.tsx
@@ -1,11 +1,10 @@
 "use client";
+
 import {
   Loader2,
   CheckCircle,
   XCircle,
   GitBranch,
-  MessageSquare,
-  FileText,
   ChevronDown,
 } from "lucide-react";
 import { useState, useEffect, useRef } from "react";
diff --git a/apps/web/src/components/v2/default-view.tsx b/apps/web/src/components/v2/default-view.tsx
index dd20d535..925a2351 100644
--- a/apps/web/src/components/v2/default-view.tsx
+++ b/apps/web/src/components/v2/default-view.tsx
@@ -82,7 +82,7 @@ export function DefaultView({ threads, threadsLoading }: DefaultViewProps) {
       </div>
 
       {/* Main Content */}
-      <div className="flex-1 overflow-auto">
+      <div className="flex-1 overflow-y-auto">
         <div className="mx-auto max-w-4xl space-y-6 p-4">
           {/* Terminal Chat Input */}
           <Card
diff --git a/packages/shared/src/open-swe/custom-node-events.ts b/packages/shared/src/open-swe/custom-node-events.ts
index 561d9925..decb6fab 100644
--- a/packages/shared/src/open-swe/custom-node-events.ts
+++ b/packages/shared/src/open-swe/custom-node-events.ts
@@ -48,14 +48,14 @@ export type Step = {
  * Maps custom events to step objects for UI rendering. Skipped steps are filtered out.
  */
 export function mapCustomEventsToSteps(events: CustomNodeEvent[]) {
-  return INIT_STEPS.map((stepName) => {
+  return INIT_STEPS.flatMap((stepName) => {
     const event = [...events]
       .filter((e) => e.action === stepName)
       .sort(
         (a, b) =>
           new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
       )[0];
-    if (!event) return { name: stepName, status: "waiting" as const };
+    if (!event) return [];
     if (event.data.status === "skipped")
       return { name: stepName, status: "skipped" as const };
     if (event.data.status === "pending")
@@ -69,6 +69,6 @@ export function mapCustomEventsToSteps(events: CustomNodeEvent[]) {
         error:
           typeof event.data.error === "string" ? event.data.error : undefined,
       };
-    return { name: stepName, status: "waiting" as const };
+    return [];
   }).filter((step) => step.status !== "skipped");
 }