diff --git a/src/main/java/org/example/se302/controller/ScheduleClassroomController.java b/src/main/java/org/example/se302/controller/ScheduleClassroomController.java
index 1113655..445a4b5 100644
--- a/src/main/java/org/example/se302/controller/ScheduleClassroomController.java
+++ b/src/main/java/org/example/se302/controller/ScheduleClassroomController.java
@@ -13,6 +13,7 @@ import javafx.scene.control.TableView;
 import org.example.se302.model.Classroom;
 import org.example.se302.model.Course;
 import org.example.se302.model.ScheduleConfiguration;
+import org.example.se302.model.TimeSlot;
 import org.example.se302.service.DataManager;
 
 import java.time.LocalDate;
@@ -170,7 +171,18 @@ public class ScheduleClassroomController {
                                         dateStr = "Day " + (dayIndex + 1);
                                 }
 
-                                String timeStr = "Slot " + (slotIndex + 1);
+                                // Format time
+                                String timeStr;
+                                if (config != null) {
+                                        TimeSlot timeSlot = config.getTimeSlot(dayIndex, slotIndex);
+                                        if (timeSlot != null) {
+                                                timeStr = timeSlot.getStartTime() + " - " + timeSlot.getEndTime();
+                                        } else {
+                                                timeStr = "Slot " + (slotIndex + 1);
+                                        }
+                                } else {
+                                        timeStr = "Slot " + (slotIndex + 1);
+                                }
 
                                 // Calculate utilization
                                 int studentCount = course.getEnrolledStudentsCount();
diff --git a/src/main/java/org/example/se302/controller/ScheduleCourseController.java b/src/main/java/org/example/se302/controller/ScheduleCourseController.java
index 4c85063..533aa56 100644
--- a/src/main/java/org/example/se302/controller/ScheduleCourseController.java
+++ b/src/main/java/org/example/se302/controller/ScheduleCourseController.java
@@ -10,6 +10,7 @@ import javafx.scene.control.TableRow;
 import javafx.scene.control.TableView;
 import org.example.se302.model.Course;
 import org.example.se302.model.ScheduleConfiguration;
+import org.example.se302.model.TimeSlot;
 import org.example.se302.service.DataManager;
 
 import java.time.LocalDate;
@@ -173,7 +174,17 @@ public class ScheduleCourseController {
                                         dateStr = "Day " + (dayIndex + 1);
                                 }
 
-                                timeStr = "Slot " + (slotIndex + 1);
+                                // Format time using configuration's time slots
+                                if (config != null) {
+                                        TimeSlot timeSlot = config.getTimeSlot(dayIndex, slotIndex);
+                                        if (timeSlot != null) {
+                                                timeStr = timeSlot.getStartTime() + " - " + timeSlot.getEndTime();
+                                        } else {
+                                                timeStr = "Slot " + (slotIndex + 1);
+                                        }
+                                } else {
+                                        timeStr = "Slot " + (slotIndex + 1);
+                                }
                         }
 
                         entries.add(new CourseScheduleEntry(courseCode, enrolled, dateStr, timeStr, classroomStr,