diff --git a/nextjs/src/app/course/[courseName]/calendar/CourseCalendar.tsx b/nextjs/src/app/course/[courseName]/calendar/CourseCalendar.tsx
index fff51b7..e434b0f 100644
--- a/nextjs/src/app/course/[courseName]/calendar/CourseCalendar.tsx
+++ b/nextjs/src/app/course/[courseName]/calendar/CourseCalendar.tsx
@@ -26,6 +26,7 @@ export default function CourseCalendar() {
     <div
       className="
         min-h-0
+        flex-grow
         border-4
         border-gray-900
         rounded-lg
diff --git a/nextjs/src/app/course/[courseName]/context/dragStyleContext.tsx b/nextjs/src/app/course/[courseName]/context/dragStyleContext.tsx
index 3592e6a..14fda2d 100644
--- a/nextjs/src/app/course/[courseName]/context/dragStyleContext.tsx
+++ b/nextjs/src/app/course/[courseName]/context/dragStyleContext.tsx
@@ -30,7 +30,7 @@ export function DragStyleContextProvider({
   return (
     <DragStyleContext.Provider value={{ setIsDragging }}>
       <div
-        className={"min-h-0 flex flex-col " + (isDragging ? " dragging " : "")}
+        className={"h-full flex flex-col " + (isDragging ? " dragging " : "")}
       >
         {children}
       </div>
diff --git a/nextjs/src/app/course/[courseName]/page.tsx b/nextjs/src/app/course/[courseName]/page.tsx
index b21b865..c50b3ba 100644
--- a/nextjs/src/app/course/[courseName]/page.tsx
+++ b/nextjs/src/app/course/[courseName]/page.tsx
@@ -13,8 +13,8 @@ export default async function CoursePage({}: {}) {
       <div className="h-full flex flex-col">
         <DragStyleContextProvider>
           <DraggingContextProvider>
-            <div className="flex flex-row min-h-0">
-              <div className="flex-1 min-h-0 flex flex-col">
+            <div className="flex flex-row h-full">
+              <div className="flex-1 h-full flex flex-col">
                 <CourseNavigation />
                 <CourseCalendar />
               </div>
diff --git a/nextjs/src/app/course/[courseName]/settings/page.tsx b/nextjs/src/app/course/[courseName]/settings/page.tsx
index ba23a46..a0c9f63 100644
--- a/nextjs/src/app/course/[courseName]/settings/page.tsx
+++ b/nextjs/src/app/course/[courseName]/settings/page.tsx
@@ -10,8 +10,8 @@ import DefaultFileUploadTypes from "./DefaultFileUploadTypes";
 
 export default function page() {
   return (
-    <div className="flex justify-center">
-      <div className=" w-fit mt-5">
+    <div className="flex justify-center h-full overflow-auto pt-5  ">
+      <div className=" w-fit ">
         <SettingsHeader />
         <DaysOfWeekSettings />
         <StartAndEndDate />
@@ -19,6 +19,9 @@ export default function page() {
         <DefaultFileUploadTypes />
         <DefaultDueTime />
         <AssignmentGroupManagement />
+        <br />
+        <br />
+        <br />
       </div>
     </div>
   );