diff --git a/frontend/src/components/Events/Events.tsx b/frontend/src/components/Events/Events.tsx
index 9f3dc730..251aff9d 100644
--- a/frontend/src/components/Events/Events.tsx
+++ b/frontend/src/components/Events/Events.tsx
@@ -331,16 +331,16 @@ const Events = () => {
           </Grid>
         )}
         {/* Render EventBoxes for future events */}
-        <div style={{ ...eventsContainerStyle, marginTop: '20px' }}>
-          {(displayedFutureEvents.length === 0 && (
-            <Grid item
-            sx={{ color: 'white', fontSize: 20, fontFamily: 'Chakra Petch', fontWeight: '700' }}>
-              No upcoming events
-            </Grid>
-          )) ||
-            renderEventBoxes(displayedFutureEvents)}
-        </div>
-
+      {!isLoading && <div style={{ ...eventsContainerStyle, marginTop: '20px' }}>
+        {(displayedFutureEvents.length === 0 && (
+          <Grid item
+          sx={{ color: 'white', fontSize: 20, fontFamily: 'Chakra Petch', fontWeight: '700' }}>
+            No upcoming events
+          </Grid>
+        )) ||
+          renderEventBoxes(displayedFutureEvents)}
+      </div>
+      }
         {displayedFutureEvents.length > 0 && (
           <Grid item mt={2} ml={5} 
           sx={{ color: 'white', fontSize: 'clamp(15px, 3vw, 20px)', fontFamily: 'Chakra Petch', fontWeight: '700' }}>
diff --git a/frontend/src/components/Opportunities/Opportunities.tsx b/frontend/src/components/Opportunities/Opportunities.tsx
index 060403dc..99d32423 100644
--- a/frontend/src/components/Opportunities/Opportunities.tsx
+++ b/frontend/src/components/Opportunities/Opportunities.tsx
@@ -112,7 +112,7 @@ const Opportunities = () => {
                     backgroundColor: 'rgba(255, 255, 255, 0.2)',
                   },
                 }}
-                onClick={() => navigate('/')}
+                onClick={() => navigate('/login')}
               >
                 Become a Member
               </MuiButton>