diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
new file mode 100644
index 000000000..f37e168b4
--- /dev/null
+++ b/src/lib/components/chat/Chat.svelte
@@ -0,0 +1,1057 @@
+
+
+
+
+ {title
+ ? `${title.length > 30 ? `${title.slice(0, 30)}...` : title} | ${$WEBUI_NAME}`
+ : `${$WEBUI_NAME}`}
+
+
+
+{#if !chatIdProp || (loaded && chatIdProp)}
+
+
+
+{/if}
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index ddb5fd35e..dcc0d4547 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -1,986 +1,5 @@
-
-
- {title
- ? `${title.length > 30 ? `${title.slice(0, 30)}...` : title} | ${$WEBUI_NAME}`
- : `${$WEBUI_NAME}`}
-
-
-
-
-
-
+
diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte
index 34aa88b99..4e0b565a6 100644
--- a/src/routes/(app)/c/[id]/+page.svelte
+++ b/src/routes/(app)/c/[id]/+page.svelte
@@ -1,1001 +1,6 @@
-
-
- {title
- ? `${title.length > 30 ? `${title.slice(0, 30)}...` : title} | ${$WEBUI_NAME}`
- : `${$WEBUI_NAME}`}
-
-
-
-{#if loaded}
-
-
-
-{/if}
+