diff --git a/src/components/Helpers/PriceFormatter.jsx b/src/components/Helpers/PriceFormatter.jsx
index 540a399..cf710a1 100644
--- a/src/components/Helpers/PriceFormatter.jsx
+++ b/src/components/Helpers/PriceFormatter.jsx
@@ -75,4 +75,23 @@ export const AmountTo2DP = (
 
   // return formattedNumber;
   return formattedNumber;
+};
+
+
+
+// FUNCTION TO RETURN CURRENCY SYMBOL
+export const currencySymbol = (
+  currencyName = "naira",
+  amount = "00",
+) => {
+  // Cureency Array
+  let currencyArray = [
+    {currencyName:'naira', symbol:'₦'},
+    {currencyName:'usd', symbol:'$'},
+  ]
+
+  const matchedCurrency = currencyArray.filter(item => item.currencyName.toLocaleLowerCase() == currencyName.toLocaleLowerCase())
+  const amountTo2DP = AmountTo2DP(amount)
+  // return formattedNumber;
+  return  matchedCurrency.length ? <><span>{matchedCurrency[0].symbol}</span><span>{amountTo2DP}</span></> : <><span>$</span><span>{amountTo2DP}</span></>;
 };
\ No newline at end of file
diff --git a/src/components/History/JobsCompleted.jsx b/src/components/History/JobsCompleted.jsx
index b56118f..1ea411b 100644
--- a/src/components/History/JobsCompleted.jsx
+++ b/src/components/History/JobsCompleted.jsx
@@ -7,7 +7,7 @@ import PaginatedList from '../../components/Pagination/PaginatedList';
 
 import LoadingSpinner from '../Spinners/LoadingSpinner';
 
-import { AmountTo2DP, PriceFormatter } from '../Helpers/PriceFormatter';
+import { currencySymbol } from '../Helpers/PriceFormatter';
 import {NewDateTimeFormatter} from '../../lib/NewDateTimeFormatter'
 
 function JobsCompleted() {
@@ -76,10 +76,7 @@ function JobsCompleted() {
                                 </div>
                             </div>
                         </td>
-                        <td className="p-4 flex text-right justify-end items-center">{AmountTo2DP(item?.price*0.01)} {item?.currency_code}</td>
-                        {/* <td className="p-4 text-right">{PriceFormatter(item?.price*0.01, item?.currency_code)}</td> */}
-                        {/* <td className="p-4">{date}</td>
-                        <td className="p-4">{item?.contract}</td> */}
+                        <td className="p-4 flex text-right justify-end items-center">{currencySymbol(item?.currency_code, item?.price*0.01)}</td>
                     </tr>
                 )
             }
diff --git a/src/components/History/RewardsTable.jsx b/src/components/History/RewardsTable.jsx
index d9aed8f..44656ac 100644
--- a/src/components/History/RewardsTable.jsx
+++ b/src/components/History/RewardsTable.jsx
@@ -7,7 +7,7 @@ import PaginatedList from '../../components/Pagination/PaginatedList';
 
 import LoadingSpinner from '../Spinners/LoadingSpinner';
 
