diff --git a/app/src/main/java/com/dscvit/vitty/model/PeriodDetails.kt b/app/src/main/java/com/dscvit/vitty/model/PeriodDetails.kt
index c558242..2dc5277 100755
--- a/app/src/main/java/com/dscvit/vitty/model/PeriodDetails.kt
+++ b/app/src/main/java/com/dscvit/vitty/model/PeriodDetails.kt
@@ -2,9 +2,11 @@ package com.dscvit.vitty.model
 
 import com.google.firebase.Timestamp
 import java.util.Date
+import java.util.UUID
 
 data class PeriodDetails(
 //    var courseType: String = "",
+    val id: String = UUID.randomUUID().toString(),
     var courseCode: String = "",
     var courseName: String = "",
     var startTime: Timestamp = Timestamp(Date()),
diff --git a/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt
index ca33147..494c743 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/academics/AcademicsScreenContent.kt
@@ -172,6 +172,9 @@ fun AcademicsScreenContent(
                     alertDaysBefore,
                     attachmentUrl,
                     ->
+                    coursePageViewModel.setCourseId(selectedCourseForReminder!!.code)
+                    coursePageViewModel.setCourseTitle(selectedCourseForReminder!!.title)
+
                     coursePageViewModel.addReminder(
                         title = title,
                         description = description,
diff --git a/app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt b/app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt
index 91f9bdb..b8cc98b 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/academics/components/AcademicsScreenComponents.kt
@@ -470,7 +470,6 @@ fun CourseCard(
     }
 }
 
-@RequiresApi(Build.VERSION_CODES.O)
 @Composable
 fun RemindersContent(
     reminders: List<Reminder>,
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt
index 537736a..bfccadd 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/connect/CircleMemberDetailScreenContent.kt
@@ -398,7 +398,7 @@ private fun DayScheduleContent(
         ) {
             items(
                 items = periods,
-                key = { period -> "${period.courseCode}_${period.slot}" },
+                key = { period -> period.id },
             ) { period ->
                 CircleMemberPeriodCard(
                     period = period,
diff --git a/app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt
index a2b4f2c..a76b55f 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/connect/FriendDetailScreenContent.kt
@@ -772,7 +772,7 @@ private fun DayScheduleContent(
         ) {
             items(
                 items = periods,
-                key = { period -> "${periods.indexOf(period)}${period.startTime}_${period.courseCode}_${period.slot}_${period.endTime}" },
+                key = { period -> period.id },
             ) { period ->
                 FriendPeriodCard(
                     period = period,
diff --git a/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt b/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt
index e68cfc1..0185750 100644
--- a/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt
+++ b/app/src/main/java/com/dscvit/vitty/ui/schedule/ScheduleScreenContent.kt
@@ -410,7 +410,7 @@ private fun DayContent(
         ) {
             items(
                 items = periods,
-                key = { period -> "${periods.indexOf(period)}${period.startTime}_${period.courseCode}_${period.slot}_${period.endTime}" },
+                key = { period -> period.id },
             ) { period ->
                 PeriodCard(
                     period = period,