diff --git a/frontend/src/components/Auth/Auth.tsx b/frontend/src/components/Auth/Auth.tsx
index aa4ac0511..44c67ab02 100644
--- a/frontend/src/components/Auth/Auth.tsx
+++ b/frontend/src/components/Auth/Auth.tsx
@@ -1,6 +1,8 @@
-import React from 'react';
+
+import React, { useEffect } from 'react';
 import { AppState, Auth0Provider, useAuth0 } from '@auth0/auth0-react';
-import { Navigate, useNavigate } from 'react-router';
+import { useNavigate } from 'react-router';
+
 const domain = process.env.VITE_AUTH0_DOMAIN;
 const clientId = process.env.VITE_AUTH0_CLIENT_ID;
 const Auth0ProviderWithHistory: React.FC<{ children: React.ReactNode }> = ({ children }) => {
@@ -24,13 +26,18 @@ const Auth0ProviderWithHistory: React.FC<{ children: React.ReactNode }> = ({ chi
 };
 
 export const AuthenticationGuard: React.FC<{ component: React.ComponentType<object> }> = ({ component }) => {
-  const { isAuthenticated } = useAuth0();
+
+  const { isAuthenticated, isLoading } = useAuth0();
   const Component = component;
+  const navigate = useNavigate();
+  useEffect(() => {
+    if (!isLoading && !isAuthenticated) {
+      localStorage.setItem('isReadOnlyMode', 'true');
+      navigate('/readonly', { replace: true });
+    }
+  }, [isLoading, isAuthenticated]);
+
 
-  if (!isAuthenticated) {
-    localStorage.setItem('isReadOnlyMode', 'true');
-    return <Navigate to='/readonly' replace />;
-  }
   return <Component />;
 };
 
diff --git a/frontend/src/components/ChatBot/ChunkInfo.tsx b/frontend/src/components/ChatBot/ChunkInfo.tsx
index 44daf0516..6c6756549 100644
--- a/frontend/src/components/ChatBot/ChunkInfo.tsx
+++ b/frontend/src/components/ChatBot/ChunkInfo.tsx
@@ -47,7 +47,7 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
               <li key={chunk.id} className='mb-2'>
                 {chunk?.page_number ? (
                   <>
-                    <div className='flex! flex-row inline-block items-center gap-1'>
+                    <div className='flex! flex-row items-center gap-1'>
                       <>
                         <DocumentTextIconOutline className='w-4 h-4 inline-block mr-2' />
                         <Typography
@@ -81,7 +81,7 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                   </>
                 ) : chunk?.url && chunk?.start_time ? (
                   <>
-                    <div className='flex! flex-row inline-block justiy-between items-center gap-1'>
+                    <div className='flex! flex-row justiy-between items-center gap-1'>
                       <img src={youtubelogo} width={20} height={20} className='mr-2' />
                       <TextLink
                         href={generateYouTubeLink(chunk?.url, chunk?.start_time)}
@@ -100,7 +100,7 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                       mode !== chatModeLables['entity search+vector'] &&
                       mode !== chatModeLables.graph && (
                         <>
-                          <Flex alignItems='center' flexDirection='column' justifyContent='space-between'>
+                          <Flex alignItems='center' flexDirection='row' justifyContent='space-between'>
                             <Typography variant='subheading-small'>Similarity Score: {chunk?.score}</Typography>
                             <IconButtonWithToolTip
                               placement='top'
@@ -112,25 +112,12 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                               <ExploreIcon className='n-size-token-5' />
                             </IconButtonWithToolTip>
                           </Flex>
-
-                          {/* <div> */}
-
-                          {/* <TextLink
-                              as='small'
-                              className={`${loadingGraphView ? 'cursor-wait' : 'cursor-pointer'}`}
-                              htmlAttributes={{
-                                onClick: () => handleChunkClick(chunk.element_id, 'Chunk'),
-                              }}
-                            >
-                              {'View Graph'}
-                            </TextLink> */}
-                          {/* </div> */}
                         </>
                       )}
                   </>
                 ) : chunk?.url && new URL(chunk.url).host === 'wikipedia.org' ? (
                   <>
-                    <div className='flex! flex-row inline-block justiy-between items-center gap-1'>
+                    <div className='flex! flex-row justiy-between items-center gap-1'>
                       <img src={wikipedialogo} width={20} height={20} className='mr-2' />
                       <Typography variant='subheading-medium'>{chunk?.fileName}</Typography>
                     </div>
@@ -151,22 +138,13 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                               <ExploreIcon className='n-size-token-5' />
                             </IconButtonWithToolTip>
                           </Flex>
-                          <div>
-                            {/* <TextLink
-                              className={`${loadingGraphView ? 'cursor-wait' : 'cursor-pointer'}`}
-                              htmlAttributes={{
-                                onClick: () => handleChunkClick(chunk.element_id, 'Chunk'),
-                              }}
-                            >
-                              {'View Graph'}
-                            </TextLink> */}
-                          </div>
+                          <div></div>
                         </>
                       )}
                   </>
                 ) : chunk?.url && new URL(chunk.url).host === 'storage.googleapis.com' ? (
                   <>
-                    <div className='flex! flex-row inline-block justiy-between items-center gap-1'>
+                    <div className='flex! flex-row justiy-between items-center gap-1'>
                       <img src={gcslogo} width={20} height={20} className='mr-2' />
                       <Typography variant='subheading-medium'>{chunk?.fileName}</Typography>
                     </div>
@@ -186,23 +164,12 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                               <ExploreIcon className='n-size-token-5' />
                             </IconButtonWithToolTip>
                           </Flex>
-
-                          {/* <div>
-                            <TextLink
-                              className={`${loadingGraphView ? 'cursor-wait' : 'cursor-pointer'}`}
-                              htmlAttributes={{
-                                onClick: () => handleChunkClick(chunk.element_id, 'Chunk'),
-                              }}
-                            >
-                              {'View Graph'}
-                            </TextLink>
-                          </div> */}
                         </>
                       )}
                   </>
                 ) : chunk?.url && chunk?.url.startsWith('s3://') ? (
                   <>
-                    <div className='flex! flex-row inline-block justiy-between items-center gap-1'>
+                    <div className='flex! flex-row  justiy-between items-center gap-1'>
                       <img src={s3logo} width={20} height={20} className='mr-2' />
                       <Typography variant='subheading-medium'>{chunk?.fileName}</Typography>
                     </div>
@@ -222,16 +189,6 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                               <ExploreIcon className='n-size-token-5' />
                             </IconButtonWithToolTip>
                           </Flex>
-                          <div>
-                            {/* <TextLink
-                              className={`${loadingGraphView ? 'cursor-wait' : 'cursor-pointer'}`}
-                              htmlAttributes={{
-                                onClick: () => handleChunkClick(chunk.element_id, 'Chunk'),
-                              }}
-                            >
-                              {'View Graph'}
-                            </TextLink> */}
-                          </div>
                         </>
                       )}
                   </>
