diff --git a/app/Http/Controllers/StudentController.php b/app/Http/Controllers/StudentController.php
index 102692b..e8bacec 100644
--- a/app/Http/Controllers/StudentController.php
+++ b/app/Http/Controllers/StudentController.php
@@ -97,19 +97,34 @@ public static function getStudentScoresForBlok($group, $cohortId, $onlyForUser =
 
         // Pre-compute the scores for each feedback moment up to the current week.
         $feedbackScores = $feedbackmomenten->mapWithKeys(function($fm) use ($scores) {
-            return [$fm->id => $scores->where('feedbackmoment_id', $fm->id)->pluck('score', 'student_id')];
+            // Note that because this plucks the key to the student_id, it will overwrite any duplicate student_id's with
+            // the last one. This is fine, because we only want the last score for each student.
+            // TODO: Or do we want the highest score for each student?
+            return [
+                $fm->id => $scores->where('feedbackmoment_id', $fm->id)->mapWithKeys(function($score) {
+                    return [
+                        $score->student_id => [
+                            'score' => $score->score,
+                            'attempt' => $score->attempt
+                        ]
+                    ];
+                })->toArray()
+            ];
         });
 
         $students = $students->map(function($user) use ($blok, $group, $feedbackScores, $totalPointsToGainUntilNow, $totalBpointsToGainUntilNow) {
 
             // Calculate total points by summing the highest scores for each feedback moment.
             $totalPoints = collect($feedbackScores)->map(function ($scores, $fmId) use ($user) {
-                return $scores[$user['id']] ?? 0;
+                return $scores[$user['id']]['score'] ?? 0;
             })->sum();
 
             // Prepare the scores per feedback moment for the student.
             $feedbackmomentenScores = collect($feedbackScores)->mapWithKeys(function ($scores, $fmId) use ($user) {
-                return [$fmId => $scores[$user['id']] ?? null];
+                return [$fmId => $scores[$user['id']] ?? [
+                    'score' => null,
+                    'attempt' => null
+                ]];
             });
 
             $totalBpoints = DB::table('student_scores_b')->where('student_id', $user['id'])->sum('score');
diff --git a/app/Livewire/Concerns/CanFloodFill.php b/app/Livewire/Concerns/CanFloodFill.php
new file mode 100644
index 0000000..4ffc6d2
--- /dev/null
+++ b/app/Livewire/Concerns/CanFloodFill.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Livewire\Concerns;
+
+trait CanFloodFill
+{
+    public $floodFillValue = -1;
+    public $floodFillCount;
+    public $floodFillSubject;
+
+    public function startFloodFill($feedbackmomentId)
+    {
+        $studentCount = count($this->students);
+        $feedbackmoment = $this->blok->vakken->pluck('feedbackmomenten')->flatten()->firstWhere('id', $feedbackmomentId);
+
+        // Count the students that have a score for this feedbackmoment and wont be affected by the floodfill
+        $studentsWithScore = 0;
+
+        foreach($this->students as $student)
+        {
+            if(isset($student->feedbackmomenten[$feedbackmomentId]['score']))
+                $studentsWithScore++;
+        }
+
+        $count = $studentCount - $studentsWithScore;
+
+        // TODO: Nice message that tells the user nobody will be affected by the floodfill
+        if ($count == 0)
+            return;
+
+        $this->floodFillCount = $count;
+        $this->floodFillSubject = $feedbackmoment;
+        $this->floodFillValue = $feedbackmoment->points;
+    }
+
+    public function doFloodFill()
+    {
+        foreach($this->students as $key => $student)
+        {
+            if(!isset($student->feedbackmomenten[$this->floodFillSubject->id]['score']))
+            {
+                $student->feedbackmomenten[$this->floodFillSubject->id] = [
+                    'attempt' => 1,
+                    'score' => $this->floodFillValue,
+                ];
+                $this->updatedStudents($this->floodFillValue, $key . '.feedbackmomenten.' . $this->floodFillSubject->id . '.score');
+            }
+        }
+
+        $this->cancelFloodFill();
+    }
+
+    public function cancelFloodFill()
+    {
+        $this->floodFillValue = -1;
+        $this->floodFillSubject = null;
+        $this->floodFillCount = null;
+    }
+}
diff --git a/app/Livewire/Concerns/CanManageAttempts.php b/app/Livewire/Concerns/CanManageAttempts.php
new file mode 100644
index 0000000..996b0c6
--- /dev/null
+++ b/app/Livewire/Concerns/CanManageAttempts.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Livewire\Concerns;
+
+use App\Models\StudentScore;
+
+trait CanManageAttempts
+{
+    public $manageAttempts = [];
+    public $manageAttemptsNew = -1;
+    public $manageAttemptsStudent;
+    public $manageAttemptsFeedbackmoment;
+
+    public function startManageAttempts($studentId, $feedbackmomentId)
+    {
+        $student = $this->students->firstWhere('id', $studentId);
+        $feedbackmoment = $this->blok->vakken->pluck('feedbackmomenten')->flatten()->firstWhere('id', $feedbackmomentId);
+
+        $this->manageAttempts = StudentScore::where('student_id', $studentId)
+            ->where('feedbackmoment_id', $feedbackmomentId)
+            ->get()
+            ->mapWithKeys(function ($score) {
+                return [
+                    $score->id => [
+                        'attempt' => $score->attempt,
+                        'score' => $score->score,
+                    ]
+                ];
+            })
+            ->toArray();
+        $this->manageAttemptsStudent = $student;
+        $this->manageAttemptsFeedbackmoment = $feedbackmoment;
+    }
+
+    public function removeAttempt($scoreId)
+    {
+        StudentScore::find($scoreId)->delete();
+        unset($this->manageAttempts[$scoreId]);
+        $this->updateStudentScores();
+    }
+
+    public function doManageAttempts()
+    {
+        $highestAttempt = 1;
+        foreach ($this->manageAttempts as $id => $attempt) {
+            StudentScore::find($id)->update([
+                'attempt' => $attempt['attempt'],
+                'score' => $attempt['score'],
+            ]);
+
+            if ($highestAttempt < $attempt['attempt']) {
+                $highestAttempt = $attempt['attempt'];
+            }
+        }
+
+        if ($this->manageAttemptsNew > -1) {
+            $updatedScores = [
+                [
+                    'student_id' => $this->manageAttemptsStudent->id,
+                    'feedbackmoment_id' => $this->manageAttemptsFeedbackmoment->id,
+                    'teacher_id' => auth()->user()->id,
+                    'score' => $this->manageAttemptsNew ?: 0,
+                    'attempt' => $highestAttempt + 1,
+                ],
+            ];
+
+            StudentScore::updateFeedbackForStudents($updatedScores);
+            $this->manageAttemptsNew = -1;
+        }
+
+        $this->cancelManageAttempts();
+    }
+
+    public function cancelManageAttempts()
+    {
+        $this->manageAttempts = [];
+        $this->manageAttemptsStudent = null;
+        $this->manageAttemptsFeedbackmoment = null;
+        $this->manageAttemptsNew = -1;
+    }
+
+    public function addNewAttempt()
+    {
+        $this->manageAttemptsNew = 0;
+    }
+
+    public function removeNewAttempt()
+    {
+        $this->manageAttemptsNew = -1;
+    }
+}
diff --git a/app/Livewire/StudyPointMatrix.php b/app/Livewire/StudyPointMatrix.php
index 4591b79..7246498 100644
--- a/app/Livewire/StudyPointMatrix.php
+++ b/app/Livewire/StudyPointMatrix.php
@@ -3,6 +3,8 @@
 namespace App\Livewire;
 
 use App\Http\Controllers\StudentController;
+use App\Livewire\Concerns\CanFloodFill;
+use App\Livewire\Concerns\CanManageAttempts;
 use App\Models\StudentScore;
 use App\Models\Group;
 use App\Traits\SendsNotifications;
@@ -14,11 +16,17 @@
 class StudyPointMatrix extends Component
 {
     use SendsNotifications;
+    use CanFloodFill;
+    use CanManageAttempts;
 
     public $blok;
     public $groups;
     public $blokken = [];
     public $students;
+    public $changedStudents = [];
+
+    #[Url(as: 'points', history: true)]
+    public $showPoints = 'a';
 
     #[Url(as: 'group', history: true)]
     public $selectedGroupId = -1;
@@ -28,10 +36,6 @@ class StudyPointMatrix extends Component
     public $fbmsActive;
     public $vakkenActiveB;
 
-    public $floodFillValue = -1;
-    public $floodFillCount;
-    public $floodFillSubject;
-
     private $selectedCohortId;
 
     public function render()
@@ -72,6 +76,7 @@ private function updateStudentScores()
 
         list($this->blok, $this->fbmsActive, $this->students, $this->vakkenActiveB) = StudentController::getStudentScoresForBlok($group, $selectedCohortId, blokId: $this->selectedBlokId);
         $this->selectedBlokId = $this->blok->id;
+        $this->changedStudents = [];
     }
 
     public function updatedSelectedGroupId()
@@ -86,121 +91,108 @@ public function updatedSelectedBlokId()
         $this->updateStudentScores();
     }
 
-    public function save()
-    {
-        $this->updateStudentScores();
-        $this->dispatch('study-point-matrix-changed');
-    }
-
-    public function startFloodFill($feedbackmomentId)
+    public function updatedStudents($value, $key)
     {
-        $studentCount = count($this->students);
-        $feedbackmoment = $this->blok->vakken->pluck('feedbackmomenten')->flatten()->firstWhere('id', $feedbackmomentId);
-
-        // Count the students that have a score for this feedbackmoment and wont be affected by the floodfill
-        $studentsWithScore = 0;
+        $parts = explode('.', $key);
+        $studentId = $parts[0];
+        $type = $parts[1];
 
-        foreach($this->students as $student)
-        {
-            if(isset($student->feedbackmomenten[$feedbackmomentId]))
-                $studentsWithScore++;
+        if ($type === 'bPointsOverview') {
+            $subjectId = $parts[count($parts) - 1];
+        } elseif ($type === 'feedbackmomenten') {
+            $subjectId = $parts[count($parts) - 2];
         }
 
-        $count = $studentCount - $studentsWithScore;
-
-        // TODO: Nice message that tells the user nobody will be affected by the floodfill
-        if ($count == 0)
-            return;
-
-        $this->floodFillCount = $count;
-        $this->floodFillSubject = $feedbackmoment;
-        $this->floodFillValue = $feedbackmoment->points;
+        $this->changedStudents[$studentId] = [
+            'type' => $type,
+            'subjectId' => $subjectId,
+            'score' => $value,
+        ];
     }
 
-    public function doFloodFill()
+    public function save()
     {
-        foreach($this->students as $key => $student)
-        {
-            if(!isset($student->feedbackmomenten[$this->floodFillSubject->id]))
-            {
-                $student->feedbackmomenten[$this->floodFillSubject->id] = $this->floodFillValue;
-                $this->updatedStudents($this->floodFillValue, $key . '.feedbackmomenten.' . $this->floodFillSubject->id);
+        foreach($this->changedStudents as $studentKey => $change) {
+            $student = $this->students[$studentKey];
+            $subjectId = $change['subjectId'];
+            $value = $change['score'];
+
+            if($change['type'] == 'bPointsOverview') {
+                $this->savePointsB($student, $subjectId, $value);
+            } else {
+                $this->savePointsA($student, $subjectId, $value);
             }
         }
 
-        $this->cancelFloodFill();
-    }
-
-    public function cancelFloodFill()
-    {
-        $this->floodFillValue = -1;
-        $this->floodFillSubject = null;
-        $this->floodFillCount = null;
+        $this->changedStudents = [];
     }
 
-    public function updatedStudents($value, $key)
+    private function savePointsA($student, $feedbackmomentId, $value)
     {
-        $parts = explode('.', $key);
-        $studentKey = $parts[0];
-        $student = $this->students[$studentKey];
-
-        // handle b points update
-        // todo: maybe make a model out of B points...
-        if($parts[1] == 'bPointsOverview') {
-            $subjectId = $parts[count($parts) - 1];
-            $row = DB::table('student_scores_b')
-                ->where('student_id', $student->id)
-                ->where('subject_id', $subjectId)
-                ->first();
-
-            if (!$row) {
-                DB::table('student_scores_b')->insert([
-                    'student_id' => $student->id,
-                    'subject_id' => $subjectId,
-                    'score' => $value ?: 0,
-                    'teacher_id' => auth()->user()->id,
-                    'created_at' =>  \Carbon\Carbon::now(), // Not using Eloquent, so need to handle this manually..
-                    'updated_at' => \Carbon\Carbon::now(),  // Not using Eloquent, so need to handle this manually..
-                ]);
-                return;
-            }
-            if ($value == null) {
-                // If $value is null, delete the row
-                DB::table('student_scores_b')
-                    ->where('student_id', $student->id)
-                    ->where('subject_id', $subjectId)
-                    ->delete();
-            } else {
-                // If $value is not null, update the score
-                DB::table('student_scores_b')
-                    ->where('student_id', $student->id)
-                    ->where('subject_id', $subjectId)
-                    ->update([
-                        'score' => $value,
-                        'updated_at' => \Carbon\Carbon::now(),  // Not using Eloquent, so need to handle this manually..
-                    ]);
-            }
-            return;
-        }
-
-        $feedbackmomentId = $parts[count($parts) - 1];
+        $attempt = $student->feedbackmomenten[$feedbackmomentId]['attempt'];
 
         if($value == null)
         {
-            $score = StudentScore::where('student_id', $student->id)->where('feedbackmoment_id', $feedbackmomentId)->first();
+            $score = StudentScore::where('student_id', $student->id)
+                ->where('feedbackmoment_id', $feedbackmomentId)
+                ->where('attempt', $attempt)
+                ->first();
             $score?->delete();
         }
         else
         {
+            $attempt = $attempt ?? 1;
             $updatedScores = [
                 [
                     'student_id' => $student->id,
                     'feedbackmoment_id' => $feedbackmomentId,
                     'teacher_id' => auth()->user()->id,
-                    'score' => $value ?: 0
+                    'score' => $value ?: 0,
+                    'attempt' => $attempt,
                 ],
             ];
+
             StudentScore::updateFeedbackForStudents($updatedScores);
+            $student->feedbackmomenten[$feedbackmomentId]['attempt'] = $attempt;
+        }
+    }
+
+    private function savePointsB($student, $subjectId, $value)
+    {
+        // TODO: Make a model out of B points...
+        $row = DB::table('student_scores_b')
+            ->where('student_id', $student->id)
+            ->where('subject_id', $subjectId)
+            ->first();
+
+        if (!$row) {
+            DB::table('student_scores_b')->insert([
+                'student_id' => $student->id,
+                'subject_id' => $subjectId,
+                'score' => $value ?: 0,
+                'teacher_id' => auth()->user()->id,
+                'created_at' =>  \Carbon\Carbon::now(), // Not using Eloquent, so need to handle this manually..
+                'updated_at' => \Carbon\Carbon::now(),  // Not using Eloquent, so need to handle this manually..
+            ]);
+
+            return;
+        }
+
+        if ($value == null) {
+            // If $value is null, delete the row
+            DB::table('student_scores_b')
+                ->where('student_id', $student->id)
+                ->where('subject_id', $subjectId)
+                ->delete();
+        } else {
+            // If $value is not null, update the score
+            DB::table('student_scores_b')
+                ->where('student_id', $student->id)
+                ->where('subject_id', $subjectId)
+                ->update([
+                    'score' => $value,
+                    'updated_at' => \Carbon\Carbon::now(),  // Not using Eloquent, so need to handle this manually..
+                ]);
         }
     }
 }
diff --git a/resources/views/components/button-icon.blade.php b/resources/views/components/button-icon.blade.php
index eeef742..d8974c6 100644
--- a/resources/views/components/button-icon.blade.php
+++ b/resources/views/components/button-icon.blade.php
@@ -1,9 +1,12 @@
+@props(['icon', 'compact' => false])
 <button {{ $attributes->class([
-    'flex flex-row items-center justify-center h-full p-2 cursor-pointer gap-1 bg-emerald-300 rounded hover:shadow-sm active:bg-gray-200'
+    'flex flex-row items-center justify-center cursor-pointer gap-1 rounded hover:shadow-sm active:bg-gray-200 disabled:opacity-50 disabled:cursor-not-allowed',
+    'h-full p-2 bg-emerald-300' => !$compact,
+    'p-1' => $compact,
 ])->merge(['type' => 'button'])
 }}>
-    <x-dynamic-component :component="'icon.'.$icon" class="w-6 h-6" />
+    <x-dynamic-component :component="'icon.'.$icon" :compact="$compact" />
     @if ($slot->isNotEmpty())
-        <span class="font-semibold">{{ $slot }}</span>
+        <span class="font-semibold @if($compact) text-sm @endif">{{ $slot }}</span>
     @endif
 </button>
diff --git a/resources/views/components/icon/base.blade.php b/resources/views/components/icon/base.blade.php
new file mode 100644
index 0000000..9359d41
--- /dev/null
+++ b/resources/views/components/icon/base.blade.php
@@ -0,0 +1,9 @@
+@props(['compact' => false])
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" {{
+    $attributes->class([
+        'h-3 w-3' => $compact,
+        'h-6 w-6' => !$compact,
+    ]);
+}}>
+    {{ $slot }}
+</svg>
diff --git a/resources/views/components/icon/close.blade.php b/resources/views/components/icon/close.blade.php
index 3045e26..5f9fe66 100644
--- a/resources/views/components/icon/close.blade.php
+++ b/resources/views/components/icon/close.blade.php
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" {{
-    $attributes->class('w-6 h-6')
-}}>
+<x-icon.base {{ $attributes }}>
     <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
