diff --git a/course-matrix/frontend/src/pages/TimetableBuilder/Calendar.tsx b/course-matrix/frontend/src/pages/TimetableBuilder/Calendar.tsx
index bc3a4117..2591e77f 100644
--- a/course-matrix/frontend/src/pages/TimetableBuilder/Calendar.tsx
+++ b/course-matrix/frontend/src/pages/TimetableBuilder/Calendar.tsx
@@ -201,8 +201,11 @@ const Calendar = React.memo<CalendarProps>(
           ),
       ),
     ].length;
-    const allOfferingSectionsHaveBeenSelected =
-      totalNumberOfSelectedSections === totalNumberOfRequiredSections;
+    const allOfferingSectionsHaveBeenSelected = isEditingTimetable
+      ? !numberOfSectionsData ||
+        !offeringsData ||
+        totalNumberOfSelectedSections === totalNumberOfRequiredSections
+      : totalNumberOfSelectedSections === totalNumberOfRequiredSections;
 
     useEffect(() => {
       if (!isEditingTimetable) {
diff --git a/course-matrix/frontend/src/pages/TimetableBuilder/OfferingInfo.tsx b/course-matrix/frontend/src/pages/TimetableBuilder/OfferingInfo.tsx
index 1b42a9f0..2c513ff9 100644
--- a/course-matrix/frontend/src/pages/TimetableBuilder/OfferingInfo.tsx
+++ b/course-matrix/frontend/src/pages/TimetableBuilder/OfferingInfo.tsx
@@ -245,7 +245,7 @@ const OfferingInfo = ({ course, semester, form }: OfferingInfoProps) => {
                           <SelectItem
                             value={lectureOfferingIds.join(",")}
                             className={
-                              "font-bold bg-yellow-300 focus:bg-yellow-500 cursor-pointer"
+                              "font-bold bg-green-100/50 focus:bg-green-200 cursor-pointer"
                             }
                           >
                             {section}
@@ -257,7 +257,7 @@ const OfferingInfo = ({ course, semester, form }: OfferingInfoProps) => {
                             return (
                               <SelectLabel
                                 key={id}
-                                className={"bg-yellow-100 font-light"}
+                                className={"font-light"}
                               >{`${offering?.day}, ${offering?.start} - ${offering?.end}`}</SelectLabel>
                             );
                           })}
@@ -309,7 +309,7 @@ const OfferingInfo = ({ course, semester, form }: OfferingInfoProps) => {
                           <SelectItem
                             value={tutorialOfferingIds.join(",")}
                             className={
-                              "font-bold bg-yellow-300 focus:bg-yellow-500 cursor-pointer"
+                              "font-bold bg-green-100/50 focus:bg-green-200 cursor-pointer"
                             }
                           >
                             {section}
@@ -321,7 +321,7 @@ const OfferingInfo = ({ course, semester, form }: OfferingInfoProps) => {
                             return (
                               <SelectLabel
                                 key={id}
-                                className={"bg-yellow-100 font-light"}
+                                className={"font-light"}
                               >{`${offering?.day}, ${offering?.start} - ${offering?.end}`}</SelectLabel>
                             );
                           })}
@@ -375,7 +375,7 @@ const OfferingInfo = ({ course, semester, form }: OfferingInfoProps) => {
                           <SelectItem
                             value={practicalOfferingIds.join(",")}
                             className={
-                              "font-bold bg-yellow-300 focus:bg-yellow-500 cursor-pointer"
+                              "font-bold bg-green-100/50 focus:bg-green-200 cursor-pointer"
                             }
                           >
                             {section}
@@ -387,7 +387,7 @@ const OfferingInfo = ({ course, semester, form }: OfferingInfoProps) => {
                             return (
                               <SelectLabel
                                 key={id}
-                                className={"bg-yellow-100 font-light"}
+                                className={"font-light"}
                               >{`${offering?.day}, ${offering?.start} - ${offering?.end}`}</SelectLabel>
                             );
                           })}
diff --git a/course-matrix/frontend/src/pages/TimetableBuilder/TimetableBuilder.tsx b/course-matrix/frontend/src/pages/TimetableBuilder/TimetableBuilder.tsx
index ba6e4d3b..67cfb502 100644
--- a/course-matrix/frontend/src/pages/TimetableBuilder/TimetableBuilder.tsx
+++ b/course-matrix/frontend/src/pages/TimetableBuilder/TimetableBuilder.tsx
@@ -362,13 +362,15 @@ const TimetableBuilder = () => {
                 <Button size="sm" variant="outline" onClick={handleReset}>
                   Reset
                 </Button>
-                <Button
-                  size="sm"
-                  variant="outline"
-                  onClick={() => setOpenShareDialog(true)}
-                >
-                  Share
-                </Button>
+                {isEditingTimetable && (
+                  <Button
+                    size="sm"
+                    variant="outline"
+                    onClick={() => setOpenShareDialog(true)}
+                  >
+                    Share
+                  </Button>
+                )}
                 {isEditingTimetable && (
                   <ShareDialog
                     open={openShareDialog}