diff --git a/docs/docs/get-started/install.mdx b/docs/docs/get-started/install.mdx
index 4ee634bc..06f73e3e 100644
--- a/docs/docs/get-started/install.mdx
+++ b/docs/docs/get-started/install.mdx
@@ -226,22 +226,23 @@ If the TUI detects OAuth credentials, it enforces the **Advanced Setup** path.
        This connection enables real-time document synchronization with external services.
        Supported webhook endpoints:
        - Google Drive: `/connectors/google_drive/webhook`
-       - OneDrive: `/connectors/onedrive/webhook`  
+       - OneDrive: `/connectors/onedrive/webhook`
        - SharePoint: `/connectors/sharepoint/webhook`
-       
+
    10. Continue with [Application Onboarding](#application-onboarding).
   </TabItem>
 </Tabs>
 
 <PartialOnboarding />
 
-## Close the OpenRAG TUI
+## Exit the OpenRAG TUI
 
-To close the OpenRAG TUI, press <kbd>q</kbd>.
-The OpenRAG containers will continue to be served until the containers are stopped.
+To exit the OpenRAG TUI, navigate to the main menu, and then press <kbd>q</kbd>.
+The OpenRAG containers continue to run until they are stopped.
 For more information, see [Manage OpenRAG containers with the TUI ](#tui-container-management).
 
-To start the TUI again, run `uv run openrag`.
+To relaunch the TUI, run `uv run openrag`.
+If you installed OpenRAG with `uvx`, run `uvx openrag`.
 
 ## Manage OpenRAG containers with the TUI {#tui-container-management}
 
diff --git a/docs/docs/get-started/quickstart.mdx b/docs/docs/get-started/quickstart.mdx
index 6ab08639..bb605b05 100644
--- a/docs/docs/get-started/quickstart.mdx
+++ b/docs/docs/get-started/quickstart.mdx
@@ -7,209 +7,252 @@ import Icon from "@site/src/components/icon/icon";
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-Get started with OpenRAG by loading your knowledge, swapping out your language model, and then chatting with the Langflow API.
+Use this quickstart to install OpenRAG, and then try some of OpenRAG's core features.
 
 ## Prerequisites
 
-:::tip
-This quickstart uses a minimal setup to demonstrate OpenRAG's core functionality. After you complete the quickstart, it is recommended that you reinstall OpenRAG with your preferred configuration because some settings are immutable after initial setup. For all installation options, see [Install OpenRAG with TUI](/install) and [Install OpenRAG with containers](/docker).
-:::
+This quickstart requires an [OpenAI API key](https://platform.openai.com/api-keys) and [Python](https://www.python.org/downloads/release/python-3100/) version 3.10 to 3.13.
 
-Install OpenRAG with the automatic installer.
-The script detects and installs uv, Docker/Podman, and Docker Compose prerequisites, and then starts OpenRAG with `uvx`.
+## Install OpenRAG
 
-    1. Create a directory to store the OpenRAG configuration files:
-       ```bash
-       mkdir openrag-workspace
-       cd openrag-workspace
-       ```
+For this quickstart, install OpenRAG with the automatic installer script and basic setup:
 
-    2. Run the installer:
-       ```bash
-       curl -fsSL https://docs.openr.ag/files/run_openrag_with_prereqs.sh | bash
-       ```
+1. Create a directory to store the OpenRAG configuration files, and then change to that directory:
 
-        The TUI creates a `.env` file and docker-compose files in the current working directory, and then starts OpenRAG.
+   ```bash
+   mkdir openrag-workspace
+   cd openrag-workspace
+   ```
 
-    3. Select **Basic Setup**.
-    4. To generate a password for OpenSearch, click **Generate Passwords**.
-    The other fields aren't required.
-    5. To start OpenRAG, click **Start All Services**.
-      Startup pulls container images and runs them, so it can take some time.
-      When startup is complete, the TUI displays the following:
-          ```bash
-          Services started successfully
-          Command completed successfully
-          ```
-    6. To open the OpenRAG application, navigate to the TUI main menu, and then click **Open App**.
-    Alternatively, in your browser, navigate to `localhost:3000`.
-    7. For your model provider, select **OpenAI**.
-    8. In the **OpenAI API key** field, paste your OpenAI API key.
-    The default model settings are fine for the quickstart.
-    9. To confirm your provider settings, click **Complete**.
-    10. To complete onboarding, click **What is OpenRAG**, and then click **Add a document**.
-    Alternatively, click <Icon name="ArrowRight" aria-hidden="true"/> **Skip overview**.
+2. [Download the OpenRAG install script](https://docs.openr.ag/files/run_openrag_with_prereqs.sh), move it to your OpenRAG directory, and then run it:
 
-    To quit OpenRAG, navigate to the TUI main menu and press <kbd>q</kbd>.
-    To start OpenRAG again, run `uvx openrag`.
+   ```bash
+   bash run_openrag_with_prereqs.sh
+   ```
 
-## Load and chat with your own documents
+   This script installs OpenRAG and its dependencies, including Docker or Podman, and it creates a `.env` file and `docker-compose` files in the current working directory.
+   You might be prompted to install certain dependencies if they aren't already present in your environment.
+   This process can take a few minutes.
+   Once the environment is ready, OpenRAG starts.
+
+3. Click **Basic Setup**.
+
+4. Create passwords for your OpenRAG installation's OpenSearch and Langflow services. You can click **Generate Passwords** to automatically generate passwords.
+
+   The OpenSearch password is required. The Langflow admin password is optional.
+   If you don't generate a Langflow admin password, Langflow runs in [autologin mode](https://docs.langflow.org/api-keys-and-authentication#langflow-auto-login) with no password required.
+
+   Your passwords are saved in the `.env` file that is used to start OpenRAG.
+   You can find this file in your OpenRAG installation directory.
+
+5. Click **Save Configuration**, and then click **Start All Services**.
+
+   Wait a few minutes while the startup process pulls and runs the necessary container images.
+   Proceed when you see the following messages in the terminal user interface (TUI):
+
+   ```bash
+   Services started successfully
+   Command completed successfully
+   ```
+
+6. To open the OpenRAG application, go to the TUI main menu, and then click **Open App**.
+Alternatively, in your browser, navigate to `localhost:3000`.
+
+7. Select the **OpenAI** model provider, enter your OpenAI API key, and then click **Complete**.
+
+   For this quickstart, you can use the default options for the model settings.
+
+8. Click through the overview slides for a brief introduction to OpenRAG and basic setup, or click <Icon name="ArrowRight" aria-hidden="true"/> **Skip overview**.
+You can complete this quickstart without going through the overview.
+
+## Load and chat with documents {#chat-with-documents}
+
+OpenRAG's knowledge base chat is powered by the [OpenRAG OpenSearch Agent](/agents).
+Some documents are included by default to get you started, and you can load your own documents.
 
 1. In OpenRAG, click <Icon name="MessageSquare" aria-hidden="true"/> **Chat**.
-   The chat is powered by the OpenRAG OpenSearch Agent.
-   For more information, see [Langflow in OpenRAG](/agents).
-2. Ask `What documents are available to you?`
-   The agent responds with a message summarizing the documents that OpenRAG loads by default.
-   Knowledge is stored in OpenSearch.
-   For more information, see [OpenSearch in OpenRAG](/knowledge).
-3. To confirm the agent is correct about the default knowledge, click <Icon name="Library" aria-hidden="true"/> **Knowledge**.
-   The **Knowledge** page lists the documents OpenRAG has ingested into the OpenSearch vector database.
-   Click on a document to display the chunks derived from splitting the default documents into the OpenSearch vector database.
-4. To add documents to your knowledge base, click **Add Knowledge**.
-   * Select <Icon name="File" aria-hidden="true"/> **File** to add a single file from your local machine.
-   * Select <Icon name="Folder" aria-hidden="true"/> **Folder** to process an entire folder of documents from your local machine. The default directory is `/documents` in your OpenRAG directory.
-   * Select your cloud storage provider to add knowledge from an OAuth-connected storage provider. For more information, see [OAuth ingestion](/knowledge#oauth-ingestion).
-5. Return to the Chat window and ask a question about your loaded data.
-   For example, with a manual about a PC tablet loaded, ask `How do I connect this device to WiFi?`
-   The agent responds with a message indicating it now has your knowledge as context for answering questions.
-6. Click <Icon name="Gear" aria-hidden="true"/> **Function Call: search_documents (tool_call)**.
-This log describes how the agent uses tools.
-This is helpful for troubleshooting when the agent isn't responding as expected.
 
-## Swap out the language model to modify agent behavior {#change-components}
+2. For this quickstart, ask the agent what documents are available.
+For example: `What documents are available to you?`
 
-To modify the knowledge ingestion or Agent behavior, click <Icon name="Settings2" aria-hidden="true"/> **Settings**.
+   The agent responds with a summary of OpenRAG's default documents.
 
-In this example, you'll try a different LLM to demonstrate how the Agent's response changes.
+3. To verify the agent's response, click <Icon name="Library" aria-hidden="true"/> **Knowledge** to view the documents stored in the OpenRAG OpenSearch vector database.
+You can click a document to view the chunks of the document as they are stored in the database.
 
-1. To edit the Agent's behavior, click **Edit in Langflow**.
-You can more quickly access these parameters in the **Language model** and **Agent Instructions** fields in this page, but for illustration purposes, navigate to the Langflow visual builder.
-To revert the flow to its initial state, click **Restore flow**.
-2. OpenRAG warns you that you're entering Langflow. Click **Proceed**.
+4. Click **Add Knowledge** to add your own documents to your OpenRAG knowledge base.
 
-    If Langflow requests login information, enter the `LANGFLOW_SUPERUSER` and `LANGFLOW_SUPERUSER_PASSWORD` from the `.env` file in your OpenRAG directory.
+   For this quickstart, use either the <Icon name="File" aria-hidden="true"/> **File** or <Icon name="Folder" aria-hidden="true"/> **Folder** upload options to load documents from your local machine.
+   **Folder** uploads an entire directory.
+   The default directory is the `/documents` subdirectory in your OpenRAG installation directory.
 
-    The OpenRAG OpenSearch Agent flow appears in a new browser window.
-   ![OpenRAG Open Search Agent Flow](/img/opensearch-agent-flow.png)
+   For information about the cloud storage provider options, see [Ingest files through OAuth connectors](/knowledge#oauth-ingestion).
 
-3. Find the **Language Model** component, and then change the **Model Name** field to a different OpenAI model.
-4. Save your flow with <kbd>Command+S</kbd> (Mac) or <kbd>Ctrl+S</kbd> (Windows).
-5. Return to the OpenRAG browser window, and start a new conversation by clicking <Icon name="Plus" aria-hidden="true"/> in the **Conversations** tab.
-6. Ask the same question you asked before to see how the response differs between models.
+5. Return to the **Chat** window, and then ask a question related to the documents that you just uploaded.
 
-## Integrate OpenRAG into your application
+   If the agent's response doesn't seem to reference your documents correctly, try the following:
 
-Langflow in OpenRAG includes pre-built flows that you can integrate into your applications using the [Langflow API](https://docs.langflow.org/api-reference-api-examples). 
+   * Click <Icon name="Gear" aria-hidden="true"/> **Function Call: search_documents (tool_call)** to view the log of tool calls made by the agent. This is helpful for troubleshooting because it shows you how the agent used particular tools.
 
-The Langflow API accepts Python, TypeScript, or curl requests to run flows and get responses. You can use these flows as-is or modify them to better suit your needs.
+   * Click <Icon name="Library" aria-hidden="true"/> **Knowledge** to confirm that the documents are present in the OpenRAG OpenSearch vector database, and then click each document to see how the document was chunked.
+   If a document was chunked improperly, you might need to tweak the ingestion or modify and reupload the document.
 
-In this section, you'll run the OpenRAG OpenSearch Agent flow and get a response using the API.
+   * Click <Icon name="Settings2" aria-hidden="true"/> **Settings** to modify the knowledge ingestion settings.
 
-1. To navigate to the OpenRAG OpenSearch Agent flow in Langflow, click <Icon name="Settings2" aria-hidden="true"/> **Settings**, and then click **Edit in Langflow** in the OpenRAG OpenSearch Agent flow.
-2. Create a [Langflow API key](https://docs.langflow.org/api-keys-and-authentication).
+   For more information about knowledge bases and knowledge ingestion, see [OpenSearch in OpenRAG](/knowledge).
 
-    A Langflow API key is a user-specific token you can use with Langflow.
-    It is **only** used for sending requests to the Langflow server.
-    It does **not** access OpenRAG.
+## Change the language model and chat settings {#change-components}
 
-    To create a Langflow API key, do the following:
+1. To change the knowledge ingestion settings, agent behavior, or language model, click <Icon name="Settings2" aria-hidden="true"/> **Settings**.
 
-    1. Open Langflow, click your user icon, and then select **Settings**.
-    2. Click **Langflow API Keys**, and then click <Icon name="Plus" aria-hidden="true"/> **Add New**.
-    3. Name your key, and then click **Create API Key**.
-    4. Copy the API key and store it securely.
+   The **Settings** page provides quick access to commonly used parameters like the **Language model** and **Agent Instructions**.
 
-3. Langflow includes code snippets for the request to the Langflow API.
-To retrieve the code snippet, click **Share**, and then click **API access**.
+2. For greater insight into the underlying [Langflow flow](/agents) that drives the OpenRAG chat, click **Edit in Langflow** and then click **Proceed** to launch the Langflow visual editor in a new browser window.
 
-    The default code in the API access pane constructs a request with the Langflow server `url`, `headers`, and a `payload` of request data. The code snippets automatically include the `LANGFLOW_SERVER_ADDRESS` and `FLOW_ID` values for the flow.
+   If Langflow requests login information, enter the `LANGFLOW_SUPERUSER` and `LANGFLOW_SUPERUSER_PASSWORD` from the `.env` file in your OpenRAG installation directory.
 
-    <Tabs>
-    <TabItem value="python" label="Python">
-    
-    ```python
-    import requests
-    import os
-    import uuid
-    
-    api_key = 'LANGFLOW_API_KEY'
-    url = "http://LANGFLOW_SERVER_ADDRESS/api/v1/run/FLOW_ID"  # The complete API endpoint URL for this flow
-    
-    # Request payload configuration
-    payload = {
-        "output_type": "chat",
-        "input_type": "chat",
-        "input_value": "hello world!"
-    }
-    payload["session_id"] = str(uuid.uuid4())
-    
-    headers = {"x-api-key": api_key}
-    
-    try:
-        # Send API request
-        response = requests.request("POST", url, json=payload, headers=headers)
-        response.raise_for_status()  # Raise exception for bad status codes
-    
-        # Print response
-        print(response.text)
-    
-    except requests.exceptions.RequestException as e:
-        print(f"Error making API request: {e}")
-    except ValueError as e:
-        print(f"Error parsing response: {e}")
-    ```
-    
-    </TabItem>
-    <TabItem value="typescript" label="TypeScript">
-    
-    ```typescript
-    const crypto = require('crypto');
-    const apiKey = 'LANGFLOW_API_KEY';
-    const payload = {
-        "output_type": "chat",
-        "input_type": "chat",
-        "input_value": "hello world!"
-    };
-    payload.session_id = crypto.randomUUID();
-    
-    const options = {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-            "x-api-key": apiKey
-        },
-        body: JSON.stringify(payload)
-    };
-    
-    fetch('http://LANGFLOW_SERVER_ADDRESS/api/v1/run/FLOW_ID', options)
-        .then(response => response.json())
-        .then(response => console.warn(response))
-        .catch(err => console.error(err));
-    ```
-    
-    </TabItem>
-    <TabItem value="curl" label="curl">
-    
-    ```bash
-    curl --request POST \
-         --url 'http://LANGFLOW_SERVER_ADDRESS/api/v1/run/FLOW_ID?stream=false' \
-         --header 'Content-Type: application/json' \
-         --header "x-api-key: LANGFLOW_API_KEY" \
-         --data '{
-           "output_type": "chat",
-           "input_type": "chat",
-           "input_value": "hello world!"
-         }'
-    ```
-    
-    </TabItem>
-    </Tabs>
+   The OpenRAG OpenSearch Agent flow opens in a new browser window.
 
-4. Copy the snippet, paste it in a script file, and then run the script to send the request. If you are using the curl snippet, you can run the command directly in your terminal.
+   ![OpenRAG OpenSearch Agent flow](/img/opensearch-agent-flow.png)
+
+3. For this quickstart, try changing the model.
+Click the **Language Model** component, and then change the **Model Name** to a different OpenAI model.
+
+   When editing built-in flows, you can click **Restore flow** to revert the flow to its initial state.
+
+4. Press <kbd>Command</kbd>+<kbd>S</kbd> (<kbd>Ctrl</kbd>+<kbd>S</kbd>) to save your changes.
+
+   You can close the Langflow browser window, or leave it open if you want to continue experimenting with the flow editor.
+
+5. Switch to your OpenRAG browser window, and then click <Icon name="Plus" aria-hidden="true"/> in the **Conversations** tab to start a new conversation.
+This ensures that the chat doesn't persist any context from the previous conversation with the original model.
+
+6. Ask the same question you asked in [Load and chat with documents](#chat-with-documents) to see how the response differs from the original model.
+
+## Integrate OpenRAG into an application
+
+Langflow in OpenRAG includes pre-built flows that you can integrate into your applications using the [Langflow API](https://docs.langflow.org/api-reference-api-examples).
+You can use these flows as-is or modify them to better suit your needs, as demonstrated in [Change the language model and chat settings](#change-components).
+
+You can send and receive requests with the Langflow API using Python, TypeScript, or curl.
+
+1. Open the OpenRAG OpenSearch Agent flow in the Langflow visual editor: From the **Chat** window, click <Icon name="Settings2" aria-hidden="true"/> **Settings**, click **Edit in Langflow**, and then click **Proceed**.
+
+2. Create a [Langflow API key](https://docs.langflow.org/api-keys-and-authentication), which is a user-specific token required to send requests to the Langflow server.
+This key doesn't grant access to OpenRAG.
+
+   1. In the Langflow visual editor, click your user icon in the header, and then select **Settings**.
+   2. Click **Langflow API Keys**, and then click <Icon name="Plus" aria-hidden="true"/> **Add New**.
+   3. Name your key, and then click **Create API Key**.
+   4. Copy the API key and store it securely.
+   5. Exit the Langflow **Settings** page to return to the visual editor.
+
+3. Click **Share**, and then select **API access** to get pregenerated code snippets that call the Langflow API and run the flow.
+
+   These code snippets construct API requests with your Langflow server URL (`LANGFLOW_SERVER_ADDRESS`), the flow to run (`FLOW_ID`), required headers (`LANGFLOW_API_KEY`, `Content-Type`), and a payload containing the required inputs to run the flow, including a default chat input message.
+
+   In production, you would modify the inputs to suit your application logic. For example, you could replace the default chat input message with dynamic user input.
+
+   <Tabs>
+   <TabItem value="python" label="Python">
+
+   ```python
+   import requests
+   import os
+   import uuid
+
+   api_key = 'LANGFLOW_API_KEY'
+   url = "http://LANGFLOW_SERVER_ADDRESS/api/v1/run/FLOW_ID"  # The complete API endpoint URL for this flow
+
+   # Request payload configuration
+   payload = {
+       "output_type": "chat",
+       "input_type": "chat",
+       "input_value": "hello world!"
+   }
+   payload["session_id"] = str(uuid.uuid4())
+
+   headers = {"x-api-key": api_key}
+
+   try:
+       # Send API request
+       response = requests.request("POST", url, json=payload, headers=headers)
+       response.raise_for_status()  # Raise exception for bad status codes
+
+       # Print response
+       print(response.text)
+
+   except requests.exceptions.RequestException as e:
+       print(f"Error making API request: {e}")
+   except ValueError as e:
+       print(f"Error parsing response: {e}")
+   ```
+
+   </TabItem>
+   <TabItem value="typescript" label="TypeScript">
+
+   ```typescript
+   const crypto = require('crypto');
+   const apiKey = 'LANGFLOW_API_KEY';
+   const payload = {
+       "output_type": "chat",
+       "input_type": "chat",
+       "input_value": "hello world!"
+   };
+   payload.session_id = crypto.randomUUID();
+
+   const options = {
+       method: 'POST',
+       headers: {
+           'Content-Type': 'application/json',
+           "x-api-key": apiKey
+       },
+       body: JSON.stringify(payload)
+   };
+
+   fetch('http://LANGFLOW_SERVER_ADDRESS/api/v1/run/FLOW_ID', options)
+       .then(response => response.json())
+       .then(response => console.warn(response))
+       .catch(err => console.error(err));
+   ```
+
+   </TabItem>
+   <TabItem value="curl" label="curl">
+
+   ```bash
+   curl --request POST \
+     --url 'http://LANGFLOW_SERVER_ADDRESS/api/v1/run/FLOW_ID?stream=false' \
+     --header 'Content-Type: application/json' \
+     --header "x-api-key: LANGFLOW_API_KEY" \
+     --data '{
+       "output_type": "chat",
+       "input_type": "chat",
+       "input_value": "hello world!"
+     }'
+   ```
+
+   </TabItem>
+   </Tabs>
+
+4. Copy your preferred snippet, and then run it:
+
+   * **Python**: Paste the snippet into a `.py` file, save it, and then run it with `python filename.py`.
+   * **TypeScript**: Paste the snippet into a `.ts` file, save it, and then run it with `ts-node filename.ts`.
+   * **curl**: Paste and run snippet directly in your terminal.
 
 If the request is successful, the response includes many details about the flow run, including the session ID, inputs, outputs, components, durations, and more.
 
-To further explore the API, see:
+In production, you won't pass the raw response to the user in its entirety.
+Instead, you extract and reformat relevant fields for different use cases, as demonstrated in the [Langflow quickstart](https://docs.langflow.org/quickstart#extract-data-from-the-response).
+For example, you could pass the chat output text to a front-end user-facing application, and store specific fields in logs and backend data stores for monitoring, chat history, or analytics.
+You could also pass the output from one flow as input to another flow.
 
-* The Langflow [Quickstart](https://docs.langflow.org/quickstart#extract-data-from-the-response) extends this example with extracting fields from the response.
-* [Get started with the Langflow API](https://docs.langflow.org/api-reference-api-examples)
\ No newline at end of file
+## Next steps
+
+* **Reinstall OpenRAG with your preferred settings**: This quickstart used a minimal setup to demonstrate OpenRAG's core functionality.
+It is recommended that you reinstall OpenRAG with your preferred configuration because some settings are immutable after initial setup.
+For all installation options, see [Install OpenRAG with TUI](/install) and [Install OpenRAG with containers](/docker).
+
+* **Learn more about OpenRAG**: Explore OpenRAG and the OpenRAG documentation to learn more about its features and functionality.
+
+* **Learn more about Langflow**: For a deep dive on the Langflow API and visual editor, see the [Langflow documentation](https://docs.langflow.org/).
\ No newline at end of file
diff --git a/docs/docs/get-started/what-is-openrag.mdx b/docs/docs/get-started/what-is-openrag.mdx
index d878931d..f23a57db 100644
--- a/docs/docs/get-started/what-is-openrag.mdx
+++ b/docs/docs/get-started/what-is-openrag.mdx
@@ -35,7 +35,7 @@ config:
 ---
 flowchart TD
     subgraph Containers
-    backend[OpenRAG Backend] --> langflow[Langflow]
+    backend[OpenRAG backend] --> langflow[Langflow]
     langflow <--> opensearch[OpenSearch]
     backend <--> frontend[OpenRAG frontend]
     end
diff --git a/frontend/app/chat/_components/chat-input.tsx b/frontend/app/chat/_components/chat-input.tsx
index 406ee10a..29b081c5 100644
--- a/frontend/app/chat/_components/chat-input.tsx
+++ b/frontend/app/chat/_components/chat-input.tsx
@@ -350,6 +350,7 @@ export const ChatInput = forwardRef<ChatInputHandle, ChatInputProps>(
                     onClear={() => {
                       onFileSelected(null);
                     }}
+                    isUploading={isUploading}
                   />
                 </motion.div>
               )}
diff --git a/frontend/app/chat/_components/file-preview.tsx b/frontend/app/chat/_components/file-preview.tsx
index 482a505c..95349b24 100644
--- a/frontend/app/chat/_components/file-preview.tsx
+++ b/frontend/app/chat/_components/file-preview.tsx
@@ -1,10 +1,11 @@
-import { X } from "lucide-react";
+import { Loader2, X } from "lucide-react";
 import Image from "next/image";
 import { Button } from "@/components/ui/button";
 
 interface FilePreviewProps {
   uploadedFile: File;
   onClear: () => void;
+  isUploading?: boolean;
 }
 
 const formatFileSize = (bytes: number): string => {
@@ -22,12 +23,14 @@ const getFilePreviewUrl = (file: File): string => {
   return "";
 };
 
-export const FilePreview = ({ uploadedFile, onClear }: FilePreviewProps) => {
+export const FilePreview = ({ uploadedFile, onClear, isUploading = false }: FilePreviewProps) => {
   return (
     <div className="max-w-[250px] flex items-center gap-2 p-2 bg-muted rounded-lg">
       {/* File Image Preview */}
       <div className="flex-shrink-0 w-8 h-8 bg-background rounded border border-input flex items-center justify-center overflow-hidden">
-        {getFilePreviewUrl(uploadedFile) ? (
+        {isUploading ? (
+          <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
+        ) : getFilePreviewUrl(uploadedFile) ? (
           <Image
             src={getFilePreviewUrl(uploadedFile)}
             alt="File preview"
diff --git a/frontend/components/navigation.tsx b/frontend/components/navigation.tsx
index 773117fb..4efd1403 100644
--- a/frontend/components/navigation.tsx
+++ b/frontend/components/navigation.tsx
@@ -472,19 +472,15 @@ export function Navigation({
                 </>
               )}
             </div>
-            <div className="flex-shrink-0 mt-4">
-              <div className="flex items-center justify-between mb-3 mx-3">
-                <h3 className="text-xs font-medium text-muted-foreground">
-                  Files
-                </h3>
-              </div>
-              <div className="overflow-y-auto scrollbar-hide space-y-1">
-                {(newConversationFiles?.length ?? 0) === 0 ? (
-                  <div className="text-[13px] text-muted-foreground py-2 px-3">
-                    No documents yet
-                  </div>
-                ) : (
-                  newConversationFiles?.map((file, index) => (
+            {(newConversationFiles?.length ?? 0) !== 0 && (
+              <div className="flex-shrink-0 mt-4">
+                <div className="flex items-center justify-between mb-3 mx-3">
+                  <h3 className="text-xs font-medium text-muted-foreground">
+                    Files
+                  </h3>
+                </div>
+                <div className="overflow-y-auto scrollbar-hide space-y-1">
+                  {newConversationFiles?.map((file, index) => (
                     <div
                       key={`${file}-${index}`}
                       className="flex-1 min-w-0 px-3"
@@ -493,10 +489,10 @@ export function Navigation({
                         {file}
                       </div>
                     </div>
-                  ))
-                )}
+                  ))}
+                </div>
               </div>
-            </div>
+            )}
           </div>
         </div>
       )}