diff --git a/frontend/src/components/Input.tsx b/frontend/src/components/Input.tsx
index 39dff2b0..3fd84bdc 100644
--- a/frontend/src/components/Input.tsx
+++ b/frontend/src/components/Input.tsx
@@ -35,7 +35,7 @@ const Input = ({
     <div className={`relative ${className}`}>
       <input
         ref={inputRef}
-        className={`h-[42px] w-full rounded-full px-3 py-1 
+        className={`peer h-[42px] w-full rounded-full px-3 py-1 
           bg-transparent outline-none 
           text-jet dark:text-bright-gray
           placeholder-transparent 
diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
index 7b90bb44..4598defd 100644
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -1,23 +1,19 @@
-import { Fragment, useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
-import Hero from '../Hero';
 import { useDropzone } from 'react-dropzone';
 import DragFileUpload from '../assets/DragFileUpload.svg';
-import ArrowDown from '../assets/arrow-down.svg';
 import newChatIcon from '../assets/openNewChat.svg';
 import Send from '../assets/send.svg';
 import SendDark from '../assets/send_dark.svg';
 import ShareIcon from '../assets/share.svg';
 import SpinnerDark from '../assets/spinner-dark.svg';
 import Spinner from '../assets/spinner.svg';
-import RetryIcon from '../components/RetryIcon';
 import { useDarkTheme, useMediaQuery } from '../hooks';
 import { ShareConversationModal } from '../modals/ShareConversationModal';
 import { selectConversationId } from '../preferences/preferenceSlice';
 import { AppDispatch } from '../store';
-import ConversationBubble from './ConversationBubble';
 import { handleSendFeedback } from './conversationHandlers';
 import { FEEDBACK, Query } from './conversationModels';
 import {
@@ -32,6 +28,7 @@ import {
 } from './conversationSlice';
 import Upload from '../upload/Upload';
 import { ActiveState } from '../models/misc';
+import ConversationMessages from './ConversationMessages';
 
 export default function Conversation() {
   const queries = useSelector(selectQueries);
@@ -42,9 +39,7 @@ export default function Conversation() {
   const conversationRef = useRef<HTMLDivElement>(null);
   const inputRef = useRef<HTMLTextAreaElement>(null);
   const [isDarkTheme] = useDarkTheme();
-  const [hasScrolledToLast, setHasScrolledToLast] = useState(true);
   const fetchStream = useRef<any>(null);
-  const [eventInterrupt, setEventInterrupt] = useState(false);
   const [lastQueryReturnedErr, setLastQueryReturnedErr] = useState(false);
   const [isShareModalOpen, setShareModalState] = useState<boolean>(false);
   const { t } = useTranslation();
@@ -91,16 +86,6 @@ export default function Conversation() {
     },
   });
 
-  const handleUserInterruption = () => {
-    if (!eventInterrupt && status === 'loading') setEventInterrupt(true);
-  };
-  useEffect(() => {
-    !eventInterrupt && scrollIntoView();
-    if (queries.length == 0) {
-      resetConversation();
-    }
-  }, [queries.length, queries[queries.length - 1]]);
-
   useEffect(() => {
     const element = document.getElementById('inputbox') as HTMLTextAreaElement;
     if (element) {
@@ -115,19 +100,6 @@ export default function Conversation() {
     }
   }, [queries[queries.length - 1]]);
 
-  const scrollIntoView = () => {
-    if (!conversationRef?.current || eventInterrupt) return;
-
-    if (status === 'idle' || !queries[queries.length - 1].response) {
-      conversationRef.current.scrollTo({
-        behavior: 'smooth',
-        top: conversationRef.current.scrollHeight,
-      });
-    } else {
-      conversationRef.current.scrollTop = conversationRef.current.scrollHeight;
-    }
-  };
-
   const handleQuestion = ({
     question,
     isRetry = false,
@@ -146,7 +118,6 @@ export default function Conversation() {
     } else {
       question = question.trim();
       if (question === '') return;
-      setEventInterrupt(false);
       !isRetry && dispatch(addQuery({ prompt: question })); //dispatch only new queries
       fetchStream.current = dispatch(fetchAnswer({ question }));
     }
@@ -215,57 +186,6 @@ export default function Conversation() {
     if (queries && queries.length > 0) resetConversation();
   };
 
-  const prepResponseView = (query: Query, index: number) => {
-    let responseView;
-    if (query.response) {
-      responseView = (
-        <ConversationBubble
-          className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'}`}
-          key={`${index}ANSWER`}
-          message={query.response}
-          type={'ANSWER'}
-          sources={query.sources}
-          toolCalls={query.tool_calls}
-          feedback={query.feedback}
-          handleFeedback={(feedback: FEEDBACK) =>
-            handleFeedback(query, feedback, index)
-          }
-        ></ConversationBubble>
-      );
-    } else if (query.error) {
-      const retryBtn = (
-        <button
-          className="flex items-center justify-center gap-3 self-center rounded-full py-3 px-5  text-lg text-gray-500 transition-colors delay-100 hover:border-gray-500 disabled:cursor-not-allowed dark:text-bright-gray"
-          disabled={status === 'loading'}
-          onClick={() => {
-            handleQuestion({
-              question: queries[queries.length - 1].prompt,
-              isRetry: true,
-            });
-          }}
-        >
-          <RetryIcon
-            width={isMobile ? 12 : 12} // change the width and height according to device size if necessary
-            height={isMobile ? 12 : 12}
-            fill={isDarkTheme ? 'rgb(236 236 241)' : 'rgb(107 114 120)'}
-            stroke={isDarkTheme ? 'rgb(236 236 241)' : 'rgb(107 114 120)'}
-            strokeWidth={10}
-          />
-        </button>
-      );
-      responseView = (
-        <ConversationBubble
-          className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'} `}
-          key={`${index}ERROR`}
-          message={query.error}
-          type="ERROR"
-          retryBtn={retryBtn}
-        ></ConversationBubble>
-      );
-    }
-    return responseView;
-  };
-
   const handleInput = () => {
     if (inputRef.current) {
       if (window.innerWidth < 350) inputRef.current.style.height = 'auto';
@@ -276,23 +196,9 @@ export default function Conversation() {
       )}px`;
     }
   };
-  const checkScroll = () => {
-    const el = conversationRef.current;
-    if (!el) return;
-    const isBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 10;
-    setHasScrolledToLast(isBottom);
-  };
-  useEffect(() => {
-    handleInput();
-    window.addEventListener('resize', handleInput);
-    conversationRef.current?.addEventListener('scroll', checkScroll);
-    return () => {
-      window.removeEventListener('resize', handleInput);
-      conversationRef.current?.removeEventListener('scroll', checkScroll);
-    };
-  }, []);
+
   return (
-    <div className="flex flex-col gap-1 h-full justify-end ">
+    <div className="flex flex-col gap-1 h-full justify-end">
       {conversationId && queries.length > 0 && (
         <div className="absolute top-4 right-20">
           <div className="flex mt-2 items-center gap-4">
@@ -327,64 +233,23 @@ export default function Conversation() {
             </button>
           </div>
           {isShareModalOpen && (
-            <div className="fixed inset-0 z-50 flex items-center justify-center">
-              <div className="absolute inset-0 bg-black/50 dark:bg-gray-alpha" />
-              <div className="relative z-50 w-full max-w-md rounded-3xl">
-                <ShareConversationModal
-                  close={() => {
-                    setShareModalState(false);
-                  }}
-                  conversationId={conversationId}
-                />
-              </div>
-            </div>
+            <ShareConversationModal
+              close={() => {
+                setShareModalState(false);
+              }}
+              conversationId={conversationId}
+            />
           )}
         </div>
       )}
-      <div
-        ref={conversationRef}
-        onWheel={handleUserInterruption}
-        onTouchMove={handleUserInterruption}
-        className="flex justify-center w-full overflow-y-auto h-screen sm:mt-12"
-      >
-        {queries.length > 0 && !hasScrolledToLast && (
-          <button
-            onClick={scrollIntoView}
-            aria-label="scroll to bottom"
-            className="fixed bottom-40 right-14 z-10 flex h-7 w-7  items-center justify-center rounded-full border-[0.5px] border-gray-alpha bg-gray-100 bg-opacity-50 dark:bg-purple-taupe md:h-9 md:w-9 md:bg-opacity-100 "
-          >
-            <img
-              src={ArrowDown}
-              alt="arrow down"
-              className="h-4 w-4 opacity-50 md:h-5 md:w-5"
-            />
-          </button>
-        )}
 
-        {queries.length > 0 ? (
-          <div className="w-full md:w-8/12">
-            {queries.map((query, index) => {
-              return (
-                <Fragment key={index}>
-                  <ConversationBubble
-                    className={'first:mt-5'}
-                    key={`${index}QUESTION`}
-                    message={query.prompt}
-                    type="QUESTION"
-                    handleUpdatedQuestionSubmission={handleQuestionSubmission}
-                    questionNumber={index}
-                    sources={query.sources}
-                  ></ConversationBubble>
-
-                  {prepResponseView(query, index)}
-                </Fragment>
-              );
-            })}
-          </div>
-        ) : (
-          <Hero handleQuestion={handleQuestion} />
-        )}
-      </div>
+      <ConversationMessages
+        handleQuestion={handleQuestion}
+        handleQuestionSubmission={handleQuestionSubmission}
+        handleFeedback={handleFeedback}
+        queries={queries}
+        status={status}
+      />
 
       <div className="flex flex-col items-end self-center rounded-2xl bg-opacity-0 z-3 w-[calc(min(742px,92%))] h-auto py-1">
         <div
diff --git a/frontend/src/conversation/ConversationMessages.tsx b/frontend/src/conversation/ConversationMessages.tsx
new file mode 100644
index 00000000..698d0402
--- /dev/null
+++ b/frontend/src/conversation/ConversationMessages.tsx
@@ -0,0 +1,180 @@
+import { Fragment, useEffect, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import ConversationBubble from './ConversationBubble';
+import Hero from '../Hero';
+import { FEEDBACK, Query, Status } from './conversationModels';
+import ArrowDown from '../assets/arrow-down.svg';
+import RetryIcon from '../components/RetryIcon';
+import { useDarkTheme } from '../hooks';
+
+interface ConversationMessagesProps {
+  handleQuestion: (params: {
+    question: string;
+    isRetry?: boolean;
+    updated?: boolean | null;
+    indx?: number;
+  }) => void;
+  handleQuestionSubmission: (
+    updatedQuestion?: string,
+    updated?: boolean,
+    indx?: number,
+  ) => void;
+  handleFeedback?: (query: Query, feedback: FEEDBACK, index: number) => void;
+  queries: Query[];
+  status: Status;
+}
+
+export default function ConversationMessages({
+  handleQuestion,
+  handleQuestionSubmission,
+  queries,
+  status,
+  handleFeedback,
+}: ConversationMessagesProps) {
+  const [isDarkTheme] = useDarkTheme();
+  const { t } = useTranslation();
+
+  const conversationRef = useRef<HTMLDivElement>(null);
+  const [hasScrolledToLast, setHasScrolledToLast] = useState(true);
+  const [eventInterrupt, setEventInterrupt] = useState(false);
+
+  const handleUserInterruption = () => {
+    if (!eventInterrupt && status === 'loading') {
+      setEventInterrupt(true);
+    }
+  };
+
+  const scrollIntoView = () => {
+    if (!conversationRef?.current || eventInterrupt) return;
+
+    if (status === 'idle' || !queries[queries.length - 1]?.response) {
+      conversationRef.current.scrollTo({
+        behavior: 'smooth',
+        top: conversationRef.current.scrollHeight,
+      });
+    } else {
+      conversationRef.current.scrollTop = conversationRef.current.scrollHeight;
+    }
+  };
+
+  const checkScroll = () => {
+    const el = conversationRef.current;
+    if (!el) return;
+    const isBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 10;
+    setHasScrolledToLast(isBottom);
+  };
+
+  useEffect(() => {
+    !eventInterrupt && scrollIntoView();
+  }, [queries.length, queries[queries.length - 1]]);
+
+  useEffect(() => {
+    if (status === 'idle') {
+      setEventInterrupt(false);
+    }
+  }, [status]);
+
+  useEffect(() => {
+    conversationRef.current?.addEventListener('scroll', checkScroll);
+    return () => {
+      conversationRef.current?.removeEventListener('scroll', checkScroll);
+    };
+  }, []);
+
+  const prepResponseView = (query: Query, index: number) => {
+    let responseView;
+    if (query.response) {
+      responseView = (
+        <ConversationBubble
+          className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'}`}
+          key={`${index}ANSWER`}
+          message={query.response}
+          type={'ANSWER'}
+          sources={query.sources}
+          toolCalls={query.tool_calls}
+          feedback={query.feedback}
+          handleFeedback={
+            handleFeedback
+              ? (feedback) => handleFeedback(query, feedback, index)
+              : undefined
+          }
+        />
+      );
+    } else if (query.error) {
+      const retryBtn = (
+        <button
+          className="flex items-center justify-center gap-3 self-center rounded-full py-3 px-5 text-lg text-gray-500 transition-colors delay-100 hover:border-gray-500 disabled:cursor-not-allowed dark:text-bright-gray"
+          disabled={status === 'loading'}
+          onClick={() => {
+            handleQuestion({
+              question: queries[queries.length - 1].prompt,
+              isRetry: true,
+            });
+          }}
+        >
+          <RetryIcon
+            width={12}
+            height={12}
+            fill={isDarkTheme ? 'rgb(236 236 241)' : 'rgb(107 114 120)'}
+            stroke={isDarkTheme ? 'rgb(236 236 241)' : 'rgb(107 114 120)'}
+            strokeWidth={10}
+          />
+        </button>
+      );
+      responseView = (
+        <ConversationBubble
+          className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'} `}
+          key={`${index}ERROR`}
+          message={query.error}
+          type="ERROR"
+          retryBtn={retryBtn}
+        />
+      );
+    }
+    return responseView;
+  };
+
+  return (
+    <div
+      ref={conversationRef}
+      onWheel={handleUserInterruption}
+      onTouchMove={handleUserInterruption}
+      className="flex justify-center w-full overflow-y-auto h-screen sm:mt-12"
+    >
+      {queries.length > 0 && !hasScrolledToLast && (
+        <button
+          onClick={scrollIntoView}
+          aria-label="scroll to bottom"
+          className="fixed bottom-40 right-14 z-10 flex h-7 w-7 items-center justify-center rounded-full border-[0.5px] border-gray-alpha bg-gray-100 bg-opacity-50 dark:bg-gunmetal md:h-9 md:w-9 md:bg-opacity-100"
+        >
+          <img
+            src={ArrowDown}
+            alt="arrow down"
+            className="h-4 w-4 opacity-50 md:h-5 md:w-5 filter dark:invert"
+          />
+        </button>
+      )}
+
+      {queries.length > 0 ? (
+        <div className="w-full md:w-8/12 lg:w-7/12 xl:w-6/12 2xl:w-5/12 max-w-[1200px]">
+          {queries.map((query, index) => (
+            <Fragment key={index}>
+              <ConversationBubble
+                className={'first:mt-5'}
+                key={`${index}QUESTION`}
+                message={query.prompt}
+                type="QUESTION"
+                handleUpdatedQuestionSubmission={handleQuestionSubmission}
+                questionNumber={index}
+                sources={query.sources}
+              />
+              {prepResponseView(query, index)}
+            </Fragment>
+          ))}
+        </div>
+      ) : (
+        <Hero handleQuestion={handleQuestion} />
+      )}
+    </div>
+  );
+}
diff --git a/frontend/src/conversation/SharedConversation.tsx b/frontend/src/conversation/SharedConversation.tsx
index b231ed1e..e72f90da 100644
--- a/frontend/src/conversation/SharedConversation.tsx
+++ b/frontend/src/conversation/SharedConversation.tsx
@@ -1,19 +1,18 @@
-import { Query } from './conversationModels';
-import { Fragment, useEffect, useRef, useState } from 'react';
+import { Fragment, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useParams } from 'react-router-dom';
+import { useDarkTheme } from '../hooks';
 
 import conversationService from '../api/services/conversationService';
-import ConversationBubble from './ConversationBubble';
+import ConversationMessages from './ConversationMessages';
 import Send from '../assets/send.svg';
+import SendDark from '../assets/send_dark.svg';
 import Spinner from '../assets/spinner.svg';
+import SpinnerDark from '../assets/spinner-dark.svg';
 import {
-  selectClientAPIKey,
   setClientApiKey,
-  updateQuery,
   addQuery,
   fetchSharedAnswer,
-  selectStatus,
 } from './sharedConversationSlice';
 import { setIdentifier, setFetchedData } from './sharedConversationSlice';
 
@@ -24,6 +23,8 @@ import {
   selectDate,
   selectTitle,
   selectQueries,
+  selectClientAPIKey,
+  selectStatus,
 } from './sharedConversationSlice';
 import { useSelector } from 'react-redux';
 import { Helmet } from 'react-helmet';
@@ -31,57 +32,33 @@ import { Helmet } from 'react-helmet';
 export const SharedConversation = () => {
   const navigate = useNavigate();
   const { identifier } = useParams(); //identifier is a uuid, not conversationId
+  const inputRef = useRef<HTMLTextAreaElement>(null);
+  const [isDarkTheme] = useDarkTheme();
 
   const queries = useSelector(selectQueries);
   const title = useSelector(selectTitle);
   const date = useSelector(selectDate);
   const apiKey = useSelector(selectClientAPIKey);
   const status = useSelector(selectStatus);
-
-  const inputRef = useRef<HTMLDivElement>(null);
-  const sharedConversationRef = useRef<HTMLDivElement>(null);
   const { t } = useTranslation();
   const dispatch = useDispatch<AppDispatch>();
 
-  const [lastQueryReturnedErr, setLastQueryReturnedErr] = useState(false);
-  const [eventInterrupt, setEventInterrupt] = useState(false);
-  const endMessageRef = useRef<HTMLDivElement>(null);
-  const handleUserInterruption = () => {
-    if (!eventInterrupt && status === 'loading') setEventInterrupt(true);
+  const handleInput = () => {
+    if (inputRef.current) {
+      if (window.innerWidth < 350) inputRef.current.style.height = 'auto';
+      else inputRef.current.style.height = '64px';
+      inputRef.current.style.height = `${Math.min(
+        inputRef.current.scrollHeight,
+        96,
+      )}px`;
+    }
   };
-  useEffect(() => {
-    !eventInterrupt && scrollIntoView();
-  }, [queries.length, queries[queries.length - 1]]);
 
   useEffect(() => {
     identifier && dispatch(setIdentifier(identifier));
-    const element = document.getElementById('inputbox') as HTMLInputElement;
-    if (element) {
-      element.focus();
-    }
+    fetchQueries();
   }, []);
 
-  useEffect(() => {
-    if (queries.length) {
-      queries[queries.length - 1].error && setLastQueryReturnedErr(true);
-      queries[queries.length - 1].response && setLastQueryReturnedErr(false); //considering a query that initially returned error can later include a response property on retry
-    }
-  }, [queries[queries.length - 1]]);
-
-  const scrollIntoView = () => {
-    if (!sharedConversationRef?.current || eventInterrupt) return;
-
-    if (status === 'idle' || !queries[queries.length - 1].response) {
-      sharedConversationRef.current.scrollTo({
-        behavior: 'smooth',
-        top: sharedConversationRef.current.scrollHeight,
-      });
-    } else {
-      sharedConversationRef.current.scrollTop =
-        sharedConversationRef.current.scrollHeight;
-    }
-  };
-
   const fetchQueries = () => {
     identifier &&
       conversationService
@@ -105,60 +82,6 @@ export const SharedConversation = () => {
           }
         });
   };
-  const handlePaste = (e: React.ClipboardEvent) => {
-    e.preventDefault();
-    const text = e.clipboardData.getData('text/plain');
-    inputRef.current && (inputRef.current.innerText = text);
-  };
-  const prepResponseView = (query: Query, index: number) => {
-    let responseView;
-    if (query.response) {
-      responseView = (
-        <ConversationBubble
-          ref={endMessageRef}
-          className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'}`}
-          key={`${index}ANSWER`}
-          message={query.response}
-          type={'ANSWER'}
-          sources={query.sources ?? []}
-          toolCalls={query.tool_calls}
-        ></ConversationBubble>
-      );
-    } else if (query.error) {
-      responseView = (
-        <ConversationBubble
-          ref={endMessageRef}
-          className={`${index === queries.length - 1 ? 'mb-32' : 'mb-7'} `}
-          key={`${index}ERROR`}
-          message={query.error}
-          type="ERROR"
-        ></ConversationBubble>
-      );
-    }
-    return responseView;
-  };
-  const handleQuestionSubmission = () => {
-    if (inputRef.current?.textContent && status !== 'loading') {
-      if (lastQueryReturnedErr) {
-        // update last failed query with new prompt
-        dispatch(
-          updateQuery({
-            index: queries.length - 1,
-            query: {
-              prompt: inputRef.current.textContent,
-            },
-          }),
-        );
-        handleQuestion({
-          question: queries[queries.length - 1].prompt,
-          isRetry: true,
-        });
-      } else {
-        handleQuestion({ question: inputRef.current.textContent });
-      }
-      inputRef.current.textContent = '';
-    }
-  };
 
   const handleQuestion = ({
     question,
@@ -169,13 +92,19 @@ export const SharedConversation = () => {
   }) => {
     question = question.trim();
     if (question === '') return;
-    setEventInterrupt(false);
-    !isRetry && dispatch(addQuery({ prompt: question })); //dispatch only new queries
+    !isRetry && dispatch(addQuery({ prompt: question }));
     dispatch(fetchSharedAnswer({ question }));
   };
-  useEffect(() => {
-    fetchQueries();
-  }, []);
+
+  const handleQuestionSubmission = (
+    updatedQuestion?: string,
+    updated?: boolean,
+    indx?: number,
+  ) => {
+    if (updatedQuestion && status !== 'loading') {
+      handleQuestion({ question: updatedQuestion });
+    }
+  };
 
   return (
     <>
@@ -194,94 +123,105 @@ export const SharedConversation = () => {
           content="Shared conversations with DocsGPT"
         />
       </Helmet>
-      <div className="flex h-full flex-col items-center justify-between gap-2 overflow-y-hidden dark:bg-raisin-black">
-        <div
-          ref={sharedConversationRef}
-          onWheel={handleUserInterruption}
-          onTouchMove={handleUserInterruption}
-          className="flex w-full justify-center overflow-auto"
-        >
-          <div className="mt-0 w-11/12 md:w-10/12 lg:w-6/12">
-            <div className="mb-2 w-full border-b pb-2 dark:border-b-silver">
-              <h1 className="font-semi-bold text-4xl text-chinese-black dark:text-chinese-silver">
-                {title}
-              </h1>
-              <h2 className="font-semi-bold text-base text-chinese-black dark:text-chinese-silver">
-                {t('sharedConv.subtitle')}{' '}
-                <a href="/" className="text-[#007DFF]">
-                  DocsGPT
-                </a>
-              </h2>
-              <h2 className="font-semi-bold text-base text-chinese-black dark:text-chinese-silver">
-                {date}
-              </h2>
-            </div>
-            <div className="">
-              {queries?.map((query, index) => {
-                return (
-                  <Fragment key={index}>
-                    <ConversationBubble
-                      ref={endMessageRef}
-                      className={'mb-1 last:mb-28 md:mb-7'}
-                      key={`${index}QUESTION`}
-                      message={query.prompt}
-                      type="QUESTION"
-                      sources={query.sources}
-                    ></ConversationBubble>
 
-                    {prepResponseView(query, index)}
-                  </Fragment>
-                );
-              })}
-            </div>
+      <div className="flex h-full flex-col items-center justify-between gap-2 overflow-y-hidden dark:bg-raisin-black">
+        {/* Header section */}
+        <div className="w-11/12 md:w-10/12 lg:w-6/12 mt-4">
+          <div className="mb-2 w-full border-b pb-2 dark:border-b-silver">
+            <h1 className="font-semi-bold text-4xl text-chinese-black dark:text-chinese-silver">
+              {title}
+            </h1>
+            <h2 className="font-semi-bold text-base text-chinese-black dark:text-chinese-silver">
+              {t('sharedConv.subtitle')}{' '}
+              <a href="/" className="text-[#007DFF]">
+                DocsGPT
+              </a>
+            </h2>
+            <h2 className="font-semi-bold text-base text-chinese-black dark:text-chinese-silver">
+              {date}
+            </h2>
           </div>
         </div>
 
-        <div className="flex w-11/12 flex-col items-center gap-4 pb-2 md:w-10/12 lg:w-6/12">
-          {apiKey ? (
-            <div className="flex h-full w-full items-center rounded-[40px] border border-silver bg-white py-1 dark:bg-raisin-black">
-              <div
-                id="inputbox"
-                ref={inputRef}
-                tabIndex={1}
-                onPaste={handlePaste}
-                placeholder={t('inputPlaceholder')}
-                contentEditable
-                className={`inputbox-style max-h-24 w-full overflow-y-auto overflow-x-hidden whitespace-pre-wrap rounded-full bg-white pt-5 pb-[22px] text-base leading-tight opacity-100 focus:outline-none dark:bg-raisin-black dark:text-bright-gray`}
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter' && !e.shiftKey) {
-                    e.preventDefault();
-                    handleQuestionSubmission();
-                  }
-                }}
-              ></div>
-              {status === 'loading' ? (
-                <img
-                  src={Spinner}
-                  className="relative right-[38px] bottom-[24px] -mr-[30px] animate-spin cursor-pointer self-end bg-transparent filter dark:invert"
-                ></img>
-              ) : (
-                <div className="mx-1 cursor-pointer rounded-full p-3 text-center hover:bg-gray-3000 dark:hover:bg-dark-charcoal">
-                  <img
-                    onClick={handleQuestionSubmission}
-                    className="ml-[4px] h-6 w-6 text-white filter dark:invert"
-                    src={Send}
-                  ></img>
-                </div>
-              )}
-            </div>
-          ) : (
+        {/* Conditionally render based on API key */}
+        {!apiKey ? (
+          <div className="flex flex-col items-center justify-center h-full">
             <button
               onClick={() => navigate('/')}
               className="w-fit rounded-full bg-purple-30 p-4 text-white shadow-xl transition-colors duration-200 hover:bg-purple-taupe mb-14 sm:mb-0"
             >
               {t('sharedConv.button')}
             </button>
-          )}
-          <span className="mb-2 hidden text-xs text-dark-charcoal dark:text-silver sm:inline">
-            {t('sharedConv.meta')}
-          </span>
-        </div>
+            <span className="mb-2 hidden text-xs text-dark-charcoal dark:text-silver sm:inline">
+              {t('sharedConv.meta')}
+            </span>
+          </div>
+        ) : (
+          <>
+            <ConversationMessages
+              handleQuestion={handleQuestion}
+              handleQuestionSubmission={handleQuestionSubmission}
+              queries={queries}
+              status={status}
+            />
+
+            {/* Add the textarea input here */}
+            <div className="flex flex-col items-center self-center rounded-2xl bg-opacity-0 z-3 w-full px-4 md:px-0">
+              <div className="w-full md:w-8/12 lg:w-7/12 xl:w-6/12 2xl:w-5/12 max-w-[1200px]">
+                <div className="flex w-full items-center rounded-[40px] border dark:border-grey border-dark-gray bg-lotion dark:bg-charleston-green-3">
+                  <label htmlFor="message-input" className="sr-only">
+                    {t('inputPlaceholder')}
+                  </label>
+                  <textarea
+                    id="message-input"
+                    ref={inputRef}
+                    tabIndex={1}
+                    placeholder={t('inputPlaceholder')}
+                    className="inputbox-style w-full overflow-y-auto overflow-x-hidden whitespace-pre-wrap rounded-full bg-lotion dark:bg-charleston-green-3 py-5 text-base leading-tight opacity-100 focus:outline-none dark:text-bright-gray dark:placeholder-bright-gray dark:placeholder-opacity-50 px-6"
+                    onInput={handleInput}
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter' && !e.shiftKey) {
+                        e.preventDefault();
+                        handleQuestionSubmission(inputRef.current?.value);
+                        if (inputRef.current) {
+                          inputRef.current.value = '';
+                          handleInput();
+                        }
+                      }
+                    }}
+                    aria-label={t('inputPlaceholder')}
+                  />
+                  {status === 'loading' ? (
+                    <img
+                      src={isDarkTheme ? SpinnerDark : Spinner}
+                      className="relative right-[38px] bottom-[24px] -mr-[30px] animate-spin cursor-pointer self-end bg-transparent"
+                      alt={t('loading')}
+                    />
+                  ) : (
+                    <div className="mx-1 cursor-pointer rounded-full p-3 text-center hover:bg-gray-3000 dark:hover:bg-dark-charcoal">
+                      <button
+                        onClick={() =>
+                          handleQuestionSubmission(inputRef.current?.value)
+                        }
+                        aria-label={t('send')}
+                        className="flex items-center justify-center"
+                      >
+                        <img
+                          className="ml-[4px] h-6 w-6 text-white filter dark:invert-[0.45] invert-[0.35]"
+                          src={isDarkTheme ? SendDark : Send}
+                          alt={t('send')}
+                        />
+                      </button>
+                    </div>
+                  )}
+                </div>
+              </div>
+              <p className="text-gray-4000 hidden w-full bg-transparent py-2 text-center text-xs dark:text-sonic-silver md:inline">
+                {t('tagline')}
+              </p>
+            </div>
+          </>
+        )}
       </div>
     </>
   );
