diff --git a/app/components/Message/Agent/Reasoning.vue b/app/components/Message/Agent/Reasoning.vue
index 6880a44..024f6c2 100644
--- a/app/components/Message/Agent/Reasoning.vue
+++ b/app/components/Message/Agent/Reasoning.vue
@@ -72,7 +72,7 @@ const toggleReasoning = async () => {
                 :class="reasoningOpen ? '' : '-rotate-90'"></span>
         </button>
         <div v-if="reasoningOpen" ref="containerRef" @scroll="handleScroll"
-            :class="['reasoning-contaizner max-h-[min(40vh,320px)] overflow-y-auto [scrollbar-width:thin] [scrollbar-color:#888_transparent] [scrollbar-gutter:stable]', scrollState]">
+            :class="['reasoning-container max-h-[min(40vh,320px)] overflow-y-auto [scrollbar-width:thin] [scrollbar-color:#888_transparent] [scrollbar-gutter:stable]', scrollState]">
             <div class="p-2">
                 <MarkdownRenderer :finished="part.finished" :id="part.id" :content="part.content!" />
             </div>
diff --git a/app/pages/agent/[id]/index.vue b/app/pages/agent/[id]/index.vue
index b3e06e5..3a5624c 100644
--- a/app/pages/agent/[id]/index.vue
+++ b/app/pages/agent/[id]/index.vue
@@ -55,25 +55,26 @@ const handleSubmit = async (message: BaseMessage, model: ModelWithProvider | nul
 
     const { sendMessage, startGeneration } = await useChat(topic.id, false);
 
-    sendMessage(message).then(async res => {
-        if (res.ok === false) {
-            console.error('Failed to send message:', res.error);
+    const res = await sendMessage(message);
+    if (res.ok === false) {
+        console.error('Failed to send message:', res.error);
 
-            pendingMessage.value = null;
+        pendingMessage.value = null;
 
-            await navigateTo(`/agent/${route.params.id}`);
+        await navigateTo(`/agent/${route.params.id}`);
 
-            nextTick(() => {
-                inputValue.value = message;
-            });
-        }
-    });
+        nextTick(() => {
+            inputValue.value = message;
+        });
+
+        return;
+    }
 
     await navigateTo(`/agent/${route.params.id}/topic/${topic.id}`);
 
     autoRenameTopic(topic.id);
 
-    return startGeneration(model);
+    return startGeneration(model, undefined, route.params.id as string);
 };
 </script>
 
diff --git a/app/pages/agent/[id]/topic/[topicId].vue b/app/pages/agent/[id]/topic/[topicId].vue
index f99e4c4..582c690 100644
--- a/app/pages/agent/[id]/topic/[topicId].vue
+++ b/app/pages/agent/[id]/topic/[topicId].vue
@@ -8,7 +8,7 @@ const rootStart = Date.now();
 const chatPaneWrapper = ref<HTMLElement | null>(null);
 const inputValue = ref<BaseMessage>({ content: '', fileIds: [] });
 const route = useRoute();
-const { getAgent } = await useAgents();
+const { getAgent, deleteTopic } = await useAgents();
 const { open: sidebarOpen, openSidebar } = useSidebar();
 const { providers, allModels } = await useModels();
 const { addShortcut } = useKeyboardShortcuts();
@@ -84,12 +84,6 @@ const handleRegenerate = async (message: Message) => {
     }
 }
 
-const handleDelete = async (rootMessage: Message) => {
-    await $fetch(`/api/messages/${rootMessage.id}`, {
-        method: 'DELETE',
-    });
-}
-
 const flatMessages = computed(() => {
     const messages: Message[] = [];
 
@@ -103,6 +97,17 @@ const flatMessages = computed(() => {
     return messages;
 });
 
+const handleDelete = async (rootMessage: Message) => {
+    await $fetch(`/api/messages/${rootMessage.id}`, {
+        method: 'DELETE',
+    });
+
+    if (flatMessages.value.length === 0) {
+        await navigateTo(`/agent/${route.params.id}`);
+        deleteTopic(route.params.id as string, topicId.value);
+    }
+}
+
 const activeGeneration = computed(() => {
     if (topic.value === null) return null;
     const generations = flatMessages.value.flatMap(message => message.generation);
@@ -190,6 +195,14 @@ addShortcut(['ctrl', 'alt', 'arrowright'], async (event) => {
     }
 })
 
+addShortcut(['ctrl', 'alt', 'backspace'], async (event) => {
+    event.preventDefault();
+    event.stopPropagation();
+
+    await navigateTo(`/agent/${route.params.id}`);
+    deleteTopic(route.params.id as string, topicId.value);
+})
+
 onMounted(() => {
     scrollToBottom('instant');
 });
diff --git a/app/pages/index.vue b/app/pages/index.vue
index 957814f..b2290cb 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -117,7 +117,7 @@ const handleChatSubmit = async (message: BaseMessage, model: ModelWithProvider |
 
     autoRenameTopic(topic.id);
 
-    return startGeneration(model);
+    return startGeneration(model, undefined, targetAgent.id);
 };
 
 onMounted(() => {
diff --git a/utils/message.ts b/utils/message.ts
index f988bdd..028dd11 100644
--- a/utils/message.ts
+++ b/utils/message.ts
@@ -57,8 +57,6 @@ export const marshallMessages = (agent: Agent, messages: Readonly<MessageEntity[
     for (const message of messages) {
         switch (message.role) {
             case 'user': {
-                console.log("marshalling user message", message);
-
                 const attachments = message.attachments.map(attachment => {
                     if (attachment.file.mimeType.startsWith('image/')) {
                         return {
@@ -75,12 +73,13 @@ export const marshallMessages = (agent: Agent, messages: Readonly<MessageEntity[
                     };
                 }) as (FilePart | ImagePart)[];
 
+                let messageDate = new Date(message.createdAt);
                 marshalledMessages.push({
                     role: 'user',
                     content: [
                         {
                             type: 'text',
-                            text: message.content!
+                            text: `[${messageDate.toDateString()} ${messageDate.toLocaleTimeString()}]: ${message.content!}`
                         },
                         ...attachments,
                     ],
@@ -216,4 +215,4 @@ export const marshallMessages = (agent: Agent, messages: Readonly<MessageEntity[
     }
 
     return Ok(marshalledMessages);
-};
\ No newline at end of file
+};