diff --git a/backend/internal/client/client_test.go b/backend/internal/client/client_test.go
index 772c2d5..9432606 100644
--- a/backend/internal/client/client_test.go
+++ b/backend/internal/client/client_test.go
@@ -66,8 +66,6 @@ func TestSendMessage(t *testing.T) {
 }
 
 func TestSummarizeChat(t *testing.T) {
-	t.Skip("requires live LLM API - run manually with: go test -run TestSummarizeChat ./internal/client/")
-
 	// Initialize Client
 	baseURL, err := url.Parse("https://llm-api.va.reichard.io/v1")
 	if err != nil {
@@ -80,8 +78,7 @@ func TestSummarizeChat(t *testing.T) {
 	defer cancel()
 
 	// Generate Text Stream
-	userMessage := "Write me a go program that reads in a zip file and prints the contents along with their sizes and mimetype."
-	output, err := client.CreateTitle(ctx, userMessage, model)
+	output, err := client.CreateTitle(ctx, "Hi!", model)
 	if err != nil {
 		t.Fatalf("Failed to generate text stream: %v", err)
 	}
@@ -108,7 +105,7 @@ func TestSendMessageWithImage(t *testing.T) {
 	defer cancel()
 
 	// Load Test Image and Convert to Base64 Data URL
-	imgData, err := os.ReadFile("test_image.jpg")
+	imgData, err := os.ReadFile("./testdata/test_image.jpg")
 	if err != nil {
 		t.Fatalf("Failed to read test image: %v", err)
 	}
diff --git a/backend/internal/client/test_image.jpg b/backend/internal/client/testdata/test_image.jpg
similarity index 100%
rename from backend/internal/client/test_image.jpg
rename to backend/internal/client/testdata/test_image.jpg
diff --git a/frontend/public/pages/chats.html b/frontend/public/pages/chats.html
index 80ac804..f2d94fa 100644
--- a/frontend/public/pages/chats.html
+++ b/frontend/public/pages/chats.html
@@ -3,7 +3,7 @@
   <div
     class="h-dvh pt-16 flex flex-col-reverse pb-36 overflow-scroll mx-auto px-4 md:px-6 max-w-6xl"
   >
-    <template x-for="message in currentChatMessages" :key="message.content">
+    <template x-for="message in currentChatMessages" :key="message.id">
       <div
         :class="['mb-4', message.role === 'user' ? 'text-right' : 'text-left']"
       >
@@ -50,8 +50,20 @@
 
           <hr x-show="message.thinking" class="my-2 border-primary-400/50" />
 
+          <!-- Loading Spinner (Streaming with no content yet) -->
+          <div
+            x-show="message.role === 'assistant' && message.status === 'streaming' && !message.thinking && !message.content"
+            class="flex items-center gap-2 py-1"
+          >
+            <div
+              class="h-4 w-4 animate-spin rounded-full border-2 border-primary-500 border-t-transparent"
+            ></div>
+            <span class="text-xs text-primary-600">Thinking...</span>
+          </div>
+
           <!-- Main Content -->
           <div
+            x-show="message.content || message.status !== 'streaming'"
             class="prose max-w-none text-sm prose-p:my-1 prose-headings:my-2 prose-ul:my-1 prose-ol:my-1 prose-pre:p-0"
             x-html="renderMarkdown(message.content)"
           ></div>
@@ -224,7 +236,7 @@
             @change="
               Array.from($event.target.files).forEach(file => {
                 const reader = new FileReader();
-                reader.onload = (e) => { selectedImages.push(e.target.result as string); };
+                reader.onload = (e) => { selectedImages.push(e.target.result); };
                 reader.readAsDataURL(file);
               });
               $event.target.value = '';