-</svg>
+</x-icon.base>
diff --git a/resources/views/components/icon/edit.blade.php b/resources/views/components/icon/edit.blade.php
index 84a67c5..9298e87 100644
--- a/resources/views/components/icon/edit.blade.php
+++ b/resources/views/components/icon/edit.blade.php
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" {{
-    $attributes->class('w-6 h-6')
-}}>
+<x-icon.base {{ $attributes }}>
     <path stroke-linecap="round" stroke-linejoin="round" d="M16.862 4.487l1.687-1.688a1.875 1.875 0 112.652 2.652L10.582 16.07a4.5 4.5 0 01-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 011.13-1.897l8.932-8.931zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0115.75 21H5.25A2.25 2.25 0 013 18.75V8.25A2.25 2.25 0 015.25 6H10" />
-</svg>
+</x-icon.base>
diff --git a/resources/views/components/icon/filter.blade.php b/resources/views/components/icon/filter.blade.php
index ba9e079..631ce22 100644
--- a/resources/views/components/icon/filter.blade.php
+++ b/resources/views/components/icon/filter.blade.php
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" {{
-    $attributes->class('w-6 h-6')
-}}>
+<x-icon.base {{ $attributes }}>
     <path stroke-linecap="round" stroke-linejoin="round" d="M12 3c2.755 0 5.455.232 8.083.678.533.09.917.556.917 1.096v1.044a2.25 2.25 0 01-.659 1.591l-5.432 5.432a2.25 2.25 0 00-.659 1.591v2.927a2.25 2.25 0 01-1.244 2.013L9.75 21v-6.568a2.25 2.25 0 00-.659-1.591L3.659 7.409A2.25 2.25 0 013 5.818V4.774c0-.54.384-1.006.917-1.096A48.32 48.32 0 0112 3z" />
