diff --git a/.DS_Store b/.DS_Store
index eced0a8..aa53cfc 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/client/src/components/expense/editExpense.jsx b/client/src/components/expense/editExpense.jsx
index acc39a2..2ab8da9 100644
--- a/client/src/components/expense/editExpense.jsx
+++ b/client/src/components/expense/editExpense.jsx
@@ -16,7 +16,7 @@ import Loading from '../loading';
 import { useNavigate } from "react-router-dom";
 import AlertBanner from '../AlertBanner';
 import { parseISO } from 'date-fns';
-
+import configData from '../../config.json';
 
 
 export default function EditExpense() {
@@ -55,7 +55,7 @@ export default function EditExpense() {
     onSubmit: async () => {
       setLoading(true)
       if(await editExpenseService(values, setAlert, setAlertMessage))
-      navigate(-1)
+        window.location = configData.VIEW_GROUP_URL + values.groupId
     },
   });
 
diff --git a/client/src/components/groups/settlement/index.jsx b/client/src/components/groups/settlement/index.jsx
index cfd0316..16aca79 100644
--- a/client/src/components/groups/settlement/index.jsx
+++ b/client/src/components/groups/settlement/index.jsx
@@ -35,7 +35,7 @@ export const GroupSettlements = ({ currencyType }) => {
             setLoading(false)
         }
         getGroupSettlement()
-    }, [reload])
+    }, [reload, params.groupId])
 
     return (
         <>
diff --git a/client/src/components/groups/viewGroup/groupCategoryGraph.jsx b/client/src/components/groups/viewGroup/groupCategoryGraph.jsx
index c4f9c19..f048ba6 100644
--- a/client/src/components/groups/viewGroup/groupCategoryGraph.jsx
+++ b/client/src/components/groups/viewGroup/groupCategoryGraph.jsx
@@ -66,12 +66,12 @@ const GroupCategoryGraph = ({currencyType}) => {
             }
             const category_exp =
                 await getGroupCategoryExpService(groupIdJson, setAlert, setAlertMessage)
-            setCategoryExp(category_exp.data.data)
+            setCategoryExp(category_exp?.data?.data)
             setLoading(false)
         }
         getGroupCategoryExpense()
 
-    }, [])
+    }, [params.groupId])
     return (
         <>
             {loading ? <Loading /> :
diff --git a/client/src/components/groups/viewGroup/groupMonthlyGraph.jsx b/client/src/components/groups/viewGroup/groupMonthlyGraph.jsx
index 2e91c3a..36b5cc9 100644
--- a/client/src/components/groups/viewGroup/groupMonthlyGraph.jsx
+++ b/client/src/components/groups/viewGroup/groupMonthlyGraph.jsx
@@ -71,13 +71,13 @@ const GroupMonthlyGraph = () => {
             const monthly_exp =
                 await getGroupMonthlyExpService(groupIdJson, setAlert, setAlertMessage)
             const daily_exp = await getGroupDailyExpService(groupIdJson, setAlert, setAlertMessage)
-            setMonthlyExp(monthly_exp.data.data)
-            setDailyExp(daily_exp.data.data)
+            setMonthlyExp(monthly_exp?.data?.data)
+            setDailyExp(daily_exp?.data?.data)
             setLoading(false)
         }
         getGroupMonthlyExpense()
 
-    }, [])
+    }, [params.groupId])
     return (
         <>
             {loading ? <Loading /> :
diff --git a/client/src/components/groups/viewGroup/index.jsx b/client/src/components/groups/viewGroup/index.jsx
index 8e64b32..8e4ff54 100644
--- a/client/src/components/groups/viewGroup/index.jsx
+++ b/client/src/components/groups/viewGroup/index.jsx
@@ -80,7 +80,7 @@ export default function ViewGroup() {
             setLoading(false)
         }
         getGroupDetails()
-    }, []);
+    }, [params.groupId]);
 
     const CategoryStyle = styled('span')(({ theme }) => ({
         top: 22,
diff --git a/components/group.js b/components/group.js
index ae54a9f..7c860fd 100644
--- a/components/group.js
+++ b/components/group.js
@@ -301,7 +301,7 @@ exports.addSplit = async (groupId, expenseAmount, expenseOwner, expenseMembers)
     })
     group.groupTotal += expenseAmount
     group.split[0][expenseOwner] += expenseAmount
-    expensePerPerson = expenseAmount / expenseMembers.length
+    let expensePerPerson = expenseAmount / expenseMembers.length
     expensePerPerson = Math.round((expensePerPerson  + Number.EPSILON) * 100) / 100;
     //Updating the split values per user 
     for (var user of expenseMembers) {
@@ -310,7 +310,7 @@ exports.addSplit = async (groupId, expenseAmount, expenseOwner, expenseMembers)
     
     //Nullifying split - check if the group balance is zero else added the diff to owner 
     let bal=0
-    for(val of Object.entries(group.split[0]))
+    for(let val of Object.entries(group.split[0]))
     {
         bal += val[1]
     }
@@ -334,7 +334,7 @@ exports.clearSplit = async (groupId, expenseAmount, expenseOwner, expenseMembers
     })
     group.groupTotal -= expenseAmount
     group.split[0][expenseOwner] -= expenseAmount
-    expensePerPerson = expenseAmount / expenseMembers.length
+    let expensePerPerson = expenseAmount / expenseMembers.length
     expensePerPerson = Math.round((expensePerPerson  + Number.EPSILON) * 100) / 100;
     //Updating the split values per user 
     for (var user of expenseMembers) {
@@ -343,7 +343,7 @@ exports.clearSplit = async (groupId, expenseAmount, expenseOwner, expenseMembers
 
     //Nullifying split - check if the group balance is zero else added the diff to owner 
     let bal=0
-    for(val of Object.entries(group.split[0]))
+    for(let val of Object.entries(group.split[0]))
     {
         bal += val[1]
     }