diff --git a/src/components/Chat/ChatConfigComponents/exampleAgents.ts b/src/components/Chat/ChatConfigComponents/exampleAgents.ts
index 6b29235a..3cdc4836 100644
--- a/src/components/Chat/ChatConfigComponents/exampleAgents.ts
+++ b/src/components/Chat/ChatConfigComponents/exampleAgents.ts
@@ -8,13 +8,11 @@ const defaultAgentPromptTemplate: PromptTemplate = [
 Here are some guidelines you must follow:
 - Always respond in the same language as the user's query and context.
 - You may be given context from the user's knowledge base that is relevant to the user's query. If so, please use it.
-- You may be given a list of tools that you can use to help you search the user's knowledge base or perform actions on the user's knowledge base.
-- If provided to you, the search tool is particularly useful, although you should *not* use it initially if context has already been provided.
 - The date and time of the query is {TODAY}.`,
   },
   {
     role: 'user',
-    content: `The user's query is: {QUERY}`,
+    content: `{QUERY}`,
   },
 ]
 
diff --git a/src/components/Chat/MessageComponents/ChatSources.tsx b/src/components/Chat/MessageComponents/ChatSources.tsx
index a8e42317..00e05d63 100644
--- a/src/components/Chat/MessageComponents/ChatSources.tsx
+++ b/src/components/Chat/MessageComponents/ChatSources.tsx
@@ -64,8 +64,8 @@ const ChatSources: React.FC<ChatSourcesProps> = ({ contextItems }) => {
                 </CardDescription>
               </Card>
             </HoverCardTrigger>
-            <HoverCardContent className="max-h-[60vh] w-80 overflow-y-auto">
-              <div className="p-2">
+            <HoverCardContent className="z-[100] max-h-[60vh] w-80 overflow-y-auto" sideOffset={5}>
+              <div className="">
                 <MarkdownRenderer content={getItemContent(contextItem)} />
               </div>
             </HoverCardContent>
diff --git a/src/components/Chat/MessageComponents/UserMessage.tsx b/src/components/Chat/MessageComponents/UserMessage.tsx
index e289e429..ea353740 100644
--- a/src/components/Chat/MessageComponents/UserMessage.tsx
+++ b/src/components/Chat/MessageComponents/UserMessage.tsx
@@ -8,17 +8,29 @@ interface UserMessageProps {
   message: ReorChatMessage
 }
 
-const UserMessage: React.FC<UserMessageProps> = ({ message }) => (
-  <div className="mb-0 w-full flex-col gap-1">
-    <div className="flex grow flex-col">
-      <ReactMarkdown
-        rehypePlugins={[rehypeRaw]}
-        className="max-w-[95%] break-words text-2xl font-bold text-neutral-400"
-      >
-        {getDisplayMessage(message)}
-      </ReactMarkdown>
+const UserMessage: React.FC<UserMessageProps> = ({ message }) => {
+  const displayMessage = getDisplayMessage(message)
+  const messageLength = displayMessage?.length || 0
+
+  // Determine font size class based on message length
+  const getFontSizeClass = () => {
+    if (messageLength > 100) return 'text-lg'
+    if (messageLength > 50) return 'text-xl'
+    return 'text-2xl'
+  }
+
+  return (
+    <div className="mb-0 w-full flex-col gap-1">
+      <div className="flex grow flex-col">
+        <ReactMarkdown
+          rehypePlugins={[rehypeRaw]}
+          className={`max-w-[95%] break-words font-bold text-neutral-400 ${getFontSizeClass()}`}
+        >
+          {displayMessage}
+        </ReactMarkdown>
+      </div>
     </div>
-  </div>
-)
+  )
+}
 
 export default UserMessage
diff --git a/src/components/Common/EmptyPage.tsx b/src/components/Common/EmptyPage.tsx
index 0ba0bc17..c2ee86e6 100644
--- a/src/components/Common/EmptyPage.tsx
+++ b/src/components/Common/EmptyPage.tsx
@@ -8,27 +8,29 @@ const EmptyPage: React.FC = () => {
   const { createUntitledNote } = useContentContext()
 
   return (
-    <div className="absolute flex size-full flex-col items-center justify-center overflow-hidden pb-40 text-white">
-      <div className="opacity-10">
-        <ImFileEmpty size={168} />
-      </div>
-      <h3 className="mb-0 opacity-90">No File Selected!</h3>
-      <p className="mt-1 opacity-70">Open a file to begin using Reor!</p>
-      <div className="m-0 flex max-w-md flex-col gap-2">
-        <button
-          className="cursor-pointer border-0 bg-transparent pb-1 pr-0 text-left text-2lg text-blue-500"
-          onClick={() => createUntitledNote()}
-          type="button"
-        >
-          Create a File
-        </button>
-        <button
-          className="cursor-pointer border-0 bg-transparent pb-1 pr-0 text-left text-2lg text-blue-500"
-          onClick={() => setIsNewDirectoryModalOpen(true)}
-          type="button"
-        >
-          Create a Folder
-        </button>
+    <div className="flex size-full flex-col items-center justify-center text-white">
+      <div className="flex flex-col items-center">
+        <div className="opacity-10">
+          <ImFileEmpty size={168} />
+        </div>
+        <h3 className="mb-0 opacity-90">No File Selected!</h3>
+        <p className="mt-1 opacity-70">Open a file and get back to work!</p>
+        <div className="mt-2 flex flex-col gap-2">
+          <button
+            className="cursor-pointer border-0 bg-transparent pb-1 pr-0 text-left text-2lg text-blue-500"
+            onClick={() => createUntitledNote()}
+            type="button"
+          >
+            Create a File
+          </button>
+          <button
+            className="cursor-pointer border-0 bg-transparent pb-1 pr-0 text-left text-2lg text-blue-500"
+            onClick={() => setIsNewDirectoryModalOpen(true)}
+            type="button"
+          >
+            Create a Folder
+          </button>
+        </div>
       </div>
     </div>
   )
diff --git a/src/components/Common/MarkdownRenderer.tsx b/src/components/Common/MarkdownRenderer.tsx
index c734644e..4c8eb6f3 100644
--- a/src/components/Common/MarkdownRenderer.tsx
+++ b/src/components/Common/MarkdownRenderer.tsx
@@ -9,7 +9,7 @@ interface MarkdownRendererProps {
 const MarkdownRenderer: React.FC<MarkdownRendererProps> = ({ content }) => {
   return (
     <ReactMarkdown
-      className="overflow-hidden whitespace-normal break-words leading-relaxed text-muted-foreground"
+      className="overflow-hidden whitespace-normal break-words text-sm leading-relaxed text-muted-foreground"
       rehypePlugins={[rehypeRaw]}
     >
       {content}
diff --git a/src/components/MainPage.tsx b/src/components/MainPage.tsx
index 2ca1c9da..c1243818 100644
--- a/src/components/MainPage.tsx
+++ b/src/components/MainPage.tsx
@@ -47,7 +47,7 @@ const MainContent: React.FC = () => {
 
 const MainPageContent: React.FC = () => {
   const { currentlyOpenFilePath } = useFileContext()
-  const { showChatbot, setShowChatbot } = useChatContext()
+  const { showChatbot, setShowChatbot, openNewChat } = useChatContext()
   const { setShowEditor, showEditor } = useContentContext()
   const { getShortcutDescription } = useAppShortcuts()
 
@@ -57,7 +57,7 @@ const MainPageContent: React.FC = () => {
     <div className="relative flex h-screen flex-col overflow-hidden">
       <TitleBar />
       <div className="flex min-h-0 flex-1">
-        <div className="border-y-0 border-l-0 border-r-[0.001px] border-solid border-neutral-700 pt-2.5">
+        <div className="border-y-0 border-l-0 border-r-[0.001px] border-solid border-neutral-700">
           <IconsSidebar getShortcutDescription={getShortcutDescription} />
         </div>
 
@@ -85,7 +85,11 @@ const MainPageContent: React.FC = () => {
                   {showChatbot && (
                     <ResizablePanel defaultSize={currentlyOpenFilePath && showEditor ? 35 : 100}>
                       <div className="relative size-full bg-pink-200">
-                        <WindowControls onClose={() => setShowChatbot(false)} onMaximize={() => setShowEditor(false)} />
+                        <WindowControls
+                          onClose={() => setShowChatbot(false)}
+                          onMaximize={() => setShowEditor(false)}
+                          onNewChat={() => openNewChat()}
+                        />
                         <ChatComponent />
                       </div>
                     </ResizablePanel>
diff --git a/src/components/TitleBar/NavigationButtons.tsx b/src/components/TitleBar/NavigationButtons.tsx
index 74d435be..37ac18bc 100644
--- a/src/components/TitleBar/NavigationButtons.tsx
+++ b/src/components/TitleBar/NavigationButtons.tsx
@@ -8,7 +8,7 @@ import '../../styles/history.scss'
 import { useFileContext } from '@/contexts/FileContext'
 import { useContentContext } from '@/contexts/ContentContext'
 
-const FileHistoryNavigator: React.FC = () => {
+const NavigationButtons: React.FC = () => {
   const [showMenu, setShowMenu] = useState<string>('')
   const longPressTimer = useRef<NodeJS.Timeout | null>(null)
   const buttonRefBack = useRef<HTMLButtonElement>(null)
@@ -160,4 +160,4 @@ const FileHistoryNavigator: React.FC = () => {
   )
 }
 
-export default FileHistoryNavigator
+export default NavigationButtons
diff --git a/src/components/TitleBar/TitleBar.tsx b/src/components/TitleBar/TitleBar.tsx
index b710178d..f1017e9f 100644
--- a/src/components/TitleBar/TitleBar.tsx
+++ b/src/components/TitleBar/TitleBar.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { BsChatLeftDots, BsChatLeftDotsFill } from 'react-icons/bs'
-import FileHistoryNavigator from './NavigationButtons'
+import NavigationButtons from './NavigationButtons'
 import ExternalLink from '../Common/ExternalLink'
 import { useChatContext } from '@/contexts/ChatContext'
 
@@ -22,7 +22,7 @@ const TitleBar: React.FC = () => {
   return (
     <div className="electron-drag flex justify-between bg-[#303030]">
       <div className="mt-px flex" style={platform === 'darwin' ? { marginLeft: '65px' } : { marginLeft: '2px' }}>
-        <FileHistoryNavigator />
+        <NavigationButtons />
       </div>
 
       <div
diff --git a/src/components/WritingAssistant/WritingAssistant.tsx b/src/components/WritingAssistant/WritingAssistant.tsx
index 1b61230d..d615a563 100644
--- a/src/components/WritingAssistant/WritingAssistant.tsx
+++ b/src/components/WritingAssistant/WritingAssistant.tsx
@@ -369,17 +369,17 @@ const WritingAssistant: React.FC = () => {
           </Button>
         </div>
         <div className="mt-2 flex items-center">
-      <label htmlFor="autoContextCheckbox" className="flex items-center">
-        <input
-          type="checkbox"
-          id="autoContextCheckbox"
-          checked={autoContext}
-          onChange={(e) => handleAutoContextChange(e.target.checked)}
-          className="size-4 rounded border-gray-600 bg-gray-700 text-indigo-500 focus:ring-1 focus:ring-indigo-500/30"
-        />
-        <span className="ml-2 select-none text-xs text-gray-400">Use File Content (If no text selected)</span>
-      </label>
-    </div>
+          <label htmlFor="autoContextCheckbox" className="flex items-center">
+            <input
+              type="checkbox"
+              id="autoContextCheckbox"
+              checked={autoContext}
+              onChange={(e) => handleAutoContextChange(e.target.checked)}
+              className="size-4 rounded border-gray-600 bg-gray-700 text-indigo-500 focus:ring-1 focus:ring-indigo-500/30"
+            />
+            <span className="ml-2 select-none text-xs text-gray-400">Use File Content (If no text selected)</span>
+          </label>
+        </div>
       </div>
     )
   return (
diff --git a/src/components/ui/window-controls.tsx b/src/components/ui/window-controls.tsx
index 2db3a8ac..d7f87b50 100644
--- a/src/components/ui/window-controls.tsx
+++ b/src/components/ui/window-controls.tsx
@@ -1,15 +1,26 @@
 /* eslint-disable jsx-a11y/control-has-associated-label */
 import React from 'react'
-import { X, Maximize2 } from 'lucide-react'
+import { X, Maximize2, Plus } from 'lucide-react'
 
 interface WindowControlsProps {
   onClose: () => void
   onMaximize: () => void
+  onNewChat?: () => void
 }
 
-const WindowControls = ({ onClose, onMaximize }: WindowControlsProps) => (
+const WindowControls = ({ onClose, onMaximize, onNewChat }: WindowControlsProps) => (
   <div className="group absolute right-2 top-2 z-10 transition-opacity hover:opacity-100">
     <div className="flex">
+      {onNewChat && (
+        <button
+          type="button"
+          onClick={onNewChat}
+          className="cursor-pointer bg-transparent p-1.5 transition-colors"
+          title="New Chat"
+        >
+          <Plus className="size-3 text-neutral-400 hover:text-neutral-300" />
+        </button>
+      )}
       <button
         type="button"
         onClick={onMaximize}
diff --git a/src/contexts/ContentContext.tsx b/src/contexts/ContentContext.tsx
index 6f9ceb01..5c3e452f 100644
--- a/src/contexts/ContentContext.tsx
+++ b/src/contexts/ContentContext.tsx
@@ -31,7 +31,7 @@ export const ContentProvider: React.FC<ContentProviderProps> = ({ children }) =>
   const [showEditor, setShowEditor] = useState(false)
   const [currentOpenFileOrChatID, setCurrentOpenFileOrChatID] = useState<string | null>(null)
 
-  const { allChatsMetadata, setShowChatbot, openNewChat } = useChatContext()
+  const { allChatsMetadata, openNewChat } = useChatContext()
   const {
     vaultFilesFlattened: flattenedFiles,
     openOrCreateFile,
@@ -44,7 +44,6 @@ export const ContentProvider: React.FC<ContentProviderProps> = ({ children }) =>
       if (!pathOrChatID) return
       const chatMetadata = allChatsMetadata.find((chat) => chat.id === pathOrChatID)
       if (chatMetadata) {
-        setShowChatbot(true)
         openNewChat(pathOrChatID)
       } else {
         setShowEditor(true)
@@ -55,7 +54,7 @@ export const ContentProvider: React.FC<ContentProviderProps> = ({ children }) =>
         addToNavigationHistory(pathOrChatID)
       }
     },
-    [allChatsMetadata, setShowChatbot, openNewChat, openOrCreateFile, addToNavigationHistory],
+    [allChatsMetadata, openNewChat, openOrCreateFile, addToNavigationHistory],
   )
 
   const createUntitledNote = useCallback(