diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 3dc29adc..05362c60 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -21,7 +21,11 @@ export default function App() {
   const location = useLocation();
 
   // Checking for the login page
-  const isLogin = location.pathname === '/login';
+  const isLogin =
+    location.pathname === '/login' ||
+    location.pathname === '/register' ||
+    location.pathname === '/Forgot' ||
+    location.pathname === '/ResetPassword';
 
   return (
     <div className="min-h-full min-w-full">
diff --git a/frontend/src/Hero.tsx b/frontend/src/Hero.tsx
index 9b587225..97ee5c37 100644
--- a/frontend/src/Hero.tsx
+++ b/frontend/src/Hero.tsx
@@ -168,20 +168,6 @@ export default function Hero({ className = '' }: { className?: string }) {
           </div>
         </div>
       </div>
-      <div className="mt-[1vh] flex w-full items-center justify-center gap-[4vh]">
-        <button
-          className="rounded-xl bg-[#7D54D1] p-[2vh] font-medium  text-white transition-transform hover:scale-105"
-          onClick={() => navigate('/login')}
-        >
-          Sign up
-        </button>
-        <button
-          className="rounded-xl bg-[#7D54D1] p-[2vh] font-medium  text-white transition-transform hover:scale-105"
-          onClick={() => navigate('/register')}
-        >
-          Sign in
-        </button>
-      </div>
     </div>
   );
 }
diff --git a/frontend/src/Login/Login.tsx b/frontend/src/Login/Login.tsx
index a8452200..b5985bbc 100644
--- a/frontend/src/Login/Login.tsx
+++ b/frontend/src/Login/Login.tsx
@@ -39,7 +39,7 @@ export default function Login() {
           />
           <h2
             className="text-right text-sm text-[#5F5F5F] hover:cursor-pointer"
-            onClick={() => navigate('/Resetpass')}
+            onClick={() => navigate('/Forgot')}
           >
             Forgot your password?
           </h2>
diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
index fcef2400..96415c1c 100644
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -133,7 +133,7 @@ export default function Conversation() {
 
       {queries.length > 0 && (
         <div className="mt-20 flex flex-col transition-all md:w-3/4">
-          {queries.map((query, index) => {
+          {queries.map((query: Query, index: number) => {
             return (
               <Fragment key={index}>
                 <ConversationBubble
@@ -192,6 +192,7 @@ export default function Conversation() {
             </div>
           )}
         </div>
+
         <p className="text-gray-595959 w-[100vw] self-center bg-white p-5 text-center text-xs md:w-full">
           This is a chatbot that uses the GPT-3, Faiss and LangChain to answer
           questions.