diff --git a/src/App.jsx b/src/App.jsx
index dd2dcac..864bcb3 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -64,9 +64,9 @@ const App = () => {
     <Router>
       <Routes>
         {/* <Route path="/login" element={<Login />} /> */}
-        <Route path="/" element={<WelcomeToOptifii />} />
+        <Route path="/welcome-screen" element={<WelcomeToOptifii />} />
         <Route path="/login-phone-number" element={<LoginPhoneNumber />} />
-        <Route path="/login-email-address" element={<LoginEmailAddress />} />
+        <Route path="/" element={<LoginEmailAddress />} />
         <Route path="/login-otp" element={<LoginEmailOtp />} />
         <Route path="/ekyc" element={<LoginEkyc />} />
         <Route path="/minimum-kyc" element={<MinimumKyc />} />
diff --git a/src/Components/HeaderMain.jsx b/src/Components/HeaderMain.jsx
index 01b0ab7..ad6ae52 100644
--- a/src/Components/HeaderMain.jsx
+++ b/src/Components/HeaderMain.jsx
@@ -62,7 +62,7 @@ const HeaderMain = ({
               style={{ width: 95 }}
               src={mainLogo}
               alt="Logo"
-              onClick={() => navigate("/")}
+              onClick={() => navigate("/home")}
               cursor={"pointer"}
             />
           </Box>
diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx
index 23ecde7..03e09bd 100644
--- a/src/Layout/DefaultLayout.jsx
+++ b/src/Layout/DefaultLayout.jsx
@@ -390,7 +390,7 @@ const DashboardLayout = ({ isOnline }) => {
                           }  link d-flex align-items-center gap-2 w-100 mb-1`}
                         >
                           <NavLink
-                            to="/"
+                            to={path}
                             as="span"
                             className="d-flex align-items-centre gap-2 w-50 py-1"
                           >
diff --git a/src/Pages/Gifts/MyGiftCardsTab.jsx b/src/Pages/Gifts/MyGiftCardsTab.jsx
index b38b6ee..242c09e 100644
--- a/src/Pages/Gifts/MyGiftCardsTab.jsx
+++ b/src/Pages/Gifts/MyGiftCardsTab.jsx
@@ -27,13 +27,6 @@ const MyGiftCardsTab = () => {
     return () => clearTimeout(timer);
   }, []);
 
-  // Table headers
-  const tableHeadRow = [
-    "Transaction Type",
-    "Date",
-    "Wallet Type",
-    "Amount Spent",
-  ];
 
   const InternalCard = ({ title1, subTitle1, title2, subbTitle2 }) => {
     return (
@@ -67,6 +60,14 @@ const MyGiftCardsTab = () => {
     );
   };
 
+
+  // Table headers
+  const tableHeadRow = [
+    "Transaction Type",
+    "Date",
+    "Wallet Type",
+    "Amount Spent",
+  ];
   // Extracted data for table
   const extractedArray = requestsTable.map((item, index) => ({
     "Transaction Type": (
diff --git a/src/Pages/Onboarding/LoginEmailAddress.jsx b/src/Pages/Onboarding/LoginEmailAddress.jsx
index 383ff6c..fc282ba 100644
--- a/src/Pages/Onboarding/LoginEmailAddress.jsx
+++ b/src/Pages/Onboarding/LoginEmailAddress.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Box, Input, Button, Text, HStack, Link, Container, InputGroup, InputLeftElement, Divider, FormControl, FormLabel, FormErrorMessage } from '@chakra-ui/react';
+import { Box, Input, Button, Text, HStack, Link, Container, InputGroup, InputLeftElement, Divider, FormControl, FormLabel, FormErrorMessage, useToast } from '@chakra-ui/react';
 import PrimaryButton from '../../Components/Buttons/PrimaryButton';
 import SecondaryButton from '../../Components/Buttons/SecondaryButton';
 import { HiOutlineMail } from "react-icons/hi";
@@ -18,6 +18,7 @@ const emailValidation = Yup.object().shape({
 });
 
 const LoginEmailAddress = () => {
+    const toast = useToast()
     const navigate = useNavigate();
     const [ isLoading, setIsLoading ] = useState(false)
 
@@ -109,7 +110,7 @@ const LoginEmailAddress = () => {
                                 </HStack>
                                 <HStack justifyContent={"center"} mt={4}>
                                     <Text fontSize={"xs"} fontWeight={500} mb={0}>Don’t have an account?</Text>
-                                    <Link fontSize={"xs"} fontWeight={600} mb={0} color={"#3725EA"}>Signup</Link>
+                                    <Link onClick={()=> navigate('/welcome-screen')} fontSize={"xs"} fontWeight={600} mb={0} color={"#3725EA"}>Signup</Link>
                                 </HStack>
                                 <HStack spacing={4} my={8}>
                                     <Divider />
diff --git a/src/Pages/Onboarding/LoginOtp.jsx b/src/Pages/Onboarding/LoginOtp.jsx
index f8af29c..634b18f 100644
--- a/src/Pages/Onboarding/LoginOtp.jsx
+++ b/src/Pages/Onboarding/LoginOtp.jsx
@@ -1,15 +1,17 @@
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { Box, PinInput, PinInputField, Text, HStack, Container, useToast } from '@chakra-ui/react';
 import PrimaryButton from '../../Components/Buttons/PrimaryButton';
 import LoginOtpFrame from './LoginOtpFrame';
 import { useNavigate } from 'react-router-dom';
 import Cookies from 'js-cookie';
 import ToastBox from '../../Components/ToastBox';
+import GlobalStateContext from '../../Contexts/GlobalStateContext';
 
 const LoginOtp = () => {
     
     const [otp, setOtp] = useState("");
     const [ isLoading, setIsLoading ] = useState(false)
+    const { isAuthenticate, setIsAuthenticate } = useContext(GlobalStateContext);
     const navigate = useNavigate();
     const toast = useToast();
 
@@ -33,7 +35,7 @@ const LoginOtp = () => {
                         <ToastBox status={"success"} message={"Login Successfully"} />
                     ),
                 });
-
+                setIsAuthenticate(true)
                 Cookies.set("isAuthenticated", true, { expires: 7 });
                 navigate("/home");
             }, 2000); // 2-second delay