@@ -239,7 +196,7 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                   !chunk?.url.startsWith('s3://') &&
                   !isAllowedHost(chunk?.url, ['storage.googleapis.com', 'wikipedia.org', 'youtube.com']) ? (
                   <>
-                    <div className='flex! flex-row inline-block items-center gap-1'>
+                    <div className='flex! flex-row items-center gap-1'>
                       <GlobeAltIconOutline className='n-size-token-7' />
                       <TextLink href={chunk?.url} type='external' target='_blank'>
                         <Typography variant='body-medium'>{chunk?.url}</Typography>
@@ -261,22 +218,12 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                               <ExploreIcon className='n-size-token-5' />
                             </IconButtonWithToolTip>
                           </Flex>
-                          <div>
-                            {/* <TextLink
-                              className={`${loadingGraphView ? 'cursor-wait' : 'cursor-pointer'}`}
-                              htmlAttributes={{
-                                onClick: () => handleChunkClick(chunk.element_id, 'Chunk'),
-                              }}
-                            >
-                              {'View Graph'}
-                            </TextLink> */}
-                          </div>
                         </>
                       )}
                   </>
                 ) : (
                   <>
-                    <div className='flex! flex-col inline-block'>
+                    <div className='flex! flex-col'>
                       <Flex flexDirection='row' justifyContent='space-between'>
                         <div className='flex items-center'>
                           {chunk.fileSource === 'local file' ? (
@@ -306,19 +253,7 @@ const ChunkInfo: FC<ChunkProps> = ({ loading, chunks, mode }) => {
                           <ExploreIcon className='n-size-token-5' />
                         </IconButtonWithToolTip>
                       </Flex>
-                      <>
-                        {/* <div> */}
-
-                        {/* <TextLink
-                            className={`${loadingGraphView ? 'cursor-wait' : 'cursor-pointer'}`}
-                            htmlAttributes={{
-                              onClick: () => handleChunkClick(chunk.element_id, 'Chunk'),
-                            }}
-                          >
-                            {'View Graph'}
-                          </TextLink> */}
-                        {/* </div> */}
-                      </>
+                      <></>
                     </div>
                   </>
                 )}
diff --git a/frontend/src/components/ChatBot/SourcesInfo.tsx b/frontend/src/components/ChatBot/SourcesInfo.tsx
index 99c9ee2f9..6016b511b 100644
--- a/frontend/src/components/ChatBot/SourcesInfo.tsx
+++ b/frontend/src/components/ChatBot/SourcesInfo.tsx
@@ -37,8 +37,8 @@ const SourcesInfo: FC<SourcesProps> = ({ loading, mode, chunks, sources }) => {
             .map((c) => ({ fileName: c.fileName, fileSource: c.fileSource }))
             .map((s, index) => {
               return (
-                <li key={index} className='flex! flex-row inline-block justify-between items-center p-2'>
-                  <div className='flex! flex-row inline-block justify-between items-center'>
+                <li key={index} className='flex! flex-row justify-between items-center p-2'>
+                  <div className='flex! flex-row  justify-between items-center'>
                     {s.fileSource === 'local file' ? (
                       <DocumentTextIconOutline className='n-size-token-7 mr-2' />
                     ) : (
@@ -59,11 +59,11 @@ const SourcesInfo: FC<SourcesProps> = ({ loading, mode, chunks, sources }) => {
         <ul className='list-class list-none'>
           {sources.map((link, index) => {
             return (
-              <li key={index} className='flex! flex-row inline-block justify-between items-center p-2'>
+              <li key={index} className='flex! flex-row justify-between items-center p-2'>
                 {link?.startsWith('http') || link?.startsWith('https') ? (
                   <>
                     {isAllowedHost(link, ['wikipedia.org']) && (
-                      <div className='flex! flex-row inline-block justify-between items-center'>
+                      <div className='flex! flex-row justify-between items-center'>
                         <img src={wikipedialogo} width={20} height={20} className='mr-2' alt='Wikipedia Logo' />
                         <TextLink href={link} type='external' target='_blank'>
                           <HoverableLink url={link}>
@@ -78,7 +78,7 @@ const SourcesInfo: FC<SourcesProps> = ({ loading, mode, chunks, sources }) => {
                       </div>
                     )}
                     {isAllowedHost(link, ['storage.googleapis.com']) && (
-                      <div className='flex! flex-row inline-block justify-between items-center'>
+                      <div className='flex! flex-row justify-between items-center'>
                         <img src={gcslogo} width={20} height={20} className='mr-2' alt='Google Cloud Storage Logo' />
                         <Typography
                           variant='body-medium'
@@ -90,7 +90,7 @@ const SourcesInfo: FC<SourcesProps> = ({ loading, mode, chunks, sources }) => {
                     )}
                     {youtubeLinkValidation(link) && (
                       <>
-                        <div className='flex! flex-row inline-block justiy-between items-center'>
+                        <div className='flex! flex-row justiy-between items-center'>
                           <img src={youtubelogo} width={20} height={20} className='mr-2' />
                           <TextLink href={link} type='external' target='_blank'>
                             <HoverableLink url={link}>
@@ -107,7 +107,7 @@ const SourcesInfo: FC<SourcesProps> = ({ loading, mode, chunks, sources }) => {
                     )}
                     {!link?.startsWith('s3://') &&
                       !isAllowedHost(link, ['storage.googleapis.com', 'wikipedia.org', 'www.youtube.com']) && (
-                        <div className='flex! flex-row inline-block justify-between items-center'>
+                        <div className='flex! flex-row justify-between items-center'>
                           <GlobeAltIconOutline className='n-size-token-7' />
                           <TextLink href={link} type='external' target='_blank'>
                             <Typography variant='body-medium'>{link}</Typography>
@@ -116,7 +116,7 @@ const SourcesInfo: FC<SourcesProps> = ({ loading, mode, chunks, sources }) => {
                       )}
                   </>
                 ) : link?.startsWith('s3://') ? (
-                  <div className='flex! flex-row inline-block justify-between items-center'>
+                  <div className='flex! flex-row justify-between items-center'>
                     <img src={s3logo} width={20} height={20} className='mr-2' alt='S3 Logo' />
                     <Typography
                       variant='body-medium'
@@ -126,7 +126,7 @@ const SourcesInfo: FC<SourcesProps> = ({ loading, mode, chunks, sources }) => {
                     </Typography>
                   </div>
                 ) : (
-                  <div className='flex! flex-row inline-block justify-between items-center'>
+                  <div className='flex! flex-row justify-between items-center'>
                     <DocumentTextIconOutline className='n-size-token-7 mr-2' />
                     <Typography
                       variant='body-medium'
diff --git a/frontend/src/components/Layout/DrawerDropzone.tsx b/frontend/src/components/Layout/DrawerDropzone.tsx
index f6e9b301f..a3c4db2ac 100644
--- a/frontend/src/components/Layout/DrawerDropzone.tsx
+++ b/frontend/src/components/Layout/DrawerDropzone.tsx
@@ -125,12 +125,20 @@ const DrawerDropzone: React.FC<DrawerProps> = ({
           </Drawer.Body>
         ) : (
           <Drawer.Body className='overflow-hidden! w-[294px]!'>
-            <Typography variant='body-small'>
+            <Typography
+              variant='body-small'
+              className='cursor-pointer'
+              htmlAttributes={{
+                onClick: () => {
+                  loginWithRedirect();
+                },
+              }}
+            >
               <StatusIndicator type={'danger'} />
               <span className='text-center mx-1'>
                 {filesData.length === 0
-                  ? `It seems like you haven't ingested any data yet Please log in and connect to your database to proceed.`
-                  : 'You must be logged in to process this data. Please log in and connect to your database to proceed.'}
+                  ? `It seems like you haven't ingested any data yet Please log in to the main application.`
+                  : 'You must be logged in to process this data. Please log in to the main application'}
               </span>
             </Typography>
             <div className={`h-full cursor-pointer`} onClick={() => loginWithRedirect()}>
diff --git a/frontend/src/components/Layout/Header.tsx b/frontend/src/components/Layout/Header.tsx
index 91719f89c..0599853f7 100644
--- a/frontend/src/components/Layout/Header.tsx
+++ b/frontend/src/components/Layout/Header.tsx
@@ -83,7 +83,7 @@ const Header: React.FC<HeaderProp> = ({ chatOnly, deleteOnClick, setOpenConnecti
           id='navigation'
           aria-label='main navigation'
         >
-          <section className='flex w-1/3 shrink-0 grow-0 items-center grow min-w-[200px]'>
+          <section className='flex w-1/3 shrink-0 grow-0 items-center min-w-[200px]'>
             <Typography variant='h6' as='a' href='#app-bar-with-responsive-menu'>
               <img
                 src={colorMode === 'dark' ? Neo4jLogoBW : Neo4jLogoColor}