diff --git a/src/stories/components/calendar/CalendarHeader.stories.tsx b/src/stories/components/calendar/CalendarHeader.stories.tsx
index b2d2cf26..dba73695 100644
--- a/src/stories/components/calendar/CalendarHeader.stories.tsx
+++ b/src/stories/components/calendar/CalendarHeader.stories.tsx
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from '@storybook/react';
-import CalendarHeader from '@views/components/calendar/CalendarHeader';
+import CalendarHeader from '@views/components/calendar/CalendarHeader/CalendarHeader';
 
 const meta = {
     title: 'Components/Calendar/CalendarHeader',
diff --git a/src/views/components/calendar/Calendar.tsx b/src/views/components/calendar/Calendar.tsx
index edd8b009..9f20ead0 100644
--- a/src/views/components/calendar/Calendar.tsx
+++ b/src/views/components/calendar/Calendar.tsx
@@ -5,7 +5,7 @@ import { CRX_PAGES } from '@shared/types/CRXPages';
 import { openReportWindow } from '@shared/util/openReportWindow';
 import CalendarBottomBar from '@views/components/calendar/CalendarBottomBar';
 import CalendarGrid from '@views/components/calendar/CalendarGrid';
-import CalendarHeader from '@views/components/calendar/CalendarHeader';
+import CalendarHeader from '@views/components/calendar/CalendarHeader/CalendarHeader';
 import { CalendarSchedules } from '@views/components/calendar/CalendarSchedules';
 import ResourceLinks from '@views/components/calendar/ResourceLinks';
 import Divider from '@views/components/common/Divider';
@@ -23,6 +23,7 @@ import { Button } from '../common/Button';
 import { LargeLogo } from '../common/LogoIcon';
 import Text from '../common/Text/Text';
 import CalendarFooter from './CalendarFooter';
+
 /**
  * Calendar page component
  */
@@ -64,7 +65,7 @@ export default function Calendar(): JSX.Element {
                 <div className='h-screen flex overflow-auto'>
                     <div
                         className={clsx(
-                            'py-spacing-6 relative h-full min-h-screen w-full flex flex-none flex-col justify-between overflow-clip whitespace-nowrap border-r border-theme-offwhite1 shadow-[2px_0_10px,rgba(214_210_196_/_.1)] duration-300 ease-out-expo transition-property-max-width screenshot:hidden',
+                            'py-spacing-6 relative h-full min-h-screen w-full flex flex-none flex-col justify-between overflow-clip whitespace-nowrap border-r border-theme-offwhite1 shadow-[2px_0_10px,rgba(214_210_196_/_.1)] motion-safe:duration-300 motion-safe:ease-out-expo motion-safe:transition-[max-width] screenshot:hidden',
                             {
                                 'max-w-[20.3125rem] ': showSidebar,
                                 'max-w-0 pointer-events-none': !showSidebar,
@@ -72,7 +73,7 @@ export default function Calendar(): JSX.Element {
                         )}
                         tabIndex={showSidebar ? 0 : -1}
                         aria-hidden={!showSidebar}
-                        {...{ inert: !showSidebar ? '' : undefined }}
+                        {...{ inert: !showSidebar }}
                     >
                         <div className='sticky top-0 z-50 w-full flex items-center justify-between gap-x-3xl bg-white px-spacing-8 pb-spacing-6'>
                             <LargeLogo />
@@ -116,14 +117,21 @@ export default function Calendar(): JSX.Element {
                         <CalendarFooter />
                     </div>
 
-                    <div className='h-full min-w-5xl flex flex-grow flex-col overflow-y-auto'>
+                    <div
+                        style={
+                            {
+                                // scrollbarGutter: 'stable',
+                            }
+                        }
+                        className='h-full flex flex-grow flex-col overflow-x-scroll px-spacing-5'
+                    >
                         <CalendarHeader
                             sidebarOpen={showSidebar}
                             onSidebarToggle={() => {
                                 setShowSidebar(!showSidebar);
                             }}
                         />
-                        <div className='min-h-2xl flex-grow overflow-auto pl-2 pr-4 pt-6 screenshot:min-h-xl'>
+                        <div className='min-h-2xl min-w-5xl flex-grow overflow-auto pl-spacing-3 pt-spacing-3 screenshot:min-h-xl'>
                             <CalendarGrid courseCells={courseCells} setCourse={setCourse} />
                         </div>
                         <CalendarBottomBar courseCells={courseCells} setCourse={setCourse} />
diff --git a/src/views/components/calendar/CalendarBottomBar.tsx b/src/views/components/calendar/CalendarBottomBar.tsx
index ec3099a1..d7c1449a 100644
--- a/src/views/components/calendar/CalendarBottomBar.tsx
+++ b/src/views/components/calendar/CalendarBottomBar.tsx
@@ -1,8 +1,4 @@
-import { CalendarDots, ImageSquare } from '@phosphor-icons/react';
 import type { Course } from '@shared/types/Course';
-import { saveAsCal, saveCalAsPng } from '@views/components/calendar/utils';
-import { Button } from '@views/components/common/Button';
-import Divider from '@views/components/common/Divider';
 import Text from '@views/components/common/Text/Text';
 import { ColorPickerProvider } from '@views/contexts/ColorPickerContext';
 import type { CalendarGridCourse } from '@views/hooks/useFlattenedCourseSchedule';
@@ -61,21 +57,6 @@ export default function CalendarBottomBar({ courseCells, setCourse }: CalendarBo
                     </>
                 )}
             </div>
-            <div className='flex items-center screenshot:hidden'>
-                {displayCourses && <Divider orientation='vertical' size='1rem' className='mx-1.25' />}
-                <Button variant='minimal' color='ut-black' icon={CalendarDots} onClick={saveAsCal}>
-                    Save as .CAL
-                </Button>
-                <Divider orientation='vertical' size='1rem' className='mx-1.25' />
-                <Button
-                    variant='minimal'
-                    color='ut-black'
-                    icon={ImageSquare}
-                    onClick={() => requestAnimationFrame(() => saveCalAsPng())}
-                >
-                    Save as .PNG
-                </Button>
-            </div>
         </div>
     );
 }
diff --git a/src/views/components/calendar/CalendarHeader.tsx b/src/views/components/calendar/CalendarHeader.tsx
deleted file mode 100644
index de184449..00000000
--- a/src/views/components/calendar/CalendarHeader.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Sidebar } from '@phosphor-icons/react';
-import { initSettings, OptionsStore } from '@shared/storage/OptionsStore';
-import { Button } from '@views/components/common/Button';
-import CourseStatus from '@views/components/common/CourseStatus';
-import Divider from '@views/components/common/Divider';
-import ScheduleTotalHoursAndCourses from '@views/components/common/ScheduleTotalHoursAndCourses';
-import useSchedules from '@views/hooks/useSchedules';
-import React, { useEffect, useState } from 'react';
-
-interface CalendarHeaderProps {
-    sidebarOpen?: boolean;
-    onSidebarToggle?: () => void;
-}
-
-/**
- * Renders the header component for the calendar.
- * @returns The JSX element representing the calendar header.
- */
-export default function CalendarHeader({ sidebarOpen, onSidebarToggle }: CalendarHeaderProps): JSX.Element {
-    const [enableCourseStatusChips, setEnableCourseStatusChips] = useState<boolean>(false);
-    const [_enableDataRefreshing, setEnableDataRefreshing] = useState<boolean>(false);
-
-    const [activeSchedule] = useSchedules();
-
-    useEffect(() => {
-        initSettings().then(({ enableCourseStatusChips, enableDataRefreshing }) => {
-            setEnableCourseStatusChips(enableCourseStatusChips);
-            setEnableDataRefreshing(enableDataRefreshing);
-        });
-
-        const l1 = OptionsStore.listen('enableCourseStatusChips', async ({ newValue }) => {
-            setEnableCourseStatusChips(newValue);
-            // console.log('enableCourseStatusChips', newValue);
-        });
-
-        const l2 = OptionsStore.listen('enableDataRefreshing', async ({ newValue }) => {
-            setEnableDataRefreshing(newValue);
-            // console.log('enableDataRefreshing', newValue);
-        });
-
-        return () => {
-            OptionsStore.removeListener(l1);
-            OptionsStore.removeListener(l2);
-        };
-    }, []);
-
-    return (
-        <div className='min-h-[91px] flex items-center gap-5 overflow-x-auto overflow-y-hidden px-7 py-4 md:overflow-x-hidden'>
-            {!sidebarOpen && (
-                <Button
-                    variant='minimal'
-                    color='theme-black'
-                    onClick={onSidebarToggle}
-                    className='h-fit w-fit screenshot:hidden !p-0'
-                    icon={Sidebar}
-                />
-            )}
-
-            <div className='screenshot:transform-origin-left screenshot:scale-120'>
-                <ScheduleTotalHoursAndCourses
-                    scheduleName={activeSchedule.name}
-                    totalHours={activeSchedule.hours}
-                    totalCourses={activeSchedule.courses.length}
-                />
-            </div>
-
-            <Divider className='mx-2 self-center md:mx-4 screenshot:hidden' size='2.5rem' orientation='vertical' />
-
-            <div className='hidden flex-row items-center justify-end gap-6 screenshot:hidden lg:flex'>
-                {enableCourseStatusChips && (
-                    <>
-                        <CourseStatus status='WAITLISTED' size='mini' />
-                        <CourseStatus status='CLOSED' size='mini' />
-                        <CourseStatus status='CANCELLED' size='mini' />
-                    </>
-                )}
-
-                {/* <Button variant='single' icon={UndoIcon} color='ut-black' />
-                <Button variant='single' icon={RedoIcon} color='ut-black' /> */}
-            </div>
-        </div>
-    );
-}
diff --git a/src/views/components/calendar/CalendarHeader/CalendarHeader.module.scss b/src/views/components/calendar/CalendarHeader/CalendarHeader.module.scss
new file mode 100644
index 00000000..9bbaef38
--- /dev/null
+++ b/src/views/components/calendar/CalendarHeader/CalendarHeader.module.scss
@@ -0,0 +1,28 @@
+.cqInline {
+    container-type: inline-size;
+
+    @mixin visually-hidden {
+        border: 0;
+        clip: rect(0 0 0 0);
+        height: auto;
+        margin: 0;
+        overflow: hidden;
+        padding: 0;
+        position: absolute;
+        width: 1px;
+        white-space: nowrap;
+    }
+
+    // value with all buttons is 610px
+    @container (width < 90px) {
+        .primaryActions span {
+            @include visually-hidden;
+        }
+    }
+
+    // @container (width < 445px) {
+    //     .secondaryActions span {
+    //         @include visually-hidden;
+    //     }
+    // }
+}
diff --git a/src/views/components/calendar/CalendarHeader/CalendarHeader.tsx b/src/views/components/calendar/CalendarHeader/CalendarHeader.tsx
new file mode 100644
index 00000000..828f48d5
--- /dev/null
+++ b/src/views/components/calendar/CalendarHeader/CalendarHeader.tsx
@@ -0,0 +1,124 @@
+import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/react';
+import { CalendarDots, Export, FilePng, Sidebar } from '@phosphor-icons/react';
+import styles from '@views/components/calendar/CalendarHeader/CalendarHeader.module.scss';
+import { Button } from '@views/components/common/Button';
+import DialogProvider from '@views/components/common/DialogProvider/DialogProvider';
+import Divider from '@views/components/common/Divider';
+import { ExtensionRootWrapper, styleResetClass } from '@views/components/common/ExtensionRoot/ExtensionRoot';
+import ScheduleTotalHoursAndCourses from '@views/components/common/ScheduleTotalHoursAndCourses';
+import useSchedules from '@views/hooks/useSchedules';
+import clsx from 'clsx';
+import React from 'react';
+
+import { saveAsCal, saveCalAsPng } from '../utils';
+
+interface CalendarHeaderProps {
+    sidebarOpen?: boolean;
+    onSidebarToggle?: () => void;
+}
+
+/**
+ * Renders the header component for the calendar.
+ * @returns The JSX element representing the calendar header.
+ */
+export default function CalendarHeader({ sidebarOpen, onSidebarToggle }: CalendarHeaderProps): JSX.Element {
+    const [activeSchedule] = useSchedules();
+
+    return (
+        <div
+            style={{ scrollbarGutter: 'stable' }}
+            className='sticky left-0 right-0 min-h-[85px] flex items-center gap-5 overflow-x-scroll overflow-y-hidden pl-spacing-7 pt-spacing-5'
+        >
+            {!sidebarOpen && (
+                <Button
+                    variant='minimal'
+                    color='theme-black'
+                    onClick={onSidebarToggle}
+                    className='h-fit w-fit screenshot:hidden !p-0'
+                    icon={Sidebar}
+                />
+            )}
+
+            <div className='min-w-[11.5rem] screenshot:transform-origin-left screenshot:scale-120'>
+                <ScheduleTotalHoursAndCourses
+                    scheduleName={activeSchedule.name}
+                    totalHours={activeSchedule.hours}
+                    totalCourses={activeSchedule.courses.length}
+                />
+            </div>
+            <Divider className='self-center screenshot:hidden' size='1.75rem' orientation='vertical' />
+            {/* min-w-[310px] is the value with all the buttons */}
+            <div className={clsx(styles.cqInline, 'flex flex-1 gap-5 min-w-[45x] screenshot:hidden')}>
+                <div className={clsx(styles.primaryActions, 'min-w-fit flex gap-5')}>
+                    <DialogProvider>
+                        <Menu>
+                            <MenuButton className='bg-transparent'>
+                                <Button color='ut-black' size='small' variant='minimal' icon={Export}>
+                                    Export
+                                </Button>
+                            </MenuButton>
+                            <MenuItems
+                                as={ExtensionRootWrapper}
+                                className={clsx([
+                                    styleResetClass,
+                                    'mt-spacing-3',
+                                    'w-fit cursor-pointer origin-top-right rounded bg-white p-1 text-black shadow-lg transition border border-theme-offwhite1 focus:outline-none',
+                                    'data-[closed]:(opacity-0 scale-95)',
+                                    'data-[enter]:(ease-out-expo duration-150)',
+                                    'data-[leave]:(ease-out duration-50)',
+                                ])}
+                                transition
+                                anchor='bottom start'
+                            >
+                                <MenuItem>
+                                    <Button
+                                        className='w-full flex justify-start'
+                                        onClick={() => requestAnimationFrame(() => saveCalAsPng())}
+                                        color='ut-black'
+                                        size='small'
+                                        variant='minimal'
+                                        icon={FilePng}
+                                    >
+                                        Save as .png
+                                    </Button>
+                                </MenuItem>
+                                <MenuItem>
+                                    <Button
+                                        className='w-full flex justify-start'
+                                        onClick={saveAsCal}
+                                        color='ut-black'
+                                        size='small'
+                                        variant='minimal'
+                                        icon={CalendarDots}
+                                    >
+                                        Save as .cal
+                                    </Button>
+                                </MenuItem>
+                                {/* <MenuItem>
+                                    <Button color='ut-black' size='small' variant='minimal' icon={FileTxt}>
+                                        Export Unique IDs
+                                    </Button>
+                                </MenuItem> */}
+                            </MenuItems>
+                        </Menu>
+                    </DialogProvider>
+                    {/* <Button className='invisible' color='ut-black' size='small' variant='minimal' icon={PlusCircle}>
+                        Quick Add
+                    </Button>
+                    <Button className='invisible' color='ut-black' size='small' variant='minimal' icon={SelectionPlus}>
+                        Block
+                    </Button> */}
+                </div>
+                {/* <Divider className='self-center' size='1.75rem' orientation='vertical' />
+                <div className={clsx(styles.secondaryActions, 'min-w-fit flex flex-1 justify-end gap-5')}>
+                    <Button className='invisible' color='ut-black' size='small' variant='minimal' icon={BookmarkSimple}>
+                        Bookmarks
+                    </Button>
+                    <Button className='invisible' color='ut-black' size='small' variant='minimal' icon={MapPinArea}>
+                        UT Map
+                    </Button>
+                </div> */}
+            </div>
+        </div>
+    );
+}
diff --git a/src/views/components/common/Button.tsx b/src/views/components/common/Button.tsx
index 722dbb49..832a562d 100644
--- a/src/views/components/common/Button.tsx
+++ b/src/views/components/common/Button.tsx
@@ -7,6 +7,7 @@ import React from 'react';
 
 interface Props {
     className?: string;
+    ref?: React.ForwardedRef<HTMLButtonElement>;
     style?: React.CSSProperties;
     variant?: 'filled' | 'outline' | 'minimal';
     size?: 'regular' | 'small' | 'mini';
@@ -24,6 +25,7 @@ interface Props {
  */
 export function Button({
     className,
+    ref,
     style,
     variant = 'filled',
     size = 'regular',
@@ -42,6 +44,7 @@ export function Button({
 
     return (
         <button
+            ref={ref}
             style={
                 {
                     color: colorHex,
diff --git a/src/views/components/common/ScheduleTotalHoursAndCourses.tsx b/src/views/components/common/ScheduleTotalHoursAndCourses.tsx
index 83c768f4..d9b40799 100644
--- a/src/views/components/common/ScheduleTotalHoursAndCourses.tsx
+++ b/src/views/components/common/ScheduleTotalHoursAndCourses.tsx
@@ -24,17 +24,24 @@ export default function ScheduleTotalHoursAndCourses({
     totalCourses,
 }: ScheduleTotalHoursAndCoursesProps): JSX.Element {
     return (
-        <div className='min-w-full flex flex-col items-start whitespace-nowrap'>
-            <Text className='truncate text-ut-burntorange' variant='h1' as='span'>
-                {`${scheduleName} `}
-            </Text>
-            <Text variant='h3' as='div' className='flex flex-row items-center gap-2.5 text-theme-black'>
-                <Text variant='h4' as='span' className='hidden text-ut-black uppercase screenshot:inline sm:inline'>
-                    {totalHours} {totalHours === 1 ? 'Hour' : 'Hours'}
+        <div className='w-full flex flex-col items-start'>
+            <div className='max-w-full overflow-hidden'>
+                <Text className='block w-full truncate text-ut-burntorange' variant='h1' as='span'>
+                    {scheduleName}
                 </Text>
-
-                <Text variant='h4' as='span' className='hidden text-ut-black uppercase screenshot:inline sm:inline'>
-                    {totalCourses} {totalCourses === 1 ? 'Course' : 'Courses'}
+            </div>
+            <Text variant='h3' as='div' className='flex flex-row items-center gap-2.5 text-theme-black'>
+                <Text variant='h4' as='span' className='inline text-theme-black'>
+                    {totalHours}&nbsp;
+                    <Text variant='h3' as='span' className='inline text-theme-black font-all-small-caps!'>
+                        {totalHours === 1 ? 'Hour' : 'Hours'}
+                    </Text>
+                </Text>
+                <Text variant='h4' as='span' className='inline text-theme-black'>
+                    {totalCourses}&nbsp;
+                    <Text variant='h3' as='span' className='inline text-theme-black font-all-small-caps!'>
+                        {totalCourses === 1 ? 'Course' : 'Courses'}
+                    </Text>
                 </Text>
             </Text>
         </div>
diff --git a/src/views/components/common/Text/Text.tsx b/src/views/components/common/Text/Text.tsx
index e5a98667..229cf55b 100644
--- a/src/views/components/common/Text/Text.tsx
+++ b/src/views/components/common/Text/Text.tsx
@@ -1,10 +1,9 @@
 import type { PropsOf, ReactTag } from '@headlessui/react/dist/types';
+import styles from '@views/components/common/Text/Text.module.scss';
 import clsx from 'clsx';
 import type { ElementType, ReactNode, Ref } from 'react';
 import React from 'react';
 
-import styles from './Text.module.scss';
-
 type PropsWeControl = 'as' | 'children';
 type CleanProps<TTag extends ReactTag, TOmitableProps extends PropertyKey = never> = Omit<
     PropsOf<TTag>,