diff --git a/langgraph/src/components/ChatInput.tsx b/langgraph/src/components/ChatInput.tsx
index e205cb3..5bdb58b 100644
--- a/langgraph/src/components/ChatInput.tsx
+++ b/langgraph/src/components/ChatInput.tsx
@@ -15,7 +15,6 @@ interface ChatInputProps {
   sourceLabel: string | null;
   setSourceLabel: (v: string | null) => void;
   concurrentStatus: "idle" | "generating" | "stopping" | "cancelling";
-  setConcurrentStatus: (s: "idle" | "generating" | "stopping" | "cancelling") => void;
   onSubmit: (e: React.FormEvent) => void;
   onStop: () => void;
   onPaste: (e: React.ClipboardEvent) => void;
diff --git a/langgraph/src/components/ChatMessages.tsx b/langgraph/src/components/ChatMessages.tsx
index 72686d4..1f9910d 100644
--- a/langgraph/src/components/ChatMessages.tsx
+++ b/langgraph/src/components/ChatMessages.tsx
@@ -305,9 +305,9 @@ export function ChatMessages({
 
           return (
             <div key={message.id ?? idx} className="flex flex-col gap-3">
-              {hasThinking && hasToolCalls && (
-                <div className="max-w-[85%]">
-                  <MessageBubble content={bubbleContent} role="ai" isStreaming={thread.isLoading && isLastAi} />
+              {hasToolCalls && (plainTextContent || hasThinking) && (
+                <div className="max-w-[85%] rounded-2xl rounded-bl-sm bg-muted text-foreground px-4 py-2.5 text-sm">
+                  <MessageBubble content={bubbleContent} role="ai" isStreaming={false} />
                 </div>
               )}
 
diff --git a/langgraph/src/main.tsx b/langgraph/src/main.tsx
index 4c8e882..7a0d5d7 100644
--- a/langgraph/src/main.tsx
+++ b/langgraph/src/main.tsx
@@ -275,6 +275,7 @@ function App() {
     const lastHuman = humanMsgs[humanMsgs.length - 1];
     if (!lastHuman || thread.isLoading) return;
 
+    setConcurrentStatus("generating");
     const enabledTools =
       activeTools.size > 0
         ? TOOL_GROUPS.filter((g) => activeTools.has(g.key)).flatMap((g) => [...g.tools])
@@ -450,7 +451,6 @@ function App() {
             sourceLabel={sourceLabel}
             setSourceLabel={setSourceLabel}
             concurrentStatus={concurrentStatus}
-            setConcurrentStatus={setConcurrentStatus}
             onSubmit={handleSubmit}
             onStop={handleStop}
             onPaste={handlePaste}