-import { AmountTo2DP } from '../Helpers/PriceFormatter';
+import { currencySymbol } from '../Helpers/PriceFormatter';
 
 
 export const RewardsTable = memo(() => {
@@ -47,7 +47,7 @@ export const RewardsTable = memo(() => {
       }, [])
 
   return (
-    <div className='py-4 flex flex-col justify-between min-h-[500px]'>
+    <div className='py-4 flex flex-col justify-between min-h-[500px] w-full overflow-x-auto'>
     {familyRewardHistory.loading ? 
     <LoadingSpinner size='16' color='sky-blue' height='h-[500px]' />
     : familyRewardHistory.data.length ?
@@ -55,9 +55,9 @@ export const RewardsTable = memo(() => {
         <thead className='w-full'>
             <tr className='text-slate-600 dark:text-white'>
             <th className="p-4"></th>
-            <th className="p-4 text-right">Amount</th>
-            <th className="p-4">Date</th>
-            <th className="p-4">Confirmation</th>
+            <th className="p-4 text-center">Amount</th>
+            <th className="p-4 text-center">Date</th>
+            <th className="p-4 text-center">Confirmation</th>
             </tr>
         </thead>
         <tbody>
@@ -65,7 +65,7 @@ export const RewardsTable = memo(() => {
                 let date = new Date(item.added).toLocaleDateString()
                 return (
                     <tr key={index} className='dark:text-white dark:bg-dark-white border-y dark:border-[#5356fb29] hover:bg-gray-50 dark:hover:bg-gray-50 dark:hover:text-black transition-all duration-300'>
-                        <td className="p-4 min-w-[350px] max-w-[400px]">
+                        <td className="p-4 min-w-[300px]">
                             <div className='flex w-full items-center gap-2'>
                                 <img src={item.icon} className='min-w-[60px] max-w-[60px] min-h-[60px] max-h-[60px] rounded-full bg-slate-500' alt='Reward Logo' />
                                 <div className='flex flex-col w-full'>
@@ -74,9 +74,9 @@ export const RewardsTable = memo(() => {
                                 </div>
                             </div>
                         </td>
-                        <td className="p-4 text-right">{AmountTo2DP(item.amount*0.01)} {item.currency}</td>
-                        <td className="p-4">{date}</td>
-                        <td className="p-4">{item.confirmation}</td>
+                        <td className="p-4 text-right flex-nowrap">{currencySymbol(item.currency, item.amount*0.01)}</td>
+                        <td className="p-4 text-center">{date}</td>
+                        <td className="p-4 text-center">{item.confirmation}</td>
                     </tr>
                 )
             }
diff --git a/src/components/History/index.jsx b/src/components/History/index.jsx
index 04df522..6398c6c 100644
--- a/src/components/History/index.jsx
+++ b/src/components/History/index.jsx
@@ -127,7 +127,7 @@ export default function History() {
                         </div>
                     </div>
                     <div className="w-[1px] bg-[#E3E4FE] dark:bg-[#a7a9b533]  mr-10"></div>
-                    <div className="flex-1 overflow-y-auto min-h-[520px]">
+                    <div className="w-full overflow-y-auto min-h-[520px]">
                         <>
                             {/* PURCHASE SECTION */}
                             {selectedTab == 'purchases' &&
diff --git a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
index 3bfd6aa..192af14 100644
--- a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
+++ b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx
@@ -3,6 +3,8 @@ import React, {useState} from 'react'
 import PaginatedList from '../../Pagination/PaginatedList';
 import { handlePagingFunc } from '../../Pagination/HandlePagination';
 
+import { currencySymbol } from '../../Helpers/PriceFormatter';
+
 function PurchasesTable({purchase}) {
 
     const [currentPage, setCurrentPage] = useState(0);
@@ -31,8 +33,8 @@ function PurchasesTable({purchase}) {
                     <td className="p-4">{item.added_date}<br />
                     <b>{item.confirmation} </b>
                     </td>
-                    <td className="p-4 text-right">{item.amount}</td>
-                    <td className="p-4 text-right">{item.fee}</td>
+                    <td className="p-4 text-right">{currencySymbol('', item.amount)}</td>
+                    <td className="p-4 text-right">{currencySymbol('', item.fee)}</td>
                 </tr>
                 ))}
             </tbody>
diff --git a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
index c8ea4dd..5da7b6a 100644
--- a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
+++ b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx
@@ -3,6 +3,8 @@ import React, { useState } from "react";
 import PaginatedList from "../../Pagination/PaginatedList";
 import { handlePagingFunc } from "../../Pagination/HandlePagination";
 
+import { currencySymbol } from '../../Helpers/PriceFormatter';
+
 function RecentActivityTable({ payment }) {
   const [currentPage, setCurrentPage] = useState(0);
   const indexOfFirstItem = Number(currentPage);
@@ -38,9 +40,9 @@ function RecentActivityTable({ payment }) {
                   dangerouslySetInnerHTML={{ __html: item.recipient }}
                 ></td>
                 <td className="p-4 text-right">
-                  {item.amount}
+                  {currencySymbol('', item.amount)}
                   <br />
-                  {item.fee}
+                  {currencySymbol('', item.fee)}
                 </td>
                 <td className="p-4">{item.status}</td>
               </tr>
diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx
index da3783a..12687dd 100644
--- a/src/components/Partials/Header.jsx
+++ b/src/components/Partials/Header.jsx
@@ -413,7 +413,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                         </div>
                       </Link>
                     </li>
-                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                    {(userDetails && userDetails?.account_type !== "FAMILY" && Number(process.env.REACT_APP_SHOW_USER_PAGE) == 1) && (
                       <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
                         <Link to="/yourpage" className="notifications">
                           <div className="name">
diff --git a/src/components/Partials/MediaHeader.jsx b/src/components/Partials/MediaHeader.jsx
index 612b775..04f2576 100644
--- a/src/components/Partials/MediaHeader.jsx
+++ b/src/components/Partials/MediaHeader.jsx
@@ -457,7 +457,7 @@ export default function MediaHeader({ logoutModalHandler, sidebarHandler, backpa
                         </div>
                       </Link>
                     </li>
-                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                    {(userDetails && userDetails?.account_type !== "FAMILY" && Number(process.env.REACT_APP_SHOW_USER_PAGE) == 1) && (
                       <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
                         <Link to="/yourpage" className="notifications">
                           <div className="name">
diff --git a/src/components/Settings/Tabs/ChangePasswordTab.jsx b/src/components/Settings/Tabs/ChangePasswordTab.jsx
index a4c5eaf..890d0bd 100644
--- a/src/components/Settings/Tabs/ChangePasswordTab.jsx
+++ b/src/components/Settings/Tabs/ChangePasswordTab.jsx
@@ -120,7 +120,7 @@ export default function ChangePasswordTab() {
               className="input-label text-dark-gray dark:text-white text-xl font-bold block mb-2.5"
               htmlFor="old_password"
             >
-              Old Password <span className="text-[10px] text-red-500 italic px-2">{(inputEmpty && !inputs.old_pwd) && 'required'}</span>
+              Current Password <span className="text-[10px] text-red-500 italic px-2">{(inputEmpty && !inputs.old_pwd) && 'required'}</span>
             </label>
             <div className="input-wrapper border border-light-purple dark:border-[#5356fb29]  w-full rounded-[50px] h-[58px] overflow-hidden relative ">
               <div className="absolute left-6 bottom-[17px] z-10">
diff --git a/src/components/Settings/index.jsx b/src/components/Settings/index.jsx
index 643bf44..7669346 100644
--- a/src/components/Settings/index.jsx
+++ b/src/components/Settings/index.jsx
@@ -91,8 +91,8 @@ export default function Settings({ faq }) {
     },
     {
       id: 5,
-      name: "login_activity",
-      title: "Login Activity",
+      name: "preferences",
+      title: "Preferences",
       iconName: "login-activity",
     },
     {
@@ -166,7 +166,7 @@ export default function Settings({ faq }) {
         <NotificationSettingTab />
       </div>
     ),
-    login_activity: <LoginActivityTab />,
+    preferences: <LoginActivityTab />,
     recent_activities: <RecentActivitiesTab />,
     password: <ChangePasswordTab />,
     faq: <FaqTab datas={faq} />,