-</svg>
+</x-icon.base>
diff --git a/resources/views/components/icon/loading.blade.php b/resources/views/components/icon/loading.blade.php
index 6c40ac9..673a7c1 100644
--- a/resources/views/components/icon/loading.blade.php
+++ b/resources/views/components/icon/loading.blade.php
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" {{
-    $attributes->class('w-6 h-6')
-}}>
+<x-icon.base {{ $attributes }}>
     <path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0l3.181 3.183a8.25 8.25 0 0013.803-3.7M4.031 9.865a8.25 8.25 0 0113.803-3.7l3.181 3.182m0-4.991v4.99" />
-</svg>
+</x-icon.base>
diff --git a/resources/views/components/icon/save.blade.php b/resources/views/components/icon/save.blade.php
index 8685721..556f1f4 100644
--- a/resources/views/components/icon/save.blade.php
+++ b/resources/views/components/icon/save.blade.php
@@ -1,5 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" {{
-    $attributes->class('w-6 h-6')
-}}>
+<x-icon.base {{ $attributes }}>
     <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
-</svg>
+</x-icon.base>
diff --git a/resources/views/components/icon/stack.blade.php b/resources/views/components/icon/stack.blade.php
new file mode 100644
index 0000000..0c9caa9
--- /dev/null
+++ b/resources/views/components/icon/stack.blade.php
@@ -0,0 +1,3 @@
+<x-icon.base {{ $attributes }}>
+    <path stroke-linecap="round" stroke-linejoin="round" d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122" />
+</x-icon.base>
diff --git a/resources/views/components/icon/tag.blade.php b/resources/views/components/icon/tag.blade.php
index 05366f2..a49814e 100644
--- a/resources/views/components/icon/tag.blade.php
+++ b/resources/views/components/icon/tag.blade.php
@@ -1,6 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" {{
-    $attributes->class('w-6 h-6')
-}}>
+<x-icon.base {{ $attributes }}>
     <path stroke-linecap="round" stroke-linejoin="round" d="M9.568 3H5.25A2.25 2.25 0 003 5.25v4.318c0 .597.237 1.17.659 1.591l9.581 9.581c.699.699 1.78.872 2.607.33a18.095 18.095 0 005.223-5.223c.542-.827.369-1.908-.33-2.607L11.16 3.66A2.25 2.25 0 009.568 3z" />
     <path stroke-linecap="round" stroke-linejoin="round" d="M6 6h.008v.008H6V6z" />
