diff --git a/src/api/firebaseUtils.ts b/src/api/firebaseUtils.ts
index 18648bcf..21942aff 100644
--- a/src/api/firebaseUtils.ts
+++ b/src/api/firebaseUtils.ts
@@ -528,6 +528,29 @@ export const getUpcomingEvents = async () => {
     return events;
 };
 
+export const getWeekPastEvents = async (): Promise<SHPEEvent[]> => {
+    const currentTime = new Date();
+    const twoWeeksAgo = new Date(currentTime);
+    twoWeeksAgo.setDate(currentTime.getDate() - 8);
+
+    const eventsRef = collection(db, "events");
+    const q = query(
+        eventsRef,
+        where("endTime", "<", currentTime),
+        where("endTime", ">", twoWeeksAgo),
+        orderBy("endTime", "desc")
+    );
+
+    const querySnapshot = await getDocs(q);
+    const events: SHPEEvent[] = [];
+
+    querySnapshot.forEach(doc => {
+        events.push({ id: doc.id, ...doc.data() } as SHPEEvent);
+    });
+
+    return events;
+};
+
 export const getPastEvents = async (numLimit: number, startAfterDoc: any, setEndOfData?: (endOfData: boolean) => void) => {
     const currentTime = new Date();
     const eventsRef = collection(db, "events");
diff --git a/src/components/MOTMCard.tsx b/src/components/MOTMCard.tsx
index c9735e15..24314dcc 100644
--- a/src/components/MOTMCard.tsx
+++ b/src/components/MOTMCard.tsx
@@ -68,6 +68,9 @@ const MOTMCard: React.FC<MemberCardProp> = ({ navigation }) => {
         }, [currentUser])
     );
 
