diff --git a/frontend/src/components/MessageInput.tsx b/frontend/src/components/MessageInput.tsx
new file mode 100644
index 00000000..7335cfa8
--- /dev/null
+++ b/frontend/src/components/MessageInput.tsx
@@ -0,0 +1,94 @@
+import { useEffect, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDarkTheme } from '../hooks';
+import Send from '../assets/send.svg';
+import SendDark from '../assets/send_dark.svg';
+import SpinnerDark from '../assets/spinner-dark.svg';
+import Spinner from '../assets/spinner.svg';
+
+interface MessageInputProps {
+  value: string;
+  onChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => void;
+  onSubmit: () => void;
+  loading: boolean;
+}
+
+export default function MessageInput({
+  value,
+  onChange,
+  onSubmit,
+  loading,
+}: MessageInputProps) {
+  const { t } = useTranslation();
+  const [isDarkTheme] = useDarkTheme();
+  const inputRef = useRef<HTMLTextAreaElement>(null);
+
+  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`;
+    }
+  };
+
+  // Focus the textarea and set initial height on mount.
+  useEffect(() => {
+    inputRef.current?.focus();
+    handleInput();
+  }, []);
+
+  const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
+    if (e.key === 'Enter' && !e.shiftKey) {
+      e.preventDefault();
+      onSubmit();
+      if (inputRef.current) {
+        inputRef.current.value = '';
+        handleInput();
+      }
+    }
+  };
+
+  return (
+    <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}
+        value={value}
+        onChange={onChange}
+        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={handleKeyDown}
+        aria-label={t('inputPlaceholder')}
+      />
+      {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={onSubmit}
+            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>
+  );
+}
diff --git a/frontend/src/components/SourceDropdown.tsx b/frontend/src/components/SourceDropdown.tsx
index e274c8f4..c8434f05 100644
--- a/frontend/src/components/SourceDropdown.tsx
+++ b/frontend/src/components/SourceDropdown.tsx
@@ -101,7 +101,7 @@ function SourceDropdown({
         />
       </button>
       {isDocsListOpen && (
-        <div className="absolute left-0 right-0 z-50 -mt-1 max-h-28 overflow-y-auto rounded-b-xl border border-silver bg-white shadow-lg dark:border-silver/40 dark:bg-dark-charcoal">
+        <div className="absolute left-0 right-0 z-20 -mt-1 max-h-28 overflow-y-auto rounded-b-xl border border-silver bg-white shadow-lg dark:border-silver/40 dark:bg-dark-charcoal">
           {options ? (
             options.map((option: any, index: number) => {
               if (option.model === embeddingsName) {
diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
index 4598defd..468d7a83 100644
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -5,12 +5,8 @@ import { useNavigate } from 'react-router-dom';
 import { useDropzone } from 'react-dropzone';
 import DragFileUpload from '../assets/DragFileUpload.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 { useDarkTheme, useMediaQuery } from '../hooks';
+import { useMediaQuery } from '../hooks';
 import { ShareConversationModal } from '../modals/ShareConversationModal';
 import { selectConversationId } from '../preferences/preferenceSlice';
 import { AppDispatch } from '../store';
@@ -29,6 +25,7 @@ import {
 import Upload from '../upload/Upload';
 import { ActiveState } from '../models/misc';
 import ConversationMessages from './ConversationMessages';
+import MessageInput from '../components/MessageInput';
 
 export default function Conversation() {
   const queries = useSelector(selectQueries);
@@ -36,9 +33,8 @@ export default function Conversation() {
   const status = useSelector(selectStatus);
   const conversationId = useSelector(selectConversationId);
   const dispatch = useDispatch<AppDispatch>();
-  const conversationRef = useRef<HTMLDivElement>(null);
   const inputRef = useRef<HTMLTextAreaElement>(null);
-  const [isDarkTheme] = useDarkTheme();
+  const [input, setInput] = useState('');
   const fetchStream = useRef<any>(null);
   const [lastQueryReturnedErr, setLastQueryReturnedErr] = useState(false);
   const [isShareModalOpen, setShareModalState] = useState<boolean>(false);
@@ -86,13 +82,6 @@ export default function Conversation() {
     },
   });
 
-  useEffect(() => {
-    const element = document.getElementById('inputbox') as HTMLTextAreaElement;
-    if (element) {
-      element.focus();
-    }
-  }, []);
-
   useEffect(() => {
     if (queries.length) {
       queries[queries.length - 1].error && setLastQueryReturnedErr(true);
@@ -152,14 +141,14 @@ export default function Conversation() {
   ) => {
     if (updated === true) {
       handleQuestion({ question: updatedQuestion as string, updated, indx });
-    } else if (inputRef.current?.value && status !== 'loading') {
+    } else if (input && status !== 'loading') {
       if (lastQueryReturnedErr) {
         // update last failed query with new prompt
         dispatch(
           updateQuery({
             index: queries.length - 1,
             query: {
-              prompt: inputRef.current.value,
+              prompt: input,
             },
           }),
         );
@@ -168,10 +157,9 @@ export default function Conversation() {
           isRetry: true,
         });
       } else {
-        handleQuestion({ question: inputRef.current.value });
+        handleQuestion({ question: input });
       }
-      inputRef.current.value = '';
-      handleInput();
+      setInput('');
     }
   };
   const resetConversation = () => {
@@ -186,17 +174,6 @@ export default function Conversation() {
     if (queries && queries.length > 0) resetConversation();
   };
 
-  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`;
-    }
-  };
-
   return (
     <div className="flex flex-col gap-1 h-full justify-end">
       {conversationId && queries.length > 0 && (
@@ -251,54 +228,21 @@ export default function Conversation() {
         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 className="flex flex-col items-end self-center rounded-2xl bg-opacity-0 z-3 w-full md:w-6/12 h-auto py-1">
         <div
           {...getRootProps()}
-          className="flex w-full items-center rounded-[40px] border dark:border-grey border-dark-gray bg-lotion dark:bg-charleston-green-3"
+          className="flex w-full items-center rounded-[40px]"
         >
           <label htmlFor="file-upload" className="sr-only">
             {t('modals.uploadDoc.label')}
           </label>
           <input {...getInputProps()} id="file-upload" />
-          <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`}
-            onInput={handleInput}
-            onKeyDown={(e) => {
-              if (e.key === 'Enter' && !e.shiftKey) {
-                e.preventDefault();
-                handleQuestionSubmission();
-              }
-            }}
-            aria-label={t('inputPlaceholder')}
-          ></textarea>
-          {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()}
-                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>
-          )}
+          <MessageInput
+            value={input}
+            onChange={(e) => setInput(e.target.value)}
+            onSubmit={handleQuestionSubmission}
+            loading={status === 'loading'}
+          />
         </div>
 
         <p className="text-gray-4000 hidden w-[100vw] self-center bg-transparent py-2 text-center text-xs dark:text-sonic-silver md:inline md:w-full">
diff --git a/frontend/src/conversation/ConversationMessages.tsx b/frontend/src/conversation/ConversationMessages.tsx
index 698d0402..8cb878ef 100644
--- a/frontend/src/conversation/ConversationMessages.tsx
+++ b/frontend/src/conversation/ConversationMessages.tsx
@@ -139,7 +139,7 @@ export default function ConversationMessages({
       ref={conversationRef}
       onWheel={handleUserInterruption}
       onTouchMove={handleUserInterruption}
-      className="flex justify-center w-full overflow-y-auto h-screen sm:mt-12"
+      className="flex justify-center w-full overflow-y-auto h-screen sm:pt-12 "
     >
       {queries.length > 0 && !hasScrolledToLast && (
         <button
@@ -156,7 +156,7 @@ export default function ConversationMessages({
       )}
 
       {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]">
+        <div className="w-full px-2 md:w-6/12">
           {queries.map((query, index) => (
             <Fragment key={index}>
               <ConversationBubble
diff --git a/frontend/src/conversation/SharedConversation.tsx b/frontend/src/conversation/SharedConversation.tsx
index e72f90da..57e207e2 100644
--- a/frontend/src/conversation/SharedConversation.tsx
+++ b/frontend/src/conversation/SharedConversation.tsx
@@ -1,18 +1,16 @@
-import { Fragment, useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } 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 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 MessageInput from '../components/MessageInput';
+import conversationService from '../api/services/conversationService';
 import {
+  selectClientAPIKey,
   setClientApiKey,
+  updateQuery,
   addQuery,
   fetchSharedAnswer,
+  selectStatus,
 } from './sharedConversationSlice';
 import { setIdentifier, setFetchedData } from './sharedConversationSlice';
 
@@ -23,42 +21,62 @@ import {
   selectDate,
   selectTitle,
   selectQueries,
-  selectClientAPIKey,
-  selectStatus,
 } from './sharedConversationSlice';
 import { useSelector } from 'react-redux';
 import { Helmet } from 'react-helmet';
+import { formatDate } from '../utils/dateTimeUtils';
 
 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 [input, setInput] = useState('');
+  const sharedConversationRef = useRef<HTMLDivElement>(null);
   const { t } = useTranslation();
   const dispatch = useDispatch<AppDispatch>();
 
-  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`;
-    }
-  };
+  const [lastQueryReturnedErr, setLastQueryReturnedErr] = useState(false);
+  const [eventInterrupt, setEventInterrupt] = useState(false);
+
+  useEffect(() => {
+    !eventInterrupt && scrollIntoView();
+  }, [queries.length, queries[queries.length - 1]]);
 
   useEffect(() => {
     identifier && dispatch(setIdentifier(identifier));
-    fetchQueries();
+    const element = document.getElementById('inputbox') as HTMLInputElement;
+    if (element) {
+      element.focus();
+    }
   }, []);
 
+  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
@@ -74,7 +92,7 @@ export const SharedConversation = () => {
               setFetchedData({
                 queries: data.queries,
                 title: data.title,
-                date: data.date,
+                date: formatDate(data.timestamp),
                 identifier,
               }),
             );
@@ -83,6 +101,29 @@ export const SharedConversation = () => {
         });
   };
 