-</svg>
+</x-icon.base>
diff --git a/resources/views/components/matrix/a-points-table-body.blade.php b/resources/views/components/matrix/a-points-table-body.blade.php
index e9bad7a..ac9a223 100644
--- a/resources/views/components/matrix/a-points-table-body.blade.php
+++ b/resources/views/components/matrix/a-points-table-body.blade.php
@@ -30,7 +30,8 @@ class="whitespace-nowrap left-0 sticky z-10 flex justify-between items-center {{
                     @foreach ($vak->feedbackmomenten as $feedbackmoment)
                         @php $columnIndex++; @endphp
                         <td class="p-0 relative z-0 h-auto" style="min-width: 50px;"
-                            wire:key="fbm-{{ $feedbackmoment->id }}-student-{{ $student->id }}-blok-{{ $blok->id }}-{{ time() }}"
+                            wire:key="fbm-{{ $feedbackmoment->id }}-student-{{ $student->id }}-blok-{{ $blok->id }}"
+                            x-data="{ studentScore: @entangle('students.'. $key .'.feedbackmomenten.'. $feedbackmoment->id) }"
                             @mouseenter="hoverRow = '{{ $student->id }}'; hoverColumn = '{{ $feedbackmoment->code }}'"
                             @mouseleave="hoverRow = null; hoverColumn = null">
                             <input type="number" class="w-full h-full nospin text-center absolute bottom-0 top-0 left-0 right-0 border
