diff --git a/src/components/Feed/Feed.css b/src/components/Feed/Feed.css
index 80fa0dd..188e5a3 100644
--- a/src/components/Feed/Feed.css
+++ b/src/components/Feed/Feed.css
@@ -1,4 +1,13 @@
 .feed-content {
-    margin-top: 4rem;
-    margin-bottom: 4rem;
+    height: calc(100vh - 56px - 64px - 72px); /* This is the height of the viewport minus the height of the app bar, the bottom navigation bar, and the friends public switch */
+    margin-top: 150px;
+}
+
+.friends-public-switch {
+    left: 0;
+    right: 0;
+    top: 64px;
+    position: fixed;
+    z-index: 1000;
+    background-color: white;
 }
\ No newline at end of file
diff --git a/src/components/Feed/Feed.jsx b/src/components/Feed/Feed.jsx
index 5470337..a7fba5a 100644
--- a/src/components/Feed/Feed.jsx
+++ b/src/components/Feed/Feed.jsx
@@ -79,11 +79,11 @@ function Feed() {
   return (
     <div>
       <AppBar />
-      <Container className="feed-content" maxWidth="sm">
-        <Tabs value={value} onChange={handleChange} centered>
+        <Tabs className="friends-public-switch" value={value} onChange={handleChange} centered>
           <Tab label="Friends" icon={<PeopleIcon />} component={Link} to="/feed" />
           <Tab label="Public" icon={<PublicIcon />} component={Link} to="/public" />
         </Tabs>
+        <Container className="feed-content" maxWidth="sm">
         <CourseSelect searchFunc={setSearch} />
           <Box paddingBottom="30px">
             <Stack spacing={3}>