+  const handleQuestionSubmission = () => {
+    if (input && status !== 'loading') {
+      if (lastQueryReturnedErr) {
+        // update last failed query with new prompt
+        dispatch(
+          updateQuery({
+            index: queries.length - 1,
+            query: {
+              prompt: input,
+            },
+          }),
+        );
+        handleQuestion({
+          question: queries[queries.length - 1].prompt,
+          isRetry: true,
+        });
+      } else {
+        handleQuestion({ question: input });
+      }
+      setInput('');
+    }
+  };
+
   const handleQuestion = ({
     question,
     isRetry = false,
@@ -92,19 +133,13 @@ export const SharedConversation = () => {
   }) => {
     question = question.trim();
     if (question === '') return;
-    !isRetry && dispatch(addQuery({ prompt: question }));
+    setEventInterrupt(false);
+    !isRetry && dispatch(addQuery({ prompt: question })); //dispatch only new queries
     dispatch(fetchSharedAnswer({ question }));
   };
-
-  const handleQuestionSubmission = (
-    updatedQuestion?: string,
-    updated?: boolean,
-    indx?: number,
-  ) => {
-    if (updatedQuestion && status !== 'loading') {
-      handleQuestion({ question: updatedQuestion });
-    }
-  };
+  useEffect(() => {
+    fetchQueries();
+  }, []);
 
   return (
     <>
@@ -123,105 +158,48 @@ 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">
-        {/* 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 className="border-b p-2 dark:border-b-silver w-full md:w-6/12">
+          <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>
-
-        {/* Conditionally render based on API key */}
-        {!apiKey ? (
-          <div className="flex flex-col items-center justify-center h-full">
+        <ConversationMessages
+          handleQuestion={handleQuestion}
+          handleQuestionSubmission={handleQuestionSubmission}
+          queries={queries}
+          status={status}
+        />
+        <div className="flex flex-col items-center gap-4 pb-2 w-full md:w-6/12">
+          {apiKey ? (
+            <MessageInput
+              value={input}
+              onChange={(e) => setInput(e.target.value)}
+              onSubmit={() => handleQuestionSubmission()}
+              loading={status === 'loading'}
+            />
+          ) : (
             <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"
+              className="w-fit rounded-full bg-purple-30 py-3 px-5 text-white shadow-xl transition-colors duration-200 hover:bg-violets-are-blue 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>
-        ) : (
-          <>
-            <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>
-          </>
-        )}
+          <p className="text-gray-4000 hidden w-[100vw] self-center bg-transparent py-2 text-center text-xs dark:text-sonic-silver md:inline md:w-full">
+            {t('sharedConv.meta')}
+          </p>
+        </div>
       </div>
     </>
   );