diff --git a/source/templates/index.html b/source/templates/index.html
index 1f01539..03a2e35 100644
--- a/source/templates/index.html
+++ b/source/templates/index.html
@@ -521,18 +521,29 @@
 
             window.appendChat = function(user, msg, classes) {
                 const now = new Date();
-                const timeString = now.toLocaleDateString('de-DE') + " " + now.toLocaleTimeString('de-DE', {hour: '2-digit', minute:'2-digit'});
+                const timeString = now.toLocaleTimeString('de-DE', {hour: '2-digit', minute:'2-digit'});
                 const win = document.getElementById('chat-window');
-                const msgDiv = document.createElement("div");
-                msgDiv.className = `message ${role}`;
-                msgDiv.innerHTML = `
-                    <div class="message-content">${text}</div>
-                    <div class="timestamp">${timeString}</div>
-                `;
-                chatBox.appendChild(msgDiv);
-                chatBox.scrollTop = chatBox.scrollHeight; // Automatisch nach unten scrollen
+
+                // Nachricht formatieren (Markdown nur für J.A.R.V.I.S.)
                 let formattedMsg = (user === "J.A.R.V.I.S.") ? marked.parse(msg) : msg;
-                win.innerHTML += `<div class="mb-4"><span class="${classes} block mb-1 text-[10px] uppercase">${user}</span><div class="markdown-content text-slate-300 text-sm">${formattedMsg}</div></div>`;
+
+                // Das HTML-Gerüst für die Nachricht zusammenbauen
+                const messageHtml = `
+                    <div class="mb-4 p-2 rounded bg-slate-800/30 border border-slate-700/50">
+                        <div class="flex justify-between items-center mb-1">
+                            <span class="${classes} text-[10px] uppercase">${user}</span>
+                            <span class="timestamp text-[9px] opacity-50">${timeString}</span>
+                        </div>
+                        <div class="markdown-content text-slate-300 text-sm">
+                            ${formattedMsg}
+                        </div>
+                    </div>
+                `;
+
+                // Nachricht an das Fenster anhängen
+                win.innerHTML += messageHtml;
+                
+                // Automatisch nach unten scrollen
                 win.scrollTop = win.scrollHeight;
             };