diff --git a/src/components/Option/Prompt/index.tsx b/src/components/Option/Prompt/index.tsx
index 2d18bbe..7945b37 100644
--- a/src/components/Option/Prompt/index.tsx
+++ b/src/components/Option/Prompt/index.tsx
@@ -135,13 +135,13 @@ export const PromptBody = () => {
                 key: "is_system",
                 render: (is_system) =>
                   is_system ? (
-                    <span className="flex justify-between">
-                       <Computer className="w-5 h-5 mr-3" />
+                    <span className="flex items-center gap-2">
+                       <Computer className="w-5 h-5 " />
                        System Prompt
                     </span>
                   ) : (
-                    <span className="flex justify-between">
-                      <Zap className="w-5 h-5 mr-3" />
+                    <span className="flex items-center gap-2">
+                      <Zap className="w-5 h-5" />
                       Quick Prompt
                     </span>
                   )
diff --git a/src/hooks/useMessageOption.tsx b/src/hooks/useMessageOption.tsx
index ca2446a..d4174b4 100644
--- a/src/hooks/useMessageOption.tsx
+++ b/src/hooks/useMessageOption.tsx
@@ -120,6 +120,7 @@ export const useMessageOption = () => {
   const abortControllerRef = React.useRef<AbortController | null>(null)
 
   const clearChat = () => {
+    navigate("/")
     setMessages([])
     setHistory([])
     setHistoryId(null)
@@ -128,7 +129,6 @@ export const useMessageOption = () => {
     setIsProcessing(false)
     setStreaming(false)
     textareaRef?.current?.focus()
-    navigate("/")
   }
 
   const searchChatMode = async (