diff --git a/frontend/src/conversation/conversationSlice.ts b/frontend/src/conversation/conversationSlice.ts
index 4473d3a9..f00eb546 100644
--- a/frontend/src/conversation/conversationSlice.ts
+++ b/frontend/src/conversation/conversationSlice.ts
@@ -265,8 +265,7 @@ export const conversationSlice = createSlice({
           return state;
         }
         state.status = 'failed';
-        state.queries[state.queries.length - 1].error =
-          'Something went wrong. Please check your internet connection.';
+        state.queries[state.queries.length - 1].error = 'Something went wrong';
       });
   },
 });
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 88e56469..07760385 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -501,15 +501,15 @@ input:-webkit-autofill:active {
 .dark input:-webkit-autofill:hover,
 .dark input:-webkit-autofill:focus,
 .dark input:-webkit-autofill:active {
-  -webkit-text-fill-color: #E5E7EB !important;
+  -webkit-text-fill-color: #e5e7eb !important;
   -webkit-box-shadow: 0 0 0 30px transparent inset !important;
   background-color: transparent !important;
-  caret-color: #E5E7EB;
+  caret-color: #e5e7eb;
 }
 
 /* Additional autocomplete dropdown styles for dark mode */
 .dark input:-webkit-autofill::first-line {
-  color: #E5E7EB;
+  color: #e5e7eb;
 }
 
 .inputbox-style {
diff --git a/frontend/src/modals/ShareConversationModal.tsx b/frontend/src/modals/ShareConversationModal.tsx
index 80d673c4..3fd444ad 100644
--- a/frontend/src/modals/ShareConversationModal.tsx
+++ b/frontend/src/modals/ShareConversationModal.tsx
@@ -138,7 +138,7 @@ export const ShareConversationModal = ({
           </span>
           {status === 'fetched' ? (
             <button
-              className="my-1 h-10 w-28 rounded-full border border-solid bg-purple-30 p-2 text-sm text-white hover:bg-violets-are-blue"
+              className="my-1 h-10 w-28 rounded-full bg-purple-30 p-2 text-sm text-white hover:bg-violets-are-blue"
               onClick={() => handleCopyKey(`${domain}/share/${identifier}`)}
             >
               {isCopied ? t('modals.saveKey.copied') : t('modals.saveKey.copy')}