diff --git a/api/server/routes/search.js b/api/server/routes/search.js
index a9da207f6e..a01901e9d0 100644
--- a/api/server/routes/search.js
+++ b/api/server/routes/search.js
@@ -23,8 +23,8 @@ router.get('/', async function (req, res) {
     if (cache.has(key)) {
       console.log('cache hit', key);
       const cached = cache.get(key);
-      const { pages, pageSize } = cached;
-      res.status(200).send({ conversations: cached[pageNumber], pages, pageNumber, pageSize });
+      const { pages, pageSize, messages } = cached;
+      res.status(200).send({ conversations: cached[pageNumber], pages, pageNumber, pageSize, messages });
       return;
     } else {
       cache.clear();
@@ -53,8 +53,6 @@ router.get('/', async function (req, res) {
     console.log('messages', messages.length, 'titles', titles.length);
     const sortedHits = reduceHits(messages, titles);
     const result = await getConvosQueried(user, sortedHits, pageNumber);
-    cache.set(key, result.cache);
-    delete result.cache;
 
     const activeMessages = [];
     for (let i = 0; i < messages.length; i++) {
@@ -68,6 +66,8 @@ router.get('/', async function (req, res) {
       }
     }
     result.messages = activeMessages;
+    result.cache.messages = activeMessages;
+    cache.set(key, result.cache);
     delete result.cache;
     delete result.convoMap;
     // for debugging
diff --git a/client/src/components/Messages/Message.jsx b/client/src/components/Messages/Message.jsx
index b016593dcf..2ee58c67aa 100644
--- a/client/src/components/Messages/Message.jsx
+++ b/client/src/components/Messages/Message.jsx
@@ -156,7 +156,9 @@ export default function Message({
                 classes={props.titleClass + ' rounded'}
                 subclasses="switch-result pl-2 pb-2"
                 onClick={clickSearchResult}
-              >{`${message.title} | ${message.sender}`}</SubRow>
+              >
+                <strong>{`${message.title} | ${message.sender}`}</strong>
+              </SubRow>
             )}
             <div className="flex flex-grow flex-col gap-3">
               {error ? (
diff --git a/client/src/components/Messages/index.jsx b/client/src/components/Messages/index.jsx
index 2b3309ce56..9027e851e3 100644
--- a/client/src/components/Messages/index.jsx
+++ b/client/src/components/Messages/index.jsx
@@ -9,7 +9,7 @@ import { useSelector } from 'react-redux';
 export default function Messages({ messages, messageTree }) {
   const [currentEditId, setCurrentEditId] = useState(-1);
   const { conversationId } = useSelector((state) => state.convo);
-  const { model, customModel, chatGptLabel } = useSelector((state) => state.submit);
+  const { model, customModel } = useSelector((state) => state.submit);
   const { models } = useSelector((state) => state.models);
   const [showScrollButton, setShowScrollButton] = useState(false);
   const scrollableRef = useRef(null);
@@ -74,7 +74,7 @@ export default function Messages({ messages, messageTree }) {
           <div className="flex w-full items-center justify-center gap-1 border-b border-black/10 bg-gray-50 p-3 text-sm text-gray-500 dark:border-gray-900/50 dark:bg-gray-700 dark:text-gray-300">
             Model: {modelName} {customModel ? `(${customModel})` : null}
           </div>
-          {(messageTree.length === 0 || messages.length === 0 || !messages) ? (
+          {(messageTree.length === 0 || !messages) ? (
             <Spinner />
           ) : (
             <>
diff --git a/client/src/components/Nav/NavLinks.jsx b/client/src/components/Nav/NavLinks.jsx
index d1fc79f6a7..677bd9761c 100644
--- a/client/src/components/Nav/NavLinks.jsx
+++ b/client/src/components/Nav/NavLinks.jsx
@@ -10,8 +10,8 @@ export default function NavLinks({ fetch, onSearchSuccess, clearSearch }) {
   return (
     <>
       { !!searchEnabled && <SearchBar fetch={fetch} onSuccess={onSearchSuccess} clearSearch={clearSearch}/>}
-      <ClearConvos />
       <DarkMode />
+      <ClearConvos />
       <Logout />
     </>
   );
diff --git a/client/src/components/Nav/index.jsx b/client/src/components/Nav/index.jsx
index 97ee1b1b32..d5976841bf 100644
--- a/client/src/components/Nav/index.jsx
+++ b/client/src/components/Nav/index.jsx
@@ -43,7 +43,7 @@ export default function Nav({ navVisible, setNavVisible }) {
     setPage(res.pageNumber);
     setPages(res.pages);
     setIsFetching(false);
-    if (res.messages) {
+    if (res.messages?.length > 0) {
       dispatch(setMessages(res.messages));
       dispatch(setDisabled(true));
     }
diff --git a/client/src/utils/buildTree.js b/client/src/utils/buildTree.js
index fd85c9d078..7f9a4134e5 100644
--- a/client/src/utils/buildTree.js
+++ b/client/src/utils/buildTree.js
@@ -1,5 +1,5 @@
 const even =
-  'w-full border-b border-black/10 dark:border-gray-900/50 text-gray-800 bg-white dark:text-gray-100 group dark:bg-gray-800 hover:bg-gray-100/25 hover:text-gray-700  dark:hover:bg-[#32343e] dark:hover:text-gray-200';
+  'w-full border-b border-black/10 dark:border-gray-900/50 text-gray-800 bg-white dark:text-gray-100 group dark:bg-gray-800 hover:bg-gray-100/25 hover:text-gray-700  dark:hover:bg-gray-900 dark:hover:text-gray-200';
 const odd =
   'w-full border-b border-black/10 bg-gray-50 dark:border-gray-900/50 text-gray-800 dark:text-gray-100 group bg-gray-100 dark:bg-[#444654] hover:bg-gray-100/40 hover:text-gray-700 dark:hover:bg-[#3b3d49] dark:hover:text-gray-200';