+    if (!MOTM) {
+        return null;
+    }
 
     return (
         <View className="mx-4">
diff --git a/src/screens/committees/CommitteeInfo.tsx b/src/screens/committees/CommitteeInfo.tsx
index 6f3cec89..136b4d46 100644
--- a/src/screens/committees/CommitteeInfo.tsx
+++ b/src/screens/committees/CommitteeInfo.tsx
@@ -348,12 +348,6 @@ const CommitteeInfo: React.FC<CommitteeInfoScreenRouteProps> = ({ route, navigat
                     <View className='mt-10'>
                         <View className='flex-row justify-between items-center mb-4'>
                             <Text className={`text-2xl font-bold ${darkMode ? "text-white" : "text-black"}`}>Upcoming Events</Text>
-                            <TouchableOpacity
-                                className='px-4'
-                                onPress={() => navigation.getParent()?.navigate('EventsTab', { screen: 'EventsScreen', params: { filter: EventType.COMMITTEE_MEETING, committee: firebaseDocName } })}
-                            >
-                                <Text className='text-lg text-primary-blue font-semibold'>View all</Text>
-                            </TouchableOpacity>
                         </View>
 
                         <View
diff --git a/src/screens/events/Events.tsx b/src/screens/events/Events.tsx
index bdc5cca3..9694286e 100644
--- a/src/screens/events/Events.tsx
+++ b/src/screens/events/Events.tsx
@@ -1,14 +1,12 @@
 import { View, Text, TouchableOpacity, ActivityIndicator, ScrollView, Image, useColorScheme } from 'react-native'
-import React, { useCallback, useContext, useEffect, useRef, useState } from 'react'
+import React, { useCallback, useContext, useEffect, useState } from 'react'
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { NativeStackNavigationProp } from '@react-navigation/native-stack';
-import AsyncStorage from '@react-native-async-storage/async-storage';
 import { RouteProp, useFocusEffect, useRoute } from '@react-navigation/core';
 import { Octicons, FontAwesome6 } from '@expo/vector-icons';
 import { LinearGradient } from 'expo-linear-gradient';
 import { StatusBar } from 'expo-status-bar';
-import { auth } from '../../config/firebaseConfig';
-import { getUpcomingEvents, getPastEvents, getCommittees, fetchAndStoreUser } from '../../api/firebaseUtils';
+import { getUpcomingEvents, fetchAndStoreUser, getWeekPastEvents } from '../../api/firebaseUtils';
 import { UserContext } from '../../context/UserContext';
 import { Images } from '../../../assets';
 import { formatTime } from '../../helpers/timeUtils';
@@ -16,43 +14,46 @@ import { truncateStringWithEllipsis } from '../../helpers/stringUtils';
 import { EventsStackParams } from '../../types/navigation';
 import { EventType, ExtendedEventType, SHPEEvent } from '../../types/events';
 import EventCard from './EventCard';
-import { Committee } from '../../types/committees';
 import DismissibleModal from '../../components/DismissibleModal';
 
+interface EventGroups {
+    today: SHPEEvent[];
+    upcoming: SHPEEvent[];
+    past: SHPEEvent[];
+}
+
+
 const Events = ({ navigation }: EventsProps) => {
     const route = useRoute<EventsScreenRouteProp>();
     const userContext = useContext(UserContext);
     const { userInfo, setUserInfo } = userContext!;
 
-
     const fixDarkMode = userInfo?.private?.privateInfo?.settings?.darkMode;
     const useSystemDefault = userInfo?.private?.privateInfo?.settings?.useSystemDefault;
     const colorScheme = useColorScheme();
     const darkMode = useSystemDefault ? colorScheme === 'dark' : fixDarkMode;
 
-    const filterScrollViewRef = useRef<ScrollView>(null);
-    const committeeScrollViewRef = useRef<ScrollView>(null);
-
     const [isLoading, setIsLoading] = useState(true);
-    const [todayEvents, setTodayEvents] = useState<SHPEEvent[]>([]);
-    const [upcomingEvents, setUpcomingEvents] = useState<SHPEEvent[]>([]);
-    const [pastEvents, setPastEvents] = useState<SHPEEvent[]>([]);
-    const [selectedFilter, setSelectedFilter] = useState<ExtendedEventType | null>(route.params?.filter || null);
-    const [committees, setCommittees] = useState<Committee[]>([]);
-    const [selectedCommittee, setSelectedCommittee] = useState<string | null>(route.params?.committee || null);
+    const [mainEvents, setMainEvents] = useState<EventGroups>({ today: [], upcoming: [], past: [] });
+    const [intramuralEvents, setIntramuralEvents] = useState<EventGroups>({ today: [], upcoming: [], past: [] });
+    const [committeeEvents, setCommitteeEvents] = useState<EventGroups>({ today: [], upcoming: [], past: [] });
     const [infoVisible, setInfoVisible] = useState(false);
+    const [filter, setFilter] = useState<"main" | "intramural" | "committee">("main");
 
     const hasPrivileges = (userInfo?.publicInfo?.roles?.admin?.valueOf() || userInfo?.publicInfo?.roles?.officer?.valueOf() || userInfo?.publicInfo?.roles?.developer?.valueOf() || userInfo?.publicInfo?.roles?.lead?.valueOf() || userInfo?.publicInfo?.roles?.representative?.valueOf());
 
+    const selectedEvents = filter === "main" ? mainEvents : filter === "intramural" ? intramuralEvents : committeeEvents;
+
     const fetchEvents = async () => {
         try {
             setIsLoading(true);
 
             const upcomingEventsData = await getUpcomingEvents();
-            const pastEventsData = await getPastEvents(3, null);
+            const allPastEvents = await getWeekPastEvents();
 
             const currentTime = new Date();
             const today = new Date(currentTime.getFullYear(), currentTime.getMonth(), currentTime.getDate());
+
             const todayEvents = upcomingEventsData.filter(event => {
                 const startTime = event.startTime ? event.startTime.toDate() : new Date(0);
                 return startTime >= today && startTime < new Date(today.getTime() + 24 * 60 * 60 * 1000);
@@ -62,9 +63,63 @@ const Events = ({ navigation }: EventsProps) => {
                 return startTime >= new Date(today.getTime() + 24 * 60 * 60 * 1000);
             });
 
-            setTodayEvents(todayEvents);
-            setUpcomingEvents(upcomingEvents);
-            setPastEvents(pastEventsData.events);
+            const mainEventsFiltered = upcomingEventsData.filter(
+                (event: SHPEEvent) =>
+                    (hasPrivileges || !event.hiddenEvent) &&
+                    event.eventType !== EventType.COMMITTEE_MEETING &&
+                    event.eventType !== EventType.INTRAMURAL_EVENT
+            );
+
+            const intramuralEventsFiltered = upcomingEventsData.filter(
+                (event: SHPEEvent) =>
+                    (hasPrivileges || !event.hiddenEvent) &&
+                    event.eventType === EventType.INTRAMURAL_EVENT
+            );
+
+            const committeeEventsFiltered = upcomingEventsData.filter(
+                (event: SHPEEvent) =>
+                    (hasPrivileges || !event.hiddenEvent) &&
+                    event.eventType === EventType.COMMITTEE_MEETING
+            );
+
+            const pastMainEvents = allPastEvents.filter(
+                (event: SHPEEvent) =>
+                    (hasPrivileges || !event.hiddenEvent) &&
+                    event.eventType !== EventType.COMMITTEE_MEETING &&
+                    event.eventType !== EventType.INTRAMURAL_EVENT
+            );
+
+            const pastIntramuralEvents = allPastEvents.filter(
+                (event: SHPEEvent) =>
+                    (hasPrivileges || !event.hiddenEvent) &&
+                    event.eventType === EventType.INTRAMURAL_EVENT
+            );
+
+            const pastCommitteeEvents = allPastEvents.filter(
+                (event: SHPEEvent) =>
+                    (hasPrivileges || !event.hiddenEvent) &&
+                    event.eventType === EventType.COMMITTEE_MEETING
+            );
+
+
+
+            setMainEvents({
+                today: todayEvents.filter(event => mainEventsFiltered.includes(event)),
+                upcoming: upcomingEvents.filter(event => mainEventsFiltered.includes(event)),
+                past: pastMainEvents,
+            });
+
+            setIntramuralEvents({
+                today: todayEvents.filter(event => intramuralEventsFiltered.includes(event)),
+                upcoming: upcomingEvents.filter(event => intramuralEventsFiltered.includes(event)),
+                past: pastIntramuralEvents,
+            });
+
+            setCommitteeEvents({
+                today: todayEvents.filter(event => committeeEventsFiltered.includes(event)),
+                upcoming: upcomingEvents.filter(event => committeeEventsFiltered.includes(event)),
+                past: pastCommitteeEvents,
+            });
 
             setIsLoading(false);
         } catch (error) {
@@ -73,11 +128,6 @@ const Events = ({ navigation }: EventsProps) => {
         }
     };
 
-    const fetchCommittees = async () => {
-        const committeeData = await getCommittees();
-        setCommittees(committeeData);
-    };
-
 
     useEffect(() => {
         const fetchUserData = async () => {
@@ -89,30 +139,8 @@ const Events = ({ navigation }: EventsProps) => {
 
         fetchEvents();
         fetchUserData();
-        fetchCommittees();
     }, [])
 
-    useEffect(() => {
-        if (route.params?.filter !== undefined) {
-            setSelectedFilter(route.params.filter);
-
-            const filterIndex = ["myEvents", "clubWide", ...Object.values(EventType)].indexOf(route.params.filter);
-            if (filterIndex !== -1 && filterScrollViewRef.current) {
-                const scrollPosition = filterIndex * 115;
-                filterScrollViewRef.current.scrollTo({ x: scrollPosition, animated: true });
-            }
-        }
-
-        if (route.params?.committee !== undefined) {
-            setSelectedCommittee(route.params.committee);
-
-            const committeeIndex = committees.findIndex(committee => committee.firebaseDocName === route.params.committee);
-            if (committeeIndex !== -1 && committeeScrollViewRef.current) {
-                const scrollPosition = committeeIndex * 100;
-                committeeScrollViewRef.current.scrollTo({ x: scrollPosition, animated: true });
-            }
-        }
-    }, [route.params, committees]);
 
     useFocusEffect(
         useCallback(() => {
@@ -122,75 +150,6 @@ const Events = ({ navigation }: EventsProps) => {
         }, [hasPrivileges])
     );
 
-    const handleFilterSelect = (filter?: ExtendedEventType, committee?: string) => {
-        // Deselect committee when the same committee is selected
-        if (committee) {
-            if (selectedCommittee === committee) {
-                setSelectedCommittee(null);
-                if (!selectedFilter) {
-                    setSelectedFilter(null);
-                }
-            } else {
-                setSelectedCommittee(committee);
-                if (selectedFilter !== EventType.COMMITTEE_MEETING) {
-                    setSelectedFilter(EventType.COMMITTEE_MEETING);
-                }
-            }
-            return;
-        }
-
-        // Deselect "Committee Meetings" when no committee is selected
-        if (filter === EventType.COMMITTEE_MEETING && selectedFilter === EventType.COMMITTEE_MEETING) {
-            setSelectedFilter(null);
-            setSelectedCommittee(null);
-            return;
-        }
-
-        // Handle other filters
-        if (selectedFilter === filter) {
-            setSelectedFilter(null);
-            setSelectedCommittee(null);
-        } else {
-            setSelectedFilter(filter!);
-            setSelectedCommittee(null);
-        }
-    };
-
-    const filteredEvents = (events: SHPEEvent[]): SHPEEvent[] => {
-        // If no filter is selected, filter out hidden events and committee meetings
-        if (!selectedFilter) {
-            return events.filter(event =>
-                (event.eventType !== EventType.COMMITTEE_MEETING || event.general) &&
-                !event.hiddenEvent
-            );
-        }
-
-        if (selectedFilter === 'myEvents') {
-            return events.filter(event =>
-                (userInfo?.publicInfo?.committees?.includes(event.committee || '') ||
-                    userInfo?.publicInfo?.interests?.includes(event.eventType || '')) &&
-                !event.hiddenEvent
-            );
-        }
-
-        if (selectedFilter === 'clubWide') {
-            return events.filter(event => event.general && !event.hiddenEvent);
-        }
-        // Show hidden events for "Custom Event" filter
-        if (selectedFilter === 'Custom Event') {
-            return events.filter(event => event.eventType === selectedFilter);
-        }
-
-        if (selectedFilter === EventType.COMMITTEE_MEETING) {
-            return events.filter(event =>
-                event.eventType === EventType.COMMITTEE_MEETING &&
-                (selectedCommittee ? event.committee === selectedCommittee : true) &&
-                !event.hiddenEvent
-            );
-        }
-
-        return events.filter(event => event.eventType === selectedFilter && !event.hiddenEvent);
-    };
 
     return (
         <SafeAreaView edges={["top"]} className={`h-full ${darkMode ? "bg-primary-bg-dark" : "bg-primary-bg-light"}`}>
@@ -205,99 +164,57 @@ const Events = ({ navigation }: EventsProps) => {
                 </View>
 
                 {/* Filters */}
-                <ScrollView
-                    className='pt-3 pb-2'
-                    showsHorizontalScrollIndicator={false}
-                    horizontal={true}
-                    ref={filterScrollViewRef}
+                <View
+                    className={`flex-row mt-5 mx-4 rounded-3xl ${darkMode ? "bg-secondary-bg-dark" : "bg-secondary-bg-light"}`}
+                    style={{
+                        shadowColor: "#000",
+                        shadowOffset: {
+                            width: 0,
+                            height: 2,
+                        },
+                        shadowOpacity: 0.25,
+                        shadowRadius: 3.84,
+                        elevation: 5,
+                    }}
                 >
-                    <View className='flex-row px-4 space-x-3'>
-                        <TouchableOpacity
-                            className={`flex-row items-center justify-center rounded-md py-2 px-4 ${darkMode ? "bg-secondary-bg-dark" : "bg-secondary-bg-light"} ${selectedFilter === "myEvents" && 'bg-primary-blue border-primary-blue'}`}
-                            style={{
-                                shadowColor: "#000",
-                                shadowOffset: {
-                                    width: 0,
-                                    height: 2,
-                                },
-                                shadowOpacity: 0.25,
-                                shadowRadius: 3.84,
-
-                                elevation: 5,
-                            }}
-                            onPress={() => handleFilterSelect("myEvents")}
+                    <TouchableOpacity
+                        className={`items-center justify-center flex-1 rounded-3xl m-1 py-2 ${filter == "main" && "bg-primary-blue"}`}
+                        onPress={() => {
+                            setFilter("main")
+                        }}
+                    >
+                        <Text
+                            className={`text-xl font-bold ${darkMode ? "text-white" : filter === "main" ? "text-white" : "text-black"}`}
                         >
-                            <Text className={`font-bold ${selectedFilter === "myEvents" ? 'text-white' : `${darkMode ? "text-white" : "text-black"}`}`}>My Events</Text>
-                        </TouchableOpacity>
-
-                        <TouchableOpacity
-                            className={`flex-row items-center justify-center rounded-md py-2 px-4 ${darkMode ? "bg-secondary-bg-dark" : "bg-secondary-bg-light"} ${selectedFilter === "clubWide" && 'bg-primary-blue border-primary-blue'}`}
-                            style={{
-                                shadowColor: "#000",
-                                shadowOffset: {
-                                    width: 0,
-                                    height: 2,
-                                },
-                                shadowOpacity: 0.25,
-                                shadowRadius: 3.84,
-
-                                elevation: 5,
-                            }}
-                            onPress={() => handleFilterSelect("clubWide")}
+                            Main
+                        </Text>
+                    </TouchableOpacity>
+
+                    <TouchableOpacity
+                        className={`items-center justify-center flex-1 rounded-3xl m-1 py-2 ${filter == "intramural" && "bg-primary-blue"}`}
+                        onPress={() => {
+                            setFilter("intramural")
+                        }}
+                    >
+                        <Text
+                            className={`text-xl font-bold ${darkMode ? "text-white" : filter === "intramural" ? "text-white" : "text-black"}`}
                         >
-                            <Text className={`font-bold ${selectedFilter === "clubWide" ? 'text-white' : `${darkMode ? "text-white" : "text-black"}`}`}>Club Wide</Text>
-                        </TouchableOpacity>
-
-                        {Object.values(EventType).map((type) => (
-                            <TouchableOpacity
-                                key={type}
-                                className={`flex-row items-center justify-center rounded-md py-2 px-4 ${darkMode ? "bg-secondary-bg-dark" : "bg-secondary-bg-light"} ${selectedFilter === type && 'bg-primary-blue border-primary-blue'}`}
-                                style={{
-                                    shadowColor: "#000",
-                                    shadowOffset: {
-                                        width: 0,
-                                        height: 2,
-                                    },
-                                    shadowOpacity: 0.25,
-                                    shadowRadius: 3.84,
-
-                                    elevation: 5,
-                                }}
-                                onPress={() => handleFilterSelect(type)}
-                            >
-                                <Text className={`font-bold ${selectedFilter === type ? 'text-white' : `${darkMode ? "text-white" : "text-black"}`}`}>{type}</Text>
-                            </TouchableOpacity>
-                        ))}
-                    </View>
-                </ScrollView>
-
-                {/* Additional Committee Filter */}
-                {selectedFilter === EventType.COMMITTEE_MEETING && (
-                    <ScrollView horizontal={true} className='pt-3 pb-2' showsHorizontalScrollIndicator={false} ref={committeeScrollViewRef}>
-                        <View className='flex-row px-4 space-x-3'>
-                            {committees.map(committee => (
-                                <TouchableOpacity
-                                    key={committee.firebaseDocName}
-                                    className={`flex-row items-center justify-center rounded-md py-2 px-4 ${darkMode ? "bg-secondary-bg-dark" : "bg-secondary-bg-light"} ${selectedCommittee === committee.firebaseDocName && 'bg-primary-blue border-primary-blue'}`}
-                                    style={{
-                                        shadowColor: "#000",
-                                        shadowOffset: {
-                                            width: 0,
-                                            height: 2,
-                                        },
-                                        shadowOpacity: 0.25,
-                                        shadowRadius: 3.84,
-
-                                        elevation: 5,
-                                    }}
-                                    onPress={() => handleFilterSelect(undefined, committee.firebaseDocName)}
-                                >
-                                    <Text className={`font-bold ${selectedCommittee === committee.firebaseDocName ? 'text-white' : `${darkMode ? "text-white" : "text-black"}`}`}>{committee.name}</Text>
-                                </TouchableOpacity>
-                            ))}
-                        </View>
-                    </ScrollView>
-                )}
+                            Intramural
+                        </Text>
+                    </TouchableOpacity>
+                    <TouchableOpacity
+                        className={`items-center justify-center flex-1 rounded-3xl m-1 py-2 ${filter == "committee" && "bg-primary-blue"}`}
+                        onPress={() => {
+                            setFilter("committee")
+                        }}
+                    >
+                        <Text
+                            className={`text-xl font-bold ${darkMode ? "text-white" : filter === "committee" ? "text-white" : "text-black"}`}
+                        >
+                            Committee
+                        </Text>
+                    </TouchableOpacity>
+                </View>
 
                 {isLoading &&
                     <View className='mt-10 justify-center items-center'>
@@ -307,100 +224,110 @@ const Events = ({ navigation }: EventsProps) => {
 
                 {/* Event Listings */}
                 {!isLoading && (
-                    <View className='px-4'>
-                        {filteredEvents(todayEvents).length === 0 && filteredEvents(upcomingEvents).length === 0 && filteredEvents(pastEvents).length === 0 ? (
-                            <View className='mt-10 justify-center items-center'>
+                    <View className="px-4">
+                        {selectedEvents.today.length === 0 &&
+                            selectedEvents.upcoming.length === 0 &&
+                            selectedEvents.past.length === 0 ? (
+                            <View className="mt-10 justify-center items-center">
                                 <Text className={`text-lg font-bold ${darkMode ? "text-white" : "text-black"}`}>No Events</Text>
                             </View>
                         ) : (
                             <View>
                                 {/* Today's Events */}
-                                {filteredEvents(todayEvents).length !== 0 && (
-                                    <View className='mt-8'>
+                                {selectedEvents.today.length !== 0 && (
+                                    <View className="mt-8">
                                         <Text className={`mb-3 text-2xl font-bold ${darkMode ? "text-white" : "text-black"}`}>Today's Events</Text>
-                                        {filteredEvents(todayEvents)?.map((event: SHPEEvent, index) => {
-                                            return (
-                                                <TouchableOpacity
-                                                    key={event.id}
-                                                    className={`h-32 rounded-md ${index > 0 && "mt-8"}`}
-                                                    style={{
-                                                        shadowColor: "#000",
-                                                        shadowOffset: {
-                                                            width: 0,
-                                                            height: 2,
-                                                        },
-                                                        shadowOpacity: 0.25,
-                                                        shadowRadius: 3.84,
-
-                                                        elevation: 5,
-                                                    }}
-                                                    onPress={() => { navigation.navigate("EventInfo", { event: event }) }}
+                                        {selectedEvents.today.map((event: SHPEEvent, index) => (
+                                            <TouchableOpacity
+                                                key={event.id}
+                                                className={`h-32 rounded-md ${index > 0 && "mt-8"}`}
+                                                style={{
+                                                    shadowColor: "#000",
+                                                    shadowOffset: { width: 0, height: 2 },
+                                                    shadowOpacity: 0.25,
+                                                    shadowRadius: 3.84,
+                                                    elevation: 5,
+                                                }}
+                                                onPress={() => {
+                                                    navigation.navigate("EventInfo", { event: event });
+                                                }}
+                                            >
+                                                <Image
+                                                    className="flex h-full w-full rounded-2xl"
+                                                    resizeMode="cover"
+                                                    defaultSource={darkMode ? Images.SHPE_WHITE : Images.SHPE_NAVY}
+                                                    source={
+                                                        event?.coverImageURI
+                                                            ? { uri: event.coverImageURI }
+                                                            : darkMode
+                                                                ? Images.SHPE_WHITE
+                                                                : Images.SHPE_NAVY
+                                                    }
+                                                />
+                                                <LinearGradient
+                                                    colors={["rgba(0,0,0,0)", "rgba(0,0,0,0.5)", "rgba(0,0,0,0.8)"]}
+                                                    className="absolute bottom-0 h-[70%] w-full rounded-b-lg justify-center"
                                                 >
-                                                    <Image
-                                                        className="flex h-full w-full rounded-2xl"
-                                                        resizeMode='cover'
-                                                        defaultSource={darkMode ? Images.SHPE_WHITE : Images.SHPE_NAVY}
-                                                        source={event?.coverImageURI ? { uri: event.coverImageURI } : darkMode ? Images.SHPE_WHITE : Images.SHPE_NAVY}
-                                                    />
-                                                    <LinearGradient
-                                                        colors={['rgba(0,0,0,0)', 'rgba(0,0,0,0.5)', 'rgba(0,0,0,0.8)']}
-                                                        className='absolute bottom-0 h-[70%] w-full rounded-b-lg justify-center'
+                                                    <View className="px-4 pt-6">
+                                                        <Text className="text-xl font-bold text-white">
+                                                            {truncateStringWithEllipsis(event.name, 20)}
+                                                        </Text>
+                                                        {event.locationName ? (
+                                                            <Text className="text-md font-semibold text-white">
+                                                                {truncateStringWithEllipsis(event.locationName, 24)}
+                                                            </Text>
+                                                        ) : null}
+                                                        <Text className="text-md font-semibold text-white">
+                                                            {formatTime(event.startTime?.toDate()!)}
+                                                        </Text>
+                                                    </View>
+                                                </LinearGradient>
+                                                {hasPrivileges && (
+                                                    <TouchableOpacity
+                                                        onPress={() => {
+                                                            navigation.navigate("QRCode", { event: event });
+                                                        }}
+                                                        className="absolute right-0 top-0 p-2 m-2 rounded-full"
+                                                        style={{ backgroundColor: "rgba(0,0,0,0.7)" }}
                                                     >
-                                                        <View className='px-4 pt-6'>
-                                                            <Text className='text-xl font-bold text-white'>{truncateStringWithEllipsis(event.name, 20)}</Text>
-                                                            {event.locationName ? (
-                                                                <Text className='text-md font-semibold text-white'>{truncateStringWithEllipsis(event.locationName, 24)}</Text>
-                                                            ) : null}
-                                                            <Text className='text-md font-semibold text-white'>{formatTime(event.startTime?.toDate()!)}</Text>
-                                                        </View>
-                                                    </LinearGradient>
-                                                    {hasPrivileges && (
-                                                        <TouchableOpacity
-                                                            onPress={() => { navigation.navigate("QRCode", { event: event }) }}
-                                                            className='absolute right-0 top-0 p-2 m-2 rounded-full'
-                                                            style={{ backgroundColor: 'rgba(0,0,0,0.7)' }}
-                                                        >
-                                                            <FontAwesome6 name="qrcode" size={24} color="white" />
-                                                        </TouchableOpacity>
-                                                    )}
-                                                </TouchableOpacity>
-                                            );
-                                        })}
+                                                        <FontAwesome6 name="qrcode" size={24} color="white" />
+                                                    </TouchableOpacity>
+                                                )}
+                                            </TouchableOpacity>
+                                        ))}
                                     </View>
                                 )}
 
                                 {/* Upcoming Events */}
-                                {filteredEvents(upcomingEvents).length !== 0 && (
-                                    <View className='mt-8'>
-                                        <Text className={`mb-3 text-2xl font-bold ${darkMode ? "text-white" : "text-black"}`}>Upcoming Events</Text>
-                                        {filteredEvents(upcomingEvents)?.map((event: SHPEEvent, index) => {
-                                            return (
-                                                <View key={event.id} className={`${index > 0 && "mt-8"}`}>
-                                                    <EventCard event={event} navigation={navigation} />
-                                                </View>
-                                            );
-                                        })}
+                                {selectedEvents.upcoming.length !== 0 && (
+                                    <View className="mt-8">
+                                        <Text className={`mb-3 text-2xl font-bold ${darkMode ? "text-white" : "text-black"}`}>
+                                            Upcoming Events
+                                        </Text>
+                                        {selectedEvents.upcoming.map((event: SHPEEvent, index) => (
+                                            <View key={event.id} className={`${index > 0 && "mt-8"}`}>
+                                                <EventCard event={event} navigation={navigation} />
+                                            </View>
+                                        ))}
                                     </View>
                                 )}
 
                                 {/* Past Events */}
-                                {filteredEvents(pastEvents).length !== 0 && (
-                                    <View className='mt-8'>
-                                        <Text className={`mb-3 text-2xl font-bold ${darkMode ? "text-white" : "text-black"}`}>Past Events</Text>
-                                        {filteredEvents(pastEvents)?.map((event: SHPEEvent, index) => {
-                                            return (
-                                                <View key={index} className={`${index > 0 && "mt-8"}`}>
-                                                    <EventCard event={event} navigation={navigation} />
-                                                </View>
-                                            );
-                                        })}
+                                {selectedEvents.past.length !== 0 && (
+                                    <View className="mt-8">
+                                        <Text className={`mb-3 text-2xl font-bold ${darkMode ? "text-white" : "text-black"}`}>
+                                            Past Events
+                                        </Text>
+                                        {selectedEvents.past.map((event: SHPEEvent, index) => (
+                                            <View key={index} className={`${index > 0 && "mt-8"}`}>
+                                                <EventCard event={event} navigation={navigation} />
+                                            </View>
+                                        ))}
                                     </View>
                                 )}
-                                {!selectedFilter && (
-                                    <TouchableOpacity onPress={() => navigation.navigate("PastEvents")}>
-                                        <Text className='text-xl text-primary-blue mt-8 underline'>View more</Text>
-                                    </TouchableOpacity>
-                                )}
+                                <TouchableOpacity onPress={() => navigation.navigate("PastEvents")}>
+                                    <Text className="text-xl text-primary-blue mt-8 underline">View all past events</Text>
+                                </TouchableOpacity>
                             </View>
                         )}
                     </View>
@@ -464,7 +391,7 @@ const Events = ({ navigation }: EventsProps) => {
                             Event Location Check
                         </Text>
                         <Text className={`text-md ${darkMode ? "text-white" : "text-black"}`}>
-                            The location check only happens during scans; we do not track you continuously. You are free to leave the area, but if a sign-out scan is required, you must be at the location to sign out.
+                            The location check only happens during scans; we do not track you continuously. If a sign-out scan is required, you must be at the location to sign out.
                         </Text>
                     </View>
                 </View>
diff --git a/src/screens/home/Home.tsx b/src/screens/home/Home.tsx
index 7f9ba2b7..a9379cd6 100644
--- a/src/screens/home/Home.tsx
+++ b/src/screens/home/Home.tsx
@@ -381,12 +381,6 @@ const Home = ({ navigation, route }: NativeStackScreenProps<HomeStackParams>) =>
                                 <Octicons name="gear" size={24} color={darkMode ? "white" : "black"} />
                             </TouchableOpacity>
                         </View>
-                        <TouchableOpacity
-                            className='px-4'
-                            onPress={() => navigation.getParent()?.navigate('EventsTab', { screen: 'EventsScreen', params: { filter: 'myEvents' } })}
-                        >
-                            <Text className='text-lg text-primary-blue font-semibold'>View all</Text>
-                        </TouchableOpacity>
                     </View>