diff --git a/app.json b/app.json
index ac82f6b..9ad190e 100644
--- a/app.json
+++ b/app.json
@@ -16,7 +16,7 @@
       "supportsTablet": true,
       "bundleIdentifier": "com.cally.app",
       "googleServicesFile": "./ios/GoogleService-Info.plist",
-      "buildNumber": "34",
+      "buildNumber": "40",
       "usesAppleSignIn": true
     },
     "android": {
diff --git a/components/pages/calendar/EventCalendar.tsx b/components/pages/calendar/EventCalendar.tsx
index de596a2..d55c774 100644
--- a/components/pages/calendar/EventCalendar.tsx
+++ b/components/pages/calendar/EventCalendar.tsx
@@ -48,7 +48,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(({calendar
     }, [events, mode]);
 
     const handlePressEvent = useCallback((event: CalendarEvent) => {
-        if (mode === "day") {
+        if (mode === "day" || mode === "week") {
             setEditVisible(true);
             console.log({event})
             setEventForEdit(event);
@@ -60,7 +60,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(({calendar
 
     const handlePressCell = useCallback(
         (date: Date) => {
-            if (mode === "day") {
+            if (mode === "day" || mode === "week") {
                 setSelectedNewEndDate(date);
             } else {
                 setMode("day")
diff --git a/components/pages/settings/SettingsPage.tsx b/components/pages/settings/SettingsPage.tsx
index 09415b8..b90efe8 100644
--- a/components/pages/settings/SettingsPage.tsx
+++ b/components/pages/settings/SettingsPage.tsx
@@ -9,6 +9,7 @@ import ProfileIcon from "@/assets/svgs/ProfileIcon";
 import CalendarIcon from "@/assets/svgs/CalendarIcon";
 import PrivacyPolicyIcon from "@/assets/svgs/PrivacyPolicyIcon";
 import ArrowRightIcon from "@/assets/svgs/ArrowRightIcon";
+import {ProfileType, useAuthContext} from "@/contexts/AuthContext";
 
 const pageIndex = {
     main: 0,
@@ -19,18 +20,22 @@ const pageIndex = {
 };
 
 const SettingsPage = () => {
+    const {profileData} = useAuthContext()
+    const isntParent = profileData?.userType !== ProfileType.PARENT
+
     const [selectedPage, setSelectedPage] = useState<number>(0);
     return (
         <View flexG>
             {selectedPage == 0 && (
                 <View flexG centerH marginH-30 marginT-30>
                     <Button
+                        disabled={isntParent}
                         backgroundColor="white"
                         style={styles.mainBtn}
                         children={
                             <View row centerV width={"100%"}>
                                 <ProfileIcon style={{marginRight: 10}} color="#07b9c8"/>
-                                <Text style={styles.label} color="#07b8c7">
+                                <Text style={[styles.label, isntParent && styles.disabledText]}>
                                     Manage My Profile
                                 </Text>
                                 <ArrowRightIcon style={{marginLeft: "auto"}}/>
@@ -39,12 +44,13 @@ const SettingsPage = () => {
                         onPress={() => setSelectedPage(pageIndex.user)}
                     />
                     <Button
+                        disabled={isntParent}
                         backgroundColor="white"
                         style={styles.mainBtn}
                         children={
                             <View row centerV width={"100%"}>
                                 <CalendarIcon style={{marginRight: 10}}/>
-                                <Text style={styles.label} color="#fd1775">
+                                <Text style={[styles.label, isntParent && styles.disabledText]}>
                                     Calendar Settings
                                 </Text>
                                 <ArrowRightIcon style={{marginLeft: "auto"}}/>
@@ -55,6 +61,7 @@ const SettingsPage = () => {
                         }}
                     />
                     <Button
+                        disabled={isntParent}
                         backgroundColor="white"
                         style={styles.mainBtn}
                         children={
@@ -65,7 +72,7 @@ const SettingsPage = () => {
                                     color="#ff9900"
                                     style={{marginRight: 10}}
                                 />
-                                <Text style={styles.label} color="#ff9900">
+                                <Text style={[styles.label, isntParent && styles.disabledText]}>
                                     To-Do Reward Settings
                                 </Text>
                                 <ArrowRightIcon style={{marginLeft: "auto"}}/>
@@ -79,7 +86,7 @@ const SettingsPage = () => {
                         children={
                             <View row centerV width={"100%"}>
                                 <PrivacyPolicyIcon style={{marginRight: 10}}/>
-                                <Text style={styles.label} color="#6c645b">
+                                <Text style={styles.label}>
                                     Cally Privacy Policy
                                 </Text>
                                 <ArrowRightIcon style={{marginLeft: "auto"}}/>
@@ -115,4 +122,7 @@ const styles = StyleSheet.create({
         fontSize: 14.71,
         textAlignVertical: "center",
     },
-});
+    disabledText: {
+        color: '#A9A9A9', // Example of a gray color for disabled text
+    },
+});
\ No newline at end of file
diff --git a/components/pages/settings/user_settings_views/MyGroup.tsx b/components/pages/settings/user_settings_views/MyGroup.tsx
index 0b69514..e138682 100644
--- a/components/pages/settings/user_settings_views/MyGroup.tsx
+++ b/components/pages/settings/user_settings_views/MyGroup.tsx
@@ -43,7 +43,7 @@ const MyGroup = () => {
     const lNameRef = useRef<TextFieldRef>(null);
     const emailRef = useRef<TextFieldRef>(null);
 
-    const [showQRCodeDialog, setShowQRCodeDialog] = useState("");
+    const [showQRCodeDialog, setShowQRCodeDialog] = useState<string | boolean>(false);
 
     const {mutateAsync: createSubUser, isLoading, isError} = useCreateSubUser();
     const {data: familyMembers} = useGetFamilyMembers(true);
@@ -149,7 +149,7 @@ const MyGroup = () => {
                                     <View flex-1/>
 
                                     <UserMenu
-                                        setShowQRCodeDialog={(val) => setShowQRCodeDialog("")}
+                                        setShowQRCodeDialog={(val) => setShowQRCodeDialog(val)}
                                         showQRCodeDialog={showQRCodeDialog === member?.uid}
                                         userId={member?.uid!}
                                     />
@@ -187,8 +187,10 @@ const MyGroup = () => {
                                         </Text>
                                     </View>
 
+                                    <View flex-1/>
+
                                     <UserMenu
-                                        setShowQRCodeDialog={(val) => setShowQRCodeDialog("")}
+                                        setShowQRCodeDialog={(val) => setShowQRCodeDialog(val)}
                                         showQRCodeDialog={showQRCodeDialog === member?.uid}
                                         userId={member?.uid!}
                                     />
@@ -224,8 +226,10 @@ const MyGroup = () => {
                                         </Text>
                                     </View>
 
+                                    <View flex-1/>
+
                                     <UserMenu
-                                        setShowQRCodeDialog={(val) => setShowQRCodeDialog("")}
+                                        setShowQRCodeDialog={(val) => setShowQRCodeDialog(val)}
                                         showQRCodeDialog={showQRCodeDialog === member?.uid}
                                         userId={member?.uid!}
                                     />
@@ -242,7 +246,7 @@ const MyGroup = () => {
                 visible
                 button={{
                     label: "+ Add a user device",
-                    onPress: () => setShowAddUserDialog(true),
+                    onPress: () => setShowNewUserInfoDialog(true),
                     style: styles.bottomButton,
                 }}
             />
diff --git a/components/pages/settings/user_settings_views/UserMenu.tsx b/components/pages/settings/user_settings_views/UserMenu.tsx
index 74f4bfc..2e001e6 100644
--- a/components/pages/settings/user_settings_views/UserMenu.tsx
+++ b/components/pages/settings/user_settings_views/UserMenu.tsx
@@ -1,7 +1,8 @@
-import React, {useState} from 'react';
-import {Button, Card, Colors, Dialog, Hint, ListItem, Text, View} from 'react-native-ui-lib';
+import React from 'react';
+import {Button, Card, Dialog, Text, TouchableOpacity} from 'react-native-ui-lib';
 import QRCode from 'react-native-qrcode-svg';
 import {PanningDirectionsEnum} from "react-native-ui-lib/src/components/panningViews/panningProvider";
+import Ionicons from "@expo/vector-icons/Ionicons";
 
 const UserMenu = ({
                       userId,
@@ -10,40 +11,20 @@ const UserMenu = ({
                   }: {
     userId: string,
     showQRCodeDialog: boolean,
-    setShowQRCodeDialog: (value: boolean) => void
+    setShowQRCodeDialog: (value: string | boolean) => void
 }) => {
-    const [showHint, setShowHint] = useState(false);
-
     const handleShowQRCode = () => {
-        setShowHint(false);
-        setTimeout(() => {
-            setShowQRCodeDialog(true);
-        }, 500);
+        setShowQRCodeDialog(userId);
     };
 
+
     return (
         <>
-            <Hint
-                onBackgroundPress={() => setShowHint(false)}
-                onPress={() => setShowHint(true)}
-                color={Colors.white}
-                customContent={
-                    <View height={18}>
-                        <ListItem onPress={handleShowQRCode}>
-                            <Text style={{fontFamily: "Manrope_500Medium"}}>Show Login QR Code</Text>
-                        </ListItem>
-                    </View>
-                }
-                enableShadow
-                visible={showHint}
-                backdropColor="transparent"
+            <TouchableOpacity
+                onPress={handleShowQRCode}
             >
-                <View>
-                    <Button link onPress={() => setShowHint(!showHint)}>
-                        <Text>...</Text>
-                    </Button>
-                </View>
-            </Hint>
+                <Ionicons name="qr-code-outline" size={24} color="black"/>
+            </TouchableOpacity>
 
             <Dialog
                 visible={showQRCodeDialog}
diff --git a/components/pages/todos/ToDoItem.tsx b/components/pages/todos/ToDoItem.tsx
index a72dc05..d2ec555 100644
--- a/components/pages/todos/ToDoItem.tsx
+++ b/components/pages/todos/ToDoItem.tsx
@@ -1,11 +1,11 @@
 import {
-  View,
-  Text,
-  Checkbox,
-  TouchableOpacity,
-  Dialog,
-  Button,
-  ButtonSize,
+    View,
+    Text,
+    Checkbox,
+    TouchableOpacity,
+    Dialog,
+    Button,
+    ButtonSize
 } from "react-native-ui-lib";
 import React, { useState } from "react";
 import { useToDosContext } from "@/contexts/ToDosContext";
@@ -14,9 +14,11 @@ import PointsSlider from "@/components/shared/PointsSlider";
 import { IToDo } from "@/hooks/firebase/types/todoData";
 import { ImageBackground } from "react-native";
 import AddChoreDialog from "@/components/pages/todos/AddChoreDialog";
+import { useGetFamilyMembers } from "@/hooks/firebase/useGetFamilyMembers";
 
 const ToDoItem = (props: { item: IToDo; isSettings?: boolean }) => {
   const { updateToDo } = useToDosContext();
+  const {data: members} = useGetFamilyMembers();
   const [visible, setVisible] = useState<boolean>(false);
   const [points, setPoints] = useState(props.item.points);
   const [pointsModalVisible, setPointsModalVisible] = useState<boolean>(false);
@@ -30,6 +32,12 @@ const ToDoItem = (props: { item: IToDo; isSettings?: boolean }) => {
       setPoints(0);
     }
   };
+
+    const getInitials = (firstName: string, lastName: string) => {
+        return `${firstName.charAt(0)}${lastName.charAt(0)}`;
+    };
+
+    const selectedMembers = members?.filter((x) => props?.item?.assignees?.includes(x?.uid!));
   return (
     <View
       centerV
@@ -96,15 +104,44 @@ const ToDoItem = (props: { item: IToDo; isSettings?: boolean }) => {
         ) : (
           <View />
         )}
-        <ImageBackground
-          source={require("../../../assets/images/child-picture.png")}
-          style={{
-            height: 24.64,
-            aspectRatio: 1,
-            borderRadius: 22,
-            overflow: "hidden",
-          }}
-        />
+          <View row style={{ gap: 3 }}>
+              {selectedMembers?.map((member) => {
+                  return member?.pfp ? (
+                      <ImageBackground
+                              source={require("../../../assets/images/child-picture.png")}
+                              style={{
+                                  height: 24.64,
+                                  aspectRatio: 1,
+                                  borderRadius: 22,
+                                  overflow: "hidden",
+                              }}
+                          />
+                      ) : (
+                          <View style={{
+                              position: 'relative',
+                              width: 24.64,
+                              aspectRatio: 1
+                          }}>
+                              <View style={{
+                                  backgroundColor: '#ccc',
+                                  justifyContent: 'center',
+                                  alignItems: 'center',
+                                  borderRadius: 100, // Circular shape
+                                  width: '100%',
+                                  height: '100%'
+                              }}>
+                                  <Text style={{
+                                      color: '#fff',
+                                      fontSize: 12,
+                                      fontWeight: 'bold'
+                                  }}>
+                                      {getInitials(member.firstName, member.lastName ?? "")}
+                                  </Text>
+                              </View>
+                          </View>
+                      )}
+              )}
+          </View>
       </View>
       <Dialog
         visible={pointsModalVisible}
diff --git a/components/shared/HeaderTemplate.tsx b/components/shared/HeaderTemplate.tsx
index ff37cc7..a58e811 100644
--- a/components/shared/HeaderTemplate.tsx
+++ b/components/shared/HeaderTemplate.tsx
@@ -1,41 +1,43 @@
-import { View, Text } from "react-native-ui-lib";
+import {Image, Text, View} from "react-native-ui-lib";
 import React from "react";
-import { useAuthContext } from "@/contexts/AuthContext";
-import { ImageBackground } from "react-native";
+import {useAuthContext} from "@/contexts/AuthContext";
 
 const HeaderTemplate = (props: {
-  message: string;
-  isWelcome: boolean;
-  children?: React.ReactNode;
-  link?: React.ReactNode;
+    message: string;
+    isWelcome: boolean;
+    children?: React.ReactNode;
+    link?: React.ReactNode;
 }) => {
-  const { user, profileData } = useAuthContext();
+    const {user, profileData} = useAuthContext();
 
-  const headerHeight:number = 72;
-  return (
-    <View row centerV marginV-15>
-      <ImageBackground
-      source={require("../../assets/images/profile-picture.png")}
-        style={{
-          height: headerHeight,
-          aspectRatio: 1,
-          borderRadius: 22,
-          overflow: "hidden",
-          marginRight: 20,
-        }}
-      />
-      <View gap-3>
-        {props.isWelcome && (
-          <Text text70L style={{fontSize: 19, fontFamily: "Manrope_400Regular"}}>Welcome, {profileData?.firstName}!</Text>
-        )}
-        <Text text70B style={{ fontSize: 18 , fontFamily: "Manrope_600SemiBold" }}>
-          {props.message}
-        </Text>
-        {props.children && <View>{props.children}</View>}
-        {props.link && <View marginT-8>{props.link}</View>}
-      </View>
-    </View>
-  );
+    const headerHeight: number = 72;
+    return (
+        <View row centerV marginV-15>
+            <Image
+                source={{uri: profileData?.pfp}}
+                style={{
+                    height: headerHeight,
+                    aspectRatio: 1,
+                    borderRadius: 22,
+                    overflow: "hidden",
+                    marginRight: 20,
+                }}
+            />
+            <View gap-3>
+                {props.isWelcome && (
+                    <Text text70L style={{
+                        fontSize: 19,
+                        fontFamily: "Manrope_400Regular"
+                    }}>Welcome, {profileData?.firstName}!</Text>
+                )}
+                <Text text70B style={{fontSize: 18, fontFamily: "Manrope_600SemiBold"}}>
+                    {props.message}
+                </Text>
+                {props.children && <View>{props.children}</View>}
+                {props.link && <View marginT-8>{props.link}</View>}
+            </View>
+        </View>
+    );
 };
 
 export default HeaderTemplate;
diff --git a/hooks/firebase/useGetTodos.ts b/hooks/firebase/useGetTodos.ts
index b58834d..b1d6b77 100644
--- a/hooks/firebase/useGetTodos.ts
+++ b/hooks/firebase/useGetTodos.ts
@@ -6,6 +6,7 @@ import {IToDo} from "@/hooks/firebase/types/todoData";
 
 export const useGetTodos = () => {
     const { user, profileData } = useAuthContext();
+    //TODO: Add role based filtering for todos
 
     return useQuery({
         queryKey: ["todos", user?.uid],
diff --git a/ios/cally/Info.plist b/ios/cally/Info.plist
index 6bccf46..468c1d5 100644
--- a/ios/cally/Info.plist
+++ b/ios/cally/Info.plist
@@ -47,7 +47,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>34</string>
+    <string>40</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>NSAppTransportSecurity</key>
@@ -114,6 +114,10 @@
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
       <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
+      <string>$(PRODUCT_BUNDLE_IDENTIFIER).expo.index_route</string>
     </array>
     <key>UILaunchStoryboardName</key>
     <string>SplashScreen</string>
diff --git a/package-lock.json b/package-lock.json
index 4c5988a..150ac14 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,6 +19,7 @@
         "@react-native-firebase/crashlytics": "^20.3.0",
         "@react-native-firebase/firestore": "^20.4.0",
         "@react-native-firebase/functions": "^20.4.0",
+        "@react-native-firebase/storage": "^21.0.0",
         "@react-navigation/drawer": "^6.7.2",
         "@react-navigation/native": "^6.0.2",
         "date-fns": "^3.6.0",
@@ -4896,6 +4897,15 @@
         "@react-native-firebase/app": "20.4.0"
       }
     },
+    "node_modules/@react-native-firebase/storage": {
+      "version": "21.0.0",
+      "resolved": "https://registry.npmjs.org/@react-native-firebase/storage/-/storage-21.0.0.tgz",
+      "integrity": "sha512-meft5Pu0nI7zxhpnP49ko9Uw8GaIy9hXGJfa/fCFrpf2vA9OXdTr3CvgloH/b9DpbkwQGcGTshRqltuttXI67w==",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "@react-native-firebase/app": "21.0.0"
+      }
+    },
     "node_modules/@react-native/assets-registry": {
       "version": "0.74.85",
       "resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.74.85.tgz",
diff --git a/yarn.lock b/yarn.lock
index 2175258..f22d5d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2427,7 +2427,7 @@
 
 "@react-native-firebase/storage@^21.0.0":
   version "21.0.0"
-  resolved "https://registry.yarnpkg.com/@react-native-firebase/storage/-/storage-21.0.0.tgz#0905fd67c74629d947f176bfb988d7cc4d85e244"
+  resolved "https://registry.npmjs.org/@react-native-firebase/storage/-/storage-21.0.0.tgz"
   integrity sha512-meft5Pu0nI7zxhpnP49ko9Uw8GaIy9hXGJfa/fCFrpf2vA9OXdTr3CvgloH/b9DpbkwQGcGTshRqltuttXI67w==
 
 "@react-native/assets-registry@0.74.85":
@@ -8896,7 +8896,7 @@ react-native-linear-gradient@^2.8.3:
 
 react-native-onboarding-swiper@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/react-native-onboarding-swiper/-/react-native-onboarding-swiper-1.3.0.tgz#a97f945f03a036845242b3e1f319c6fdb262bc2b"
+  resolved "https://registry.npmjs.org/react-native-onboarding-swiper/-/react-native-onboarding-swiper-1.3.0.tgz"
   integrity sha512-2ZPMrZrJFgR5dmVWIj60x/vTBWrm0BZPuc2w7Cz2Sq/8ChypCi3oL8F7GYMrzky1fmknCS6Z0WPphfZVpnLUnQ==
   dependencies:
     tinycolor2 "^1.4.1"