diff --git a/sweep_chat/components/App.tsx b/sweep_chat/components/App.tsx
index 5357e68519..dda499c9b8 100644
--- a/sweep_chat/components/App.tsx
+++ b/sweep_chat/components/App.tsx
@@ -92,6 +92,7 @@ import {
   Message,
   CodeSuggestion,
   StatefulCodeSuggestion,
+  ChatSummary,
 } from '@/lib/types'
 
 import { Octokit } from 'octokit'
@@ -113,6 +114,7 @@ import CodeMirrorMerge from 'react-codemirror-merge'
 import { dracula } from '@uiw/codemirror-theme-dracula'
 import { EditorView } from 'codemirror'
 import { debounce } from 'lodash'
+import { formatDistanceToNow } from 'date-fns';
 import { streamMessages } from '@/lib/streamingUtils'
 import { Alert, AlertDescription, AlertTitle } from './ui/alert'
 import { Skeleton } from './ui/skeleton'
@@ -774,6 +776,11 @@ const parsePullRequests = async (
           pull_number: parseInt(prNumber!),
         })
       ).data.sort((a, b) => {
+        const aIsMarkdown = a.filename.endsWith('.md') || a.filename.endsWith('.rst')
+        const bIsMarkdown = b.filename.endsWith('.md') || b.filename.endsWith('.rst')
+        if (aIsMarkdown !== bIsMarkdown) {
+          return aIsMarkdown ? 1 : -1;
+        }
         const statusOrder: Record<string, number> = {
           renamed: 0,
           copied: 1,
@@ -864,6 +871,10 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
   const [repos, setRepos] = useState<Repository[]>([])
 
   const [messagesId, setMessagesId] = useState<string>(defaultMessageId)
+  const [previousChats, setPreviousChats] = useLocalStorage<ChatSummary[]>(
+    'previousChats',
+    []
+  )
 
   const authorizedFetch = useCallback(
     (url: string, options: RequestInit = {}) => {
@@ -881,11 +892,21 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
   )
 
   useEffect(() => {
-    console.log(defaultMessageId)
-    if (defaultMessageId) {
+    if (messagesId && !previousChats.some((chat) => chat.messagesId === messagesId) && messages.length > 0) {
+      setPreviousChats([...previousChats, {
+        messagesId: messagesId,
+        createdAt: new Date().toISOString(),
+        initialMessage: messages[0].content
+      }])
+    }
+  }, [messagesId, messages.length])
+
+  useEffect(() => {
+    console.log('loading message', messagesId)
+    if (messagesId) {
       ;(async () => {
         const response = await authorizedFetch(
-          `/backend/messages/load/${defaultMessageId}`,
+          `/backend/messages/load/${messagesId}`,
           {
             method: 'GET',
           }
@@ -936,7 +957,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
         }
       })()
     }
-  }, [defaultMessageId])
+  }, [messagesId])
 
   useEffect(() => {
     if (messagesContainerRef.current) {
@@ -1013,6 +1034,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
     currentRepoName: string,
     currentMessages: Message[],
     currentSnippets: Snippet[],
+    currentMessagesId: string,
     currentUserMentionedPullRequest: PullRequest | null = null,
     currentUserMentionedPullRequests: PullRequest[] | null = null,
     currentCommitToPR: boolean = false,
@@ -1035,7 +1057,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
         repo_name: currentRepoName || repoName,
         messages: currentMessages || messages,
         snippets: currentSnippets || snippets,
-        message_id: messagesId || '',
+        message_id: currentMessagesId || '',
         original_code_suggestions:
           currentOriginalCodeSuggestions || originalSuggestedChanges,
         code_suggestions: currentSuggestedChanges || originalSuggestedChanges,
@@ -1052,7 +1074,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
     const saveData = await saveResponse.json()
     if (saveData.status == 'success') {
       const { message_id } = saveData
-      if (!messagesId && message_id) {
+      if (!currentMessagesId && message_id) {
         setMessagesId(message_id)
         const updatedUrl = `/c/${message_id}`
         window.history.pushState({}, '', updatedUrl)
@@ -1068,6 +1090,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
         repoName,
         messages,
         snippets,
+        currentMessagesId,
         userMentionedPullRequest,
         userMentionedPullRequests,
         commitToPR,
@@ -1082,6 +1105,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
           repoName,
           messages,
           snippets,
+          currentMessagesId,
           userMentionedPullRequest,
           userMentionedPullRequests,
           commitToPR,
@@ -1099,12 +1123,12 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
   ) // can tune these timeouts
 
   useEffect(() => {
-    console.log('pr', pullRequest)
     if (messages.length > 0 && snippets.length > 0) {
       debouncedSave(
         repoName,
         messages,
         snippets,
+        messagesId,
         userMentionedPullRequest,
         userMentionedPullRequests,
         commitToPR,
@@ -1119,6 +1143,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
     repoName,
     messages,
     snippets,
+    messagesId,
     userMentionedPullRequest,
     userMentionedPullRequests,
     commitToPR,
@@ -1253,7 +1278,6 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
           }))
           setSuggestedChanges(currentCodeSuggestions)
         }
-        console.log(isStream.current)
         if (!isStream.current) {
           currentCodeSuggestions = currentCodeSuggestions.map((suggestion) =>
             suggestion.state == 'done'
@@ -1265,7 +1289,6 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
                   state: 'error',
                 }
           )
-          console.log(currentCodeSuggestions)
           setSuggestedChanges(currentCodeSuggestions)
         }
       } catch (e: any) {
@@ -1566,7 +1589,151 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
 
   return (
     <>
-      <main className="flex h-screen flex-col items-center justify-between p-12">
+      <main className="flex h-screen flex-col items-center justify-between p-12 pt-20">
+        <NavigationMenu className="fixed top-0 left-0 w-[100vw]">
+          <div className="flex items-center justify-between w-[100vw] p-4 px-4 mb-2 align-center">
+            <img
+              src="/banner.png"
+              className="h-10 rounded-lg hover:cursor-pointer box-shadow-md"
+              onClick={() => {
+                window.location.href = '/'
+              }}
+            />
+
+            <DropdownMenu>
+              <DropdownMenuTrigger className="outline-none">
+                <p className="text-sm font-bold flex items-center">
+                  Previous Chats <FaChevronDown className="ml-2" />
+                </p>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="center" className="mt-2">
+                {previousChats.length > 0 ? previousChats.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()).slice(0, 10).map((chat) => (
+                  <DropdownMenuItem
+                    key={chat.messagesId}
+                    className="hover:cursor-pointer"
+                    onClick={() => {
+                      setMessagesId(chat.messagesId)
+                      window.location.href = `/c/${chat.messagesId}`
+                    }}
+                    disabled={chat.messagesId === messagesId}
+                  >
+                    <b>{truncate(chat.initialMessage, 80)}</b>&nbsp;created {formatDistanceToNow(new Date(chat.createdAt), { addSuffix: true })}
+                  </DropdownMenuItem>
+                )) : (
+                    <DropdownMenuItem>No history</DropdownMenuItem>
+                )}
+              </DropdownMenuContent>
+              {/* Warning: these message IDs are stored in local storage.
+                If you want to delete them, you will need to clear your browser cache. */}
+            </DropdownMenu>
+
+            <NavigationMenuList className='w-full flex justify-between'>
+              <Dialog>
+                <DialogTrigger asChild>
+                  <Button variant="outline" className="ml-4">
+                    <FaCog className="mr-2" />
+                    Settings
+                  </Button>
+                </DialogTrigger>
+                <DialogContent className="w-120 p-16">
+                  <h2 className="text-2xl font-bold mb-4 text-center">Settings</h2>
+                  <Label>Model</Label>
+                  <DropdownMenu>
+                    <DropdownMenuTrigger asChild>
+                      <Button variant="outline" className="text-left">
+                        {modelMap[model]}
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent className="w-56">
+                      <DropdownMenuLabel>Anthropic</DropdownMenuLabel>
+                      <DropdownMenuSeparator />
+                      <DropdownMenuRadioGroup
+                        value={model}
+                        onValueChange={(value) =>
+                          setModel(value as keyof typeof modelMap)
+                        }
+                      >
+                        {Object.keys(modelMap).map((model) =>
+                          model.includes('claude') ? (
+                            <DropdownMenuRadioItem value={model} key={model}>
+                              {modelMap[model]}
+                            </DropdownMenuRadioItem>
+                          ) : null
+                        )}
+                      </DropdownMenuRadioGroup>
+                      <DropdownMenuLabel>OpenAI</DropdownMenuLabel>
+                      <DropdownMenuSeparator />
+                      <DropdownMenuRadioGroup
+                        value={model}
+                        onValueChange={(value) =>
+                          setModel(value as keyof typeof modelMap)
+                        }
+                      >
+                        {Object.keys(modelMap).map((model) =>
+                          model.includes('gpt') ? (
+                            <DropdownMenuRadioItem value={model} key={model}>
+                              {modelMap[model]}
+                            </DropdownMenuRadioItem>
+                          ) : null
+                        )}
+                      </DropdownMenuRadioGroup>
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                  <Label className="mt-4">Number of snippets</Label>
+                  <div className="flex items-center">
+                    <span className="mr-4 whitespace-nowrap">{k}</span>
+                    <Slider
+                      defaultValue={[DEFAULT_K]}
+                      max={20}
+                      min={1}
+                      step={1}
+                      onValueChange={(value) => setK(value[0])}
+                      value={[k]}
+                      className="w-[300px] my-0 py-0"
+                    />
+                  </div>
+                </DialogContent>
+              </Dialog>
+
+              <DropdownMenu>
+                <DropdownMenuTrigger className="outline-none">
+                  <div className="flex items-center w-12 h-12 ml-2">
+                    <img
+                      className="rounded-full w-10 h-10 m-0"
+                      src={session!.user!.image || ''}
+                      alt={session!.user!.name || ''}
+                    />
+                  </div>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end">
+                  <DropdownMenuLabel>
+                    <p className="text-md font-bold">
+                      {session!.user!.username! || session!.user!.name}
+                    </p>
+                  </DropdownMenuLabel>
+                  {session?.user?.email && (
+                    <DropdownMenuItem>{session.user.email}</DropdownMenuItem>
+                  )}
+                  <DropdownMenuSeparator />
+                  <DropdownMenuItem
+                    className="cursor-pointer"
+                    onClick={() => setShowSurvey((prev) => !prev)}
+                  >
+                    <FaComments className="mr-2" />
+                    Feedback
+                  </DropdownMenuItem>
+                  <DropdownMenuItem
+                    className="cursor-pointer"
+                    onClick={() => signOut()}
+                  >
+                    <FaSignOutAlt className="mr-2" />
+                    Sign Out
+                  </DropdownMenuItem>
+                </DropdownMenuContent>
+              </DropdownMenu>
+            </NavigationMenuList>
+          </div>
+        </NavigationMenu>
         <Toaster />
         {showSurvey && process.env.NEXT_PUBLIC_SURVEY_ID && (
           <Survey
@@ -1583,10 +1750,9 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
         )}
         <div
           className={`mb-4 w-full flex items-center ${
-            repoNameValid || defaultMessageId ? '' : 'grow'
+            repoNameValid || messagesId ? '' : 'grow'
           }`}
         >
-          {/* <img src="https://avatars.githubusercontent.com/u/170980334?v=4" className="w-12 h-12 rounded-full" /> */}
           <AutoComplete
             options={repos.map((repo) => ({
               label: repo.full_name,
@@ -1666,7 +1832,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
           />
           <Input
             placeholder="Branch"
-            className="w-[600px] ml-4"
+            className="w-[400px] ml-4"
             value={baseBranch}
             onChange={(e) => setBaseBranch(e.target.value)}
           />
@@ -1674,22 +1840,20 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
             <NavigationMenu>
               <NavigationMenuList>
                 <NavigationMenuItem>
-                  <NavigationMenuTrigger className="bg-secondary hover:bg-secondary">
+                  <NavigationMenuTrigger className="bg-secondary hover:bg-secondary ml-4" disabled={isLoading || !userMentionedPullRequest}>
                     {userMentionedPullRequest && commitToPR ? (
                       <Button
                         className="w-full"
                         variant="secondary"
-                        disabled={isLoading}
                       >
                         <FaCodeBranch />
-                        &nbsp;&nbsp;Will commit to{' '}
+                        &nbsp;&nbsp;Will commit to PR #
                         {userMentionedPullRequest.number}
                       </Button>
                     ) : (
                       <Button
                         className="w-full"
                         variant="secondary"
-                        disabled={isLoading || !userMentionedPullRequest}
                       >
                         <FaCodeBranch />
                         &nbsp;&nbsp;Will create new PR
@@ -1744,108 +1908,6 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
           ) : (
             <></>
           )}
-          <Dialog>
-            <DialogTrigger asChild>
-              <Button variant="outline" className="ml-4">
-                <FaCog className="mr-2" />
-                Settings
-              </Button>
-            </DialogTrigger>
-            <DialogContent className="w-120 p-16">
-              <h2 className="text-2xl font-bold mb-4 text-center">Settings</h2>
-              <Label>Model</Label>
-              <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                  <Button variant="outline" className="text-left">
-                    {modelMap[model]}
-                  </Button>
-                </DropdownMenuTrigger>
-                <DropdownMenuContent className="w-56">
-                  <DropdownMenuLabel>Anthropic</DropdownMenuLabel>
-                  <DropdownMenuSeparator />
-                  <DropdownMenuRadioGroup
-                    value={model}
-                    onValueChange={(value) =>
-                      setModel(value as keyof typeof modelMap)
-                    }
-                  >
-                    {Object.keys(modelMap).map((model) =>
-                      model.includes('claude') ? (
-                        <DropdownMenuRadioItem value={model} key={model}>
-                          {modelMap[model]}
-                        </DropdownMenuRadioItem>
-                      ) : null
-                    )}
-                  </DropdownMenuRadioGroup>
-                  <DropdownMenuLabel>OpenAI</DropdownMenuLabel>
-                  <DropdownMenuSeparator />
-                  <DropdownMenuRadioGroup
-                    value={model}
-                    onValueChange={(value) =>
-                      setModel(value as keyof typeof modelMap)
-                    }
-                  >
-                    {Object.keys(modelMap).map((model) =>
-                      model.includes('gpt') ? (
-                        <DropdownMenuRadioItem value={model} key={model}>
-                          {modelMap[model]}
-                        </DropdownMenuRadioItem>
-                      ) : null
-                    )}
-                  </DropdownMenuRadioGroup>
-                </DropdownMenuContent>
-              </DropdownMenu>
-              <Label className="mt-4">Number of snippets</Label>
-              <div className="flex items-center">
-                <span className="mr-4 whitespace-nowrap">{k}</span>
-                <Slider
-                  defaultValue={[DEFAULT_K]}
-                  max={20}
-                  min={1}
-                  step={1}
-                  onValueChange={(value) => setK(value[0])}
-                  value={[k]}
-                  className="w-[300px] my-0 py-0"
-                />
-              </div>
-            </DialogContent>
-          </Dialog>
-          <DropdownMenu>
-            <DropdownMenuTrigger className="outline-none">
-              <div className="flex items-center">
-                <img
-                  className="rounded-full w-12 h-12 m-0 ml-2"
-                  src={session!.user!.image || ''}
-                  alt={session!.user!.name || ''}
-                />
-              </div>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
-              <DropdownMenuLabel>
-                <p className="text-md font-bold">
-                  {session!.user!.username! || session!.user!.name}
-                </p>
-              </DropdownMenuLabel>
-              {session?.user?.email && (
-                <DropdownMenuItem>{session.user.email}</DropdownMenuItem>
-              )}
-              <DropdownMenuSeparator />
-              <DropdownMenuItem
-                className="cursor-pointer"
-                onClick={() => setShowSurvey((prev) => !prev)}
-              >
-                <FaComments className="mr-2" />
-                Feedback
-              </DropdownMenuItem>
-              <DropdownMenuItem
-                className="cursor-pointer"
-                onClick={() => signOut()}
-              >
-                <FaSignOutAlt className="mr-2" />
-                Sign Out
-              </DropdownMenuItem>
-            </DropdownMenuContent>
-          </DropdownMenu>
         </div>
         {snippets.length && repoName ? (
           <ContextSideBar
@@ -1861,7 +1923,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
         <div
           ref={messagesContainerRef}
           className="w-full border flex-grow mb-4 p-4 max-h-[90%] overflow-y-auto rounded-xl"
-          hidden={!repoNameValid && !defaultMessageId}
+          hidden={!repoNameValid && !messagesId}
         >
           {messages.length > 0
             ? messages.map((message, index) => (
@@ -1910,6 +1972,8 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
                     setMessages(newMessages)
                     setIsCreatingPullRequest(false)
                     if (index == 0) {
+                      window.history.pushState({}, "", "/")
+                      setMessagesId("")
                       setOriginalSuggestedChanges([])
                       setSuggestedChanges([])
                       setIsProcessingSuggestedChanges(false)
@@ -1927,7 +1991,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
                   }}
                 />
               ))
-            : defaultMessageId.length > 0 && (
+            : messagesId.length > 0 && (
                 <div className="space-y-4">
                   <Skeleton className="h-12 ml-32 rounded-md" />
                   <Skeleton className="h-12 mr-32 rounded-md" />
@@ -2273,7 +2337,7 @@ function App({ defaultMessageId = '' }: { defaultMessageId?: string }) {
             </div>
           )}
         </div>
-        {(repoNameValid || defaultMessageId) && (
+        {(repoNameValid || messagesId) && (
           <div className={`flex w-full`}>
             {isStream.current ? (
               <Button
diff --git a/sweep_chat/lib/types.ts b/sweep_chat/lib/types.ts
index 3fbbcbd482..1bf2008150 100644
--- a/sweep_chat/lib/types.ts
+++ b/sweep_chat/lib/types.ts
@@ -68,6 +68,12 @@ interface Message {
   }
 }
 
+interface ChatSummary {
+  messagesId: string
+  createdAt: string
+  initialMessage: string
+}
+
 export type {
   Repository,
   Snippet,
@@ -76,4 +82,5 @@ export type {
   Message,
   CodeSuggestion,
   StatefulCodeSuggestion,
+  ChatSummary
 }
diff --git a/sweep_chat/package-lock.json b/sweep_chat/package-lock.json
index fd664f6efe..4b5be29d24 100644
--- a/sweep_chat/package-lock.json
+++ b/sweep_chat/package-lock.json
@@ -35,6 +35,7 @@
         "clsx": "^2.1.1",
         "cmdk": "^1.0.0",
         "codemirror": "^6.0.1",
+        "date-fns": "^3.6.0",
         "diff": "^5.2.0",
         "fast-json-patch": "^3.1.1",
         "lodash": "^4.17.21",
@@ -6200,6 +6201,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/date-fns": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz",
+      "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
+    },
     "node_modules/dayjs": {
       "version": "1.11.11",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
diff --git a/sweep_chat/package.json b/sweep_chat/package.json
index 83105b7a69..6f64eba09f 100644
--- a/sweep_chat/package.json
+++ b/sweep_chat/package.json
@@ -41,6 +41,7 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.0.0",
     "codemirror": "^6.0.1",
+    "date-fns": "^3.6.0",
     "diff": "^5.2.0",
     "fast-json-patch": "^3.1.1",
     "lodash": "^4.17.21",
@@ -87,11 +88,13 @@
     "tabWidth": 2,
     "trailingComma": "es5",
     "parser": "typescript",
-    "overrides": [{
-      "files": "*.css",
-      "options": {
-        "parser": "css"
+    "overrides": [
+      {
+        "files": "*.css",
+        "options": {
+          "parser": "css"
+        }
       }
-    }]
+    ]
   }
 }
diff --git a/sweep_chat/public/banner.png b/sweep_chat/public/banner.png
new file mode 100644
index 0000000000..3116a0fb40
Binary files /dev/null and b/sweep_chat/public/banner.png differ