diff --git a/app/Filament/Resources/Learning/Attendances/AttendanceResource.php b/app/Filament/Resources/Learning/Attendances/AttendanceResource.php
index 67fbeab..45bf3f4 100644
--- a/app/Filament/Resources/Learning/Attendances/AttendanceResource.php
+++ b/app/Filament/Resources/Learning/Attendances/AttendanceResource.php
@@ -19,7 +19,7 @@ class AttendanceResource extends Resource
 
     protected static ?string $navigationLabel = 'Presensi';
 
-    protected static ?int $navigationSort = 20;
+    protected static ?int $navigationSort = 3;
 
     protected static ?string $modelLabel = 'Presensi';
 
diff --git a/app/Filament/Resources/Learning/Attendances/Pages/ManageAttendances.php b/app/Filament/Resources/Learning/Attendances/Pages/ManageAttendances.php
index 54df747..3ab7f1c 100644
--- a/app/Filament/Resources/Learning/Attendances/Pages/ManageAttendances.php
+++ b/app/Filament/Resources/Learning/Attendances/Pages/ManageAttendances.php
@@ -33,12 +33,8 @@ public function getSchedules()
 
         return CourseSchedule::query()
             ->where('day_of_week', $today)
-            ->whereHas('course', function ($q) use ($semester, $student) {
-                $q->where('semester', $semester)
-                    ->whereHas('studyGroups', function ($sq) use ($student) {
-                        $sq->where('leader_id', $student->id)
-                            ->orWhereHas('students', fn ($asq) => $asq->where('students.id', $student->id));
-                    });
+            ->whereHas('course', function ($q) use ($semester) {
+                $q->where('semester', $semester);
             })
             ->with(['course.lecturer', 'attendances' => function ($q) use ($student) {
                 $q->where('student_id', $student->id)
diff --git a/resources/views/filament/resources/learning/attendances/pages/list-attendances.blade.php b/resources/views/filament/resources/learning/attendances/pages/list-attendances.blade.php
index f2d7128..db2b94e 100644
--- a/resources/views/filament/resources/learning/attendances/pages/list-attendances.blade.php
+++ b/resources/views/filament/resources/learning/attendances/pages/list-attendances.blade.php
@@ -14,16 +14,6 @@
                                 $card->is_attended,
                         ])>
 
-                            @if ($card->is_attended)
-                                <div class="absolute -top-3 -right-3 z-10">
-                                    <span
-                                        class="inline-flex items-center gap-1 rounded-full bg-primary-600 px-3 py-1 text-[10px] font-bold text-white dark:text-gray-900 shadow-lg ring-2 ring-white dark:ring-gray-900 uppercase tracking-widest">
-                                        <x-heroicon-m-check-badge class="w-3.5 h-3.5" />
-                                        Hadir
-                                    </span>
-                                </div>
-                            @endif
-
                             <div class="p-6 space-y-4 flex-1">
                                 <div class="space-y-1">
                                     <h3 @class([
@@ -51,7 +41,7 @@ class="inline-flex items-center gap-1 rounded-full bg-primary-600 px-3 py-1 text
                                 </div>
 
                                 <div class="space-y-4">
-                                    <div class="flex items-center text-sm text-gray-600 dark:text-gray-400 py-4">
+                                    <div class="flex items-center text-sm text-gray-600 dark:text-gray-400 pt-4">
                                         <div @class([
                                             'w-8 h-8 rounded-full flex items-center justify-center mr-3 shrink-0 border',
                                             'bg-primary-100 dark:bg-primary-900/40 border-primary-200 dark:border-primary-800' => !$card->is_attended,
@@ -79,7 +69,7 @@ class="text-[10px] font-bold uppercase text-gray-400 tracking-widest leading-non
                                     </div>
 
                                     <div @class([
-                                        'border-t',
+                                        'pt-4 border-t',
                                         'border-gray-100 dark:border-gray-800' => !$card->is_attended,
                                         'border-primary-200 dark:border-primary-800' => $card->is_attended,
                                     ])>