@@ -44,13 +45,22 @@ class="whitespace-nowrap left-0 sticky z-10 flex justify-between items-center {{
                                 }"
                                 step="1" min="0" max="{{ $feedbackmoment->points }}"
                                 tabindex="{{ $columnIndex.$studentIndex }}"
-                                wire:model="students.{{ $key }}.feedbackmomenten.{{ $feedbackmoment->id }}"
-                                x-on:input="changesMade['{{ $student->id }} - {{ $feedbackmoment->id }}'] = true"
+                                wire:model.live="students.{{ $key }}.feedbackmomenten.{{ $feedbackmoment->id }}.score"
+                                x-bind:title="studentScore.attempt ? 'Poging ' + studentScore.attempt : ''"
                                 x-on:focus="hoverRow = '{{ $student->id }}'; hoverColumn = '{{ $feedbackmoment->code }}'" />
+
+                            <x-button-icon icon="stack"
+                                x-cloak
+                                x-show="studentScore.attempt && hoverRow === '{{ $student->id }}' && hoverColumn === '{{ $feedbackmoment->code }}'"
+                                class="absolute top-0 right-0"
+                                compact
+                                title="Beheer alle pogingen"
+                                wire:click="startManageAttempts('{{ $student->id }}', {{ $feedbackmoment->id }})">
+                            </x-button-icon>
                         </td>
                     @endforeach
                 @endforeach
             </x-table.tr>
         @endforeach
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/resources/views/components/matrix/b-points-table-body.blade.php b/resources/views/components/matrix/b-points-table-body.blade.php
index 52c14f6..0dd354b 100644
--- a/resources/views/components/matrix/b-points-table-body.blade.php
+++ b/resources/views/components/matrix/b-points-table-body.blade.php
@@ -26,7 +26,7 @@ class="whitespace-nowrap left-0 sticky z-10 flex justify-between items-center {{
 
                 @foreach ($this->blok->vakken as $vak)
                     <td class="p-0 relative z-0 h-auto" style="min-width: 80px;"
