diff --git a/core/http/static/chat.js b/core/http/static/chat.js
index 7427ddee..ef15f838 100644
--- a/core/http/static/chat.js
+++ b/core/http/static/chat.js
@@ -38,7 +38,7 @@ function submitSystemPrompt(event) {
   localStorage.setItem("system_prompt", document.getElementById("systemPrompt").value);
   document.getElementById("systemPrompt").blur();
 }
-  
+
 var image = "";
 
 function submitPrompt(event) {
@@ -54,15 +54,15 @@ function submitPrompt(event) {
 }
 
 function readInputImage() {
-  
+
   if (!this.files || !this.files[0]) return;
-    
+
   const FR = new FileReader();
-    
+
   FR.addEventListener("load", function(evt) {
     image = evt.target.result;
-  }); 
-    
+  });
+
   FR.readAsDataURL(this.files[0]);
 }
 
@@ -155,7 +155,7 @@ function readInputImage() {
         stream: true,
       }),
     });
-  
+
     if (!response.ok) {
       Alpine.store("chat").add(
         "assistant",
@@ -163,11 +163,11 @@ function readInputImage() {
       );
       return;
     }
-  
+
     const reader = response.body
       ?.pipeThrough(new TextDecoderStream())
       .getReader();
-  
+
     if (!reader) {
       Alpine.store("chat").add(
         "assistant",
@@ -175,30 +175,74 @@ function readInputImage() {
       );
       return;
     }
-  
-    while (true) {
-      const { value, done } = await reader.read();
-      if (done) break;
-      let dataDone = false;
-      const arr = value.split("\n");
-      arr.forEach((data) => {
-        if (data.length === 0) return;
-        if (data.startsWith(":")) return;
-        if (data === "data: [DONE]") {
-          dataDone = true;
-          return;
+
+    // Function to add content to the chat and handle DOM updates efficiently
+    const addToChat = (token) => {
+      const chatStore = Alpine.store("chat");
+      chatStore.add("assistant", token);
+      // Efficiently scroll into view without triggering multiple reflows
+      const messages = document.getElementById('messages');
+      messages.scrollTop = messages.scrollHeight;
+    };
+
+    let buffer = "";
+    let contentBuffer = [];
+
+    try {
+      while (true) {
+        const { value, done } = await reader.read();
+        if (done) break;
+
+        buffer += value;
+
+        let lines = buffer.split("\n");
+        buffer = lines.pop(); // Retain any incomplete line in the buffer
+
+        lines.forEach((line) => {
+          if (line.length === 0 || line.startsWith(":")) return;
+          if (line === "data: [DONE]") {
+            return;
+          }
+
+          if (line.startsWith("data: ")) {
+            try {
+              const jsonData = JSON.parse(line.substring(6));
+              const token = jsonData.choices[0].delta.content;
+
+              if (token) {
+                contentBuffer.push(token);
+              }
+            } catch (error) {
+              console.error("Failed to parse line:", line, error);
+            }
+          }
+        });
+
+        // Efficiently update the chat in batch
+        if (contentBuffer.length > 0) {
+          addToChat(contentBuffer.join(""));
+          contentBuffer = [];
         }
-        const token = JSON.parse(data.substring(6)).choices[0].delta.content;
-        if (!token) {
-          return;
-        }
-        hljs.highlightAll();
-        Alpine.store("chat").add("assistant", token);
-        document.getElementById('messages').scrollIntoView(false)
-      });
+      }
+
+      // Final content flush if any data remains
+      if (contentBuffer.length > 0) {
+        addToChat(contentBuffer.join(""));
+      }
+
+      // Highlight all code blocks once at the end
       hljs.highlightAll();
-      if (dataDone) break;
+    } catch (error) {
+      console.error("An error occurred while reading the stream:", error);
+      Alpine.store("chat").add(
+        "assistant",
+        `<span class='error'>Error: Failed to process stream</span>`,
+      );
+    } finally {
+      // Perform any cleanup if necessary
+      reader.releaseLock();
     }
+
     // Remove class "loader" from the element with "loader" id
     //document.getElementById("loader").classList.remove("loader");
     document.getElementById("loader").style.display = "none";
@@ -209,7 +253,7 @@ function readInputImage() {
     // set focus to the input
     document.getElementById("input").focus();
   }
-  
+
   document.getElementById("key").addEventListener("submit", submitKey);
   document.getElementById("system_prompt").addEventListener("submit", submitSystemPrompt);
 
@@ -230,7 +274,7 @@ function readInputImage() {
   } else {
     document.getElementById("systemPrompt").value = null;
   }
-  
+
   marked.setOptions({
     highlight: function (code) {
       return hljs.highlightAuto(code).value;
diff --git a/core/http/views/index.html b/core/http/views/index.html
index 7630cc7b..e2cbfe03 100644
--- a/core/http/views/index.html
+++ b/core/http/views/index.html
@@ -4,22 +4,22 @@
 
 <body class="bg-gray-900 text-gray-200">
 <div class="flex flex-col min-h-screen">
-   
+
     {{template "views/partials/navbar" .}}
-    
+
     <div class="container mx-auto px-4 flex-grow">
         <div class="header text-center py-12">
             <h1 class="text-5xl font-bold text-gray-100">Welcome to <i>your</i> LocalAI instance!</h1>
             <p class="mt-4 text-lg">The FOSS alternative to OpenAI, Claude, ...</p>
             <a href="https://localai.io" target="_blank" class="mt-4 inline-block bg-blue-500 text-white py-2 px-4 rounded-lg shadow transition duration-300 ease-in-out hover:bg-blue-700 hover:shadow-lg">
                 <i class="fas fa-book-reader pr-2"></i>Documentation
-            </a>    
+            </a>
         </div>
 
         <div class="models mt-4">
 
             {{template "views/partials/inprogress" .}}
-    
+
             {{ if eq (len .ModelsConfig) 0 }}
             <h2 class="text-center text-3xl font-semibold text-gray-100"> <i class="text-yellow-200 ml-2 fa-solid fa-triangle-exclamation animate-pulse"></i> Ouch! seems you don't have any models installed!</h2>
             <p class="text-center mt-4 text-xl">..install something from the <a class="text-gray-400 hover:text-white ml-1 px-3 py-2 rounded" href="/browse">🖼️ Gallery</a> or check the <a href="https://localai.io/basics/getting_started/" class="text-gray-400 hover:text-white ml-1 px-3 py-2 rounded"> <i class="fa-solid fa-book"></i> Getting started documentation </a></p>
@@ -70,9 +70,9 @@
                         {{ end }}
                     </td>
 
-                    <td class="px-4 py-3"> 
-                        <button 
-                            class="float-right inline-block rounded bg-red-800 px-6 pb-2.5 mb-3 pt-2.5 text-xs font-medium uppercase leading-normal text-white shadow-primary-3 transition duration-150 ease-in-out hover:bg-red-accent-300 hover:shadow-red-2 focus:bg-red-accent-300 focus:shadow-primary-2 focus:outline-none focus:ring-0 active:bg-red-600 active:shadow-primary-2 dark:shadow-black/30 dark:hover:shadow-dark-strong dark:focus:shadow-dark-strong dark:active:shadow-dark-strong" 
+                    <td class="px-4 py-3">
+                        <button
+                            class="float-right inline-block rounded bg-red-800 px-6 pb-2.5 mb-3 pt-2.5 text-xs font-medium uppercase leading-normal text-white shadow-primary-3 transition duration-150 ease-in-out hover:bg-red-accent-300 hover:shadow-red-2 focus:bg-red-accent-300 focus:shadow-primary-2 focus:outline-none focus:ring-0 active:bg-red-600 active:shadow-primary-2 dark:shadow-black/30 dark:hover:shadow-dark-strong dark:focus:shadow-dark-strong dark:active:shadow-dark-strong"
                             data-twe-ripple-color="light" data-twe-ripple-init="" hx-confirm="Are you sure you wish to delete the model?" hx-post="/browse/delete/model/{{.Name}}" hx-swap="outerHTML"><i class="fa-solid fa-cancel pr-2"></i>Delete</button>
                     </td>
                 {{ end }}