-                        wire:key="vak-{{ $vak->uitvoer_id }}-student-{{ $student->id }}-blok-{{ $this->blok->id }}-{{ time() }}"
+                        wire:key="vak-{{ $vak->uitvoer_id }}-student-{{ $student->id }}-blok-{{ $this->blok->id }}"
                         @mouseenter="hoverRow = '{{ $student->id }}'; hoverColumn = '{{ $vak->uitvoer_id }}'"
                         @mouseleave="hoverRow = null; hoverColumn = null">
 
@@ -40,8 +40,7 @@ class="whitespace-nowrap left-0 sticky z-10 flex justify-between items-center {{
                         }"
                         step="1" min="0" max="2"
                         tabindex="{{ $loop->iteration.$studentIndex }}"
-                        wire:model="students.{{ $key }}.bPointsOverview.{{$vak->uitvoer_id}}"
-                        x-on:input="changesMade['{{ $student->id }} - b{{ $vak->uitvoer_id }}'] = true" --}}
+                        wire:model.live="students.{{ $key }}.bPointsOverview.{{$vak->uitvoer_id}}"
                         x-on:focus="hoverRow = '{{ $student->id }}'; hoverColumn = '{{ $vak->uitvoer_id }}'" />
                     </td>
                 @endforeach
diff --git a/resources/views/livewire/study-point-matrix.blade.php b/resources/views/livewire/study-point-matrix.blade.php
index ebd113c..a64b0d7 100644
--- a/resources/views/livewire/study-point-matrix.blade.php
+++ b/resources/views/livewire/study-point-matrix.blade.php
@@ -1,10 +1,49 @@
 <div x-data="{
-        showPoints: 'a',
+        showPoints: @entangle('showPoints').live,
         hoverRow: null,
         hoverColumn: null,
-        changesMade: {},
+        changesMade: @entangle('changedStudents'),
+        lastChangeCount: 0,
+
+        {{-- Warn the user if the page unloads, do the same if they try go back (popstate) --}}
+        onbeforeunload: (event) => {
+            event.preventDefault();
+            event.returnValue = '';
+
+            return 'Je hebt nog niet opgeslagen! Als je nu weg gaat gaan alle wijzigingen verloren.';
+        },
+        onpopstate: (event) => {
+            event.preventDefault();
+            event.returnValue = '';
+            alert('Je hebt nog niet opgeslagen! Als je nu verder terug gaat gaan alle wijzigingen verloren.');
+        },
+    }"
+    x-effect="() => {
+        const changes = Object.keys(changesMade).length;
+        if(changes > 0 && changes != lastChangeCount)
+        {
+            document.title = `(${changes}) {{ config('app.name') }}`;
+
+            if (lastChangeCount === 0) {
+                {{-- We add the same page so we can warn before the user goes back --}}
+                history.pushState({}, '', window.location.href);
+                history.pushState({}, '', window.location.href); {{-- If we only push once Livewire overrides it? --}}
+                window.addEventListener('beforeunload', onbeforeunload);
+                window.addEventListener('popstate', onpopstate);
+            }
+
+            lastChangeCount = changes;
+        }
+        else if(changes == 0)
+        {
+            document.title = `{{ config('app.name') }}`;
+            window.removeEventListener('beforeunload', onbeforeunload);
+            window.removeEventListener('popstate', onpopstate);
+        }
     }"
-    x-on:study-point-matrix-changed.window="changesMade = {}">
+    {{-- Ctrl + S --}}
+    x-on:keydown.window="if(Object.keys(changesMade).length > 0 && event.ctrlKey && event.key == 's') { event.preventDefault(); $wire.save(); }"
+    >
     @php $currentWeek = \App\Models\SchoolWeek::getCurrentWeekNumber() ?? 0; @endphp
 
     <div class="flex flex-row items-center justify-between bg-gray-100 shadow p-2 px-4 sticky top-0 z-50 h-14">
@@ -38,6 +77,8 @@
             <x-button-icon icon="save"
                 x-cloak
                 wire:click="save"
+                wire:loading.attr="disabled"
+                wire:target="students"
                 class="relative h-9"
                 x-show="Object.keys(changesMade).length > 0">
                 <x-badge color="bg-red-500"
@@ -79,9 +120,15 @@ class="absolute -top-1 -right-1">
         </form>
     @endif
 
-    <div id="loadingIndicator" wire:ignore>
-        <div class="fixed z-[100] inset-0 grid place-content-center bg-gray-100 bg-opacity-75">
-            <x-icon.loading class="w-10 h-10 text-gray-600 animate-spin" />
+    {{--
+        We want to show a loading indicator for everything, except for changes on students, so we use this technique:
+        https://github.com/livewire/livewire/discussions/3855#discussioncomment-6337044
+    --}}
+    <div wire:loading.remove wire:target="students">
+        <div id="loadingIndicator" wire:loading>
+            <div class="fixed z-[100] inset-0 grid place-content-center bg-gray-100 bg-opacity-75">
+                <x-icon.loading class="w-10 h-10 text-gray-600 animate-spin" />
+            </div>
         </div>
     </div>
 
@@ -94,11 +141,55 @@ class="absolute -top-1 -right-1">
                 'feedbackmoment' => $floodFillSubject->naam,
                 'fb_code' => $floodFillSubject->code
             ]) }}</span> van de <span class="font-semibold">{{ $floodFillCount }}</span> studenten in deze klas wilt overschrijven met de waarde <span class="font-semibold">{{ $floodFillValue }}</span>?</p>
-            <p class="mt-4"><span class="font-semibold">Je kunt deze actie niet ongedaan maken!</span></p>
 
             <x-slot name="footer">
                 <x-button-icon icon="close" wire:click="cancelFloodFill" wire:loading.attr="disabled">Annuleren</x-button-icon>
-                <x-button-icon icon="save" wire:click="doFloodFill" class="bg-red-500 hover:bg-red-600" wire:loading.attr="disabled">Vullen</x-button-icon>
+                <x-button-icon icon="save" wire:click="doFloodFill" class="bg-orange-500 hover:bg-orange-600" wire:loading.attr="disabled">Vullen</x-button-icon>
+            </x-slot>
+        </x-modal.confirmation>
+        @endif
+
+        @if (!empty($manageAttempts))
+        <x-modal.confirmation cancel="$wire.cancelManageAttempts()">
+            <x-slot name="title">Pogingen van {{ $manageAttemptsStudent->name }}</x-slot>
+
+            <p class="mb-4 font-semibold rounded bg-orange-300 p-2">
+                Let op! Deze wijzigingen (ook verwijderen) worden direct opgeslagen.
+            </p>
+
+            <p>Dit @if (count($manageAttempts) == 1) is de poging @else zijn de pogingen @endif van {{ $manageAttemptsStudent->name }} bij <span class="font-semibold">{{ __('":feedbackmoment (:fb_code)"', [
+                'feedbackmoment' => $manageAttemptsFeedbackmoment->naam,
+                'fb_code' => $manageAttemptsFeedbackmoment->code
+            ]) }}</span>:</p>
+
+            <div class="mt-4 space-y-2">
+                @foreach ($manageAttempts as $studentScoreId => $studentScore)
+                    <div class="flex flex-row items-center gap-4"
+                        wire:key="manageAttempts-{{ $studentScoreId }}">
+                        <span class="font-semibold shrink-0">Poging {{ $studentScore['attempt'] }}:</span>
+                        <x-input.text wire:model="manageAttempts.{{ $studentScoreId }}.score" class="grow w-full" />
+                        @if ($loop->last)
+                            <x-button-icon icon="close" compact wire:click="removeAttempt({{ $studentScoreId }})" class="bg-red-300 hover:bg-red-400" wire:loading.attr="disabled">Verwijderen</x-button-icon>
+                        @endif
+                    </div>
+                @endforeach
+
+                @if ($manageAttemptsNew > -1)
+                    <div class="flex flex-row items-center gap-4">
+                        <span class="font-semibold shrink-0">Nieuwe poging:</span>
+                        <x-input.text wire:model="manageAttemptsNew" class="grow w-full" autofocus x-init="$el.select()" />
+                        <x-button-icon icon="close" compact wire:click="removeNewAttempt" class="bg-red-300 hover:bg-red-400" wire:loading.attr="disabled">Verwijderen</x-button-icon>
+                    </div>
+                @else
+                    <div class="flex justify-center">
+                        <x-button-icon icon="tag" compact wire:click="addNewAttempt" class="bg-green-300 hover:bg-green-400" wire:loading.attr="disabled">Nieuwe Poging Toevoegen</x-button-icon>
+                    </div>
+                @endif
+            </div>
+
+            <x-slot name="footer">
+                <x-button-icon icon="close" wire:click="cancelManageAttempts" wire:loading.attr="disabled">Annuleren</x-button-icon>
+                <x-button-icon icon="save" wire:click="doManageAttempts" class="bg-orange-500 hover:bg-orange-600" wire:loading.attr="disabled">Direct opslaan</x-button-icon>
             </x-slot>
         </x-modal.confirmation>
         @endif
diff --git a/resources/views/student.blade.php b/resources/views/student.blade.php
index 182e147..276e033 100644
--- a/resources/views/student.blade.php
+++ b/resources/views/student.blade.php
@@ -61,13 +61,13 @@
                             <x-table.thfbm studentView="true" :loop="$loop" :fbmsActive="$fbmsActive" :currentWeek="$currentWeek" :feedbackmoment="$feedbackmoment">{{ str_pad($feedbackmoment->week, 2, "0", STR_PAD_LEFT) }}</x-table.thfbm>
                             <x-table.thfbm studentView="true" :loop="$loop" :fbmsActive="$fbmsActive" :currentWeek="$currentWeek" :feedbackmoment="$feedbackmoment" class="text-left overflow:hidden text-ellipsis sm:truncate sm:max-w-md font-normal text-xs sm:text-sm" title="{{ $feedbackmoment->naam }}">{{ $feedbackmoment->naam }}</x-table.thfbm>
                             <x-table.thfbm studentView="true" :loop="$loop" :fbmsActive="$fbmsActive" :currentWeek="$currentWeek" :feedbackmoment="$feedbackmoment">{{ str_pad($feedbackmoment->points, 2, "0", STR_PAD_LEFT) }}</x-table.thfbm>
-                            @if(isset($student->feedbackmomenten[$feedbackmoment->id]) && $fbmsActive->pluck('id')->contains($feedbackmoment->id))
-                                <x-table.th zebra="{{ $loop->parent->even }}" red="{{ $student->feedbackmomenten[$feedbackmoment->id] < $feedbackmoment->points }}">
-                                    {{ $student->feedbackmomenten[$feedbackmoment->id] }}
+                            @if(isset($student->feedbackmomenten[$feedbackmoment->id]['score']) && $fbmsActive->pluck('id')->contains($feedbackmoment->id))
+                                <x-table.th zebra="{{ $loop->parent->even }}" red="{{ $student->feedbackmomenten[$feedbackmoment->id]['score'] < $feedbackmoment->points }}">
+                                    {{ $student->feedbackmomenten[$feedbackmoment->id]['score'] }}
                                 </x-table.th>
                             @elseif(isset($student->feedbackmomenten[$feedbackmoment->id]))
                                 <x-table.th zebra="{{ $loop->parent->even }}" class="text-gray-300">
-                                    {{ $student->feedbackmomenten[$feedbackmoment->id] }}
+                                    {{ $student->feedbackmomenten[$feedbackmoment->id]['score'] }}
                                 </x-table.th>
                             @elseif($fbmsActive->pluck('id')->contains($feedbackmoment->id))
                                 <x-table.th zebra="{{ $loop->parent->even }}" class="border-yellow-400 border-2"></x-table.th>