diff --git a/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
index 64943027bfa78a70aa978fbc1252b3062ea6e5d2..47031832edd1744334295f9182a01b121c9153c3 100644
--- a/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-26 16:10+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,12 +22,12 @@ msgstr ""
 msgid "Homework for the next lesson"
 msgstr ""
 
-#: forms.py:50 templates/alsijil/print/full_register.html:181
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr ""
 
-#: forms.py:56 templates/alsijil/print/full_register.html:152
-#: templates/alsijil/print/full_register.html:183
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr ""
 
@@ -47,30 +47,31 @@ msgstr ""
 msgid "From period"
 msgstr ""
 
-#: forms.py:105 templates/alsijil/class_register/lesson.html:150
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr ""
 
-#: forms.py:107 templates/alsijil/class_register/lesson.html:151
-#: templates/alsijil/class_register/week_view.html:93
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
+#: templates/alsijil/class_register/week_view.html:109
 #: templates/alsijil/print/full_register.html:75
-#: templates/alsijil/print/full_register.html:305
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr ""
 
-#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
 #: templates/alsijil/print/full_register.html:84
-#: templates/alsijil/print/full_register.html:280
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr ""
 
-#: forms.py:109 templates/alsijil/class_register/lesson.html:155
-#: templates/alsijil/class_register/lesson.html:195
-#: templates/alsijil/print/full_register.html:307
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr ""
 
@@ -86,78 +87,77 @@ msgstr ""
 msgid "Register absence"
 msgstr ""
 
-#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
-msgid "Personal note filters"
-msgstr ""
-
-#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
 #: templates/alsijil/excuse_type/list.html:9
 msgid "Excuse types"
 msgstr ""
 
-#: models.py:18
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+
+#: models.py:18 models.py:124
 msgid "Short name"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 models.py:126
 msgid "Name"
 msgstr ""
 
-#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
-#: templates/alsijil/class_register/lesson.html:187
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
 msgid "Excuse type"
 msgstr ""
 
-#: models.py:70
+#: models.py:75
 msgid "Personal note"
 msgstr ""
 
-#: models.py:71 templates/alsijil/class_register/lesson.html:143
-#: templates/alsijil/class_register/week_view.html:88
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
 msgid "Personal notes"
 msgstr ""
 
-#: models.py:94 templates/alsijil/print/full_register.html:357
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:95 templates/alsijil/print/full_register.html:358
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr ""
 
-#: models.py:96
+#: models.py:102
 msgid "Group note"
 msgstr ""
 
-#: models.py:99 templates/alsijil/class_register/lesson.html:119
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
 msgid "Lesson documentation"
 msgstr ""
 
-#: models.py:100
+#: models.py:107
 msgid "Lesson documentations"
 msgstr ""
 
-#: models.py:114
-msgid "Identifier"
+#: models.py:137
+msgid "Extra mark"
 msgstr ""
 
-#: models.py:120 templates/alsijil/print/full_register.html:253
-msgid "Description"
+#: preferences.py:16
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
 
-#: models.py:124
-msgid "Match expression"
-msgstr ""
-
-#: models.py:128
-msgid "Personal note filter"
-msgstr ""
-
-#: tables.py:17 tables.py:31
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
 
-#: tables.py:37
+#: tables.py:22 tables.py:42
 msgid "Delete"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgid "Lesson"
 msgstr ""
 
 #: templates/alsijil/class_register/lesson.html:14
-#: templates/alsijil/class_register/lesson.html:71
+#: templates/alsijil/class_register/lesson.html:83
 #, python-format
 msgid "%(period)s. period"
 msgstr ""
@@ -184,40 +184,41 @@ msgstr ""
 msgid "Next lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:70
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
+msgid "Change history"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:82
 msgid "Overview: Previous lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:77
+#: templates/alsijil/class_register/lesson.html:89
 msgid "Lesson topic of previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:84
+#: templates/alsijil/class_register/lesson.html:96
 msgid "Homework for this lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:91
+#: templates/alsijil/class_register/lesson.html:103
 msgid "Group notes for previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:98
+#: templates/alsijil/class_register/lesson.html:110
 msgid "Absent persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:105
+#: templates/alsijil/class_register/lesson.html:117
 msgid "Late persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:130
-msgid "Change history"
-msgstr ""
-
-#: templates/alsijil/class_register/lesson.html:152
-#: templates/alsijil/print/full_register.html:292
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:173
+#: templates/alsijil/class_register/lesson.html:188
 msgid "Tardiness (in m)"
 msgstr ""
 
@@ -238,29 +239,33 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:51
-#: templates/alsijil/print/full_register.html:151
-#: templates/alsijil/print/full_register.html:182
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Groups"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:52
+#: templates/alsijil/class_register/week_view.html:55
 msgid "Teachers"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:94
+#: templates/alsijil/class_register/week_view.html:110
 msgid "unexcused"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:97
+#: templates/alsijil/class_register/week_view.html:113
 msgid "Summed up tardiness"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:121
+#: templates/alsijil/class_register/week_view.html:142
 msgid "No lessons available"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:124
+#: templates/alsijil/class_register/week_view.html:145
 msgid ""
 "\n"
 "            There are no lessons for the selected group or teacher in this week.\n"
@@ -286,13 +291,24 @@ msgid ""
 "    "
 msgstr ""
 
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:114
+#: templates/alsijil/print/full_register.html:126
 msgid "(e)"
 msgstr ""
 
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:118
+#: templates/alsijil/print/full_register.html:130
 msgid "(u)"
 msgstr ""
 
@@ -301,44 +317,22 @@ msgid "Data complete"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:12
-msgid "Missing data"
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:14
-msgid "Pending"
+msgid "Missing data"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:18
-#: templates/alsijil/print/full_register.html:392
-msgid "Lesson cancelled"
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:20
+#: templates/alsijil/partials/lesson_status_icon.html:18
 msgid "Substitution"
 msgstr ""
 
-#: templates/alsijil/personal_note_filter/list.html:7
-msgid "All personal note filters"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/list.html:12
-msgid "Add filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:7
-#: templates/alsijil/personal_note_filter/manage.html:14
-msgid "Update personal note filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:9
-#: templates/alsijil/personal_note_filter/manage.html:16
-msgid "Create personal note filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:29
-msgid "Delete filter"
-msgstr ""
-
 #: templates/alsijil/print/full_register.html:6
 msgid "Class register:"
 msgstr ""
@@ -395,7 +389,7 @@ msgid "Late"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:81
-#: templates/alsijil/print/full_register.html:288
+#: templates/alsijil/print/full_register.html:283
 msgid "Unexcused"
 msgstr ""
 
@@ -403,174 +397,174 @@ msgstr ""
 msgid "Custom excuse types"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:108
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:109
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:110
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:111
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:112
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:113
+#: templates/alsijil/print/full_register.html:125
 msgid "(a)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:131
 msgid "(b)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:146
+#: templates/alsijil/print/full_register.html:164
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:153
-#: templates/alsijil/print/full_register.html:184
+#: templates/alsijil/print/full_register.html:171
+#: templates/alsijil/print/full_register.html:202
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:154
-#: templates/alsijil/print/full_register.html:185
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:155
-#: templates/alsijil/print/full_register.html:186
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:176
+#: templates/alsijil/print/full_register.html:194
 msgid "Teachers and lessons in child groups"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:209
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:211
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:249
-msgid "Statistics on remarks"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:254
-msgid "Count"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:271
+#: templates/alsijil/print/full_register.html:266
 msgid "Absences and tardiness"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:269
 msgid "Absences"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:279
+#: templates/alsijil/print/full_register.html:274
 msgid "thereof"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:297
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:301
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:302
-#: templates/alsijil/print/full_register.html:355
+#: templates/alsijil/print/full_register.html:309
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:303
-#: templates/alsijil/print/full_register.html:356
+#: templates/alsijil/print/full_register.html:310
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:304
-#: templates/alsijil/print/full_register.html:360
+#: templates/alsijil/print/full_register.html:311
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:306
+#: templates/alsijil/print/full_register.html:313
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:322
+#: templates/alsijil/print/full_register.html:330
 msgid "Yes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:327
-#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:335
 #: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
 msgid "e"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:349
+#: templates/alsijil/print/full_register.html:363
 msgid "Lesson documentation for week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:359
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr ""
 
-#: views.py:66
+#: views.py:76
 msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
 
-#: views.py:80
+#: views.py:90
 msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""
 
-#: views.py:106
+#: views.py:116
 msgid "The lesson documentation has been saved."
 msgstr ""
 
-#: views.py:121
+#: views.py:136
 msgid "The personal notes have been saved."
 msgstr ""
 
-#: views.py:303
+#: views.py:327
 msgid "There is no current school term."
 msgstr ""
 
-#: views.py:419
+#: views.py:463
 msgid "The absence has been saved."
 msgstr ""
 
-#: views.py:459
-msgid "The filter has been saved"
+#: views.py:488
+msgid "The extra mark has been created."
+msgstr ""
+
+#: views.py:499
+msgid "The extra mark has been saved."
 msgstr ""
 
-#: views.py:474
-msgid "The filter has been deleted."
+#: views.py:509
+msgid "The extra mark has been deleted."
 msgstr ""
 
-#: views.py:497
+#: views.py:529
 msgid "The excuse type has been created."
 msgstr ""
 
-#: views.py:508
+#: views.py:540
 msgid "The excuse type has been saved."
 msgstr ""
 
-#: views.py:518
+#: views.py:550
 msgid "The excuse type has been deleted."
 msgstr ""
diff --git a/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
index 313e646aad1f8c1d8a03700663b828677589187b..92b8e2184aebf42c4428476de9530af7403b0219 100644
--- a/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/de_DE/LC_MESSAGES/django.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-26 16:10+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: 2020-08-03 18:01+0000\n"
 "Last-Translator: magicfelix <felix@felix-zauberer.de>\n"
-"Language-Team: German <https://translate.edugit.org/projects/aleksis/"
-"aleksis-app-alsijil/de/>\n"
+"Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/de/>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +22,12 @@ msgstr ""
 msgid "Homework for the next lesson"
 msgstr "Hausaufgabe zur nächsten Stunde"
 
-#: forms.py:50 templates/alsijil/print/full_register.html:181
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr "Gruppe"
 
-#: forms.py:56 templates/alsijil/print/full_register.html:152
-#: templates/alsijil/print/full_register.html:183
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr "Lehrkraft"
 
@@ -48,30 +47,31 @@ msgstr "Enddatum"
 msgid "From period"
 msgstr "Ab Stunde"
 
-#: forms.py:105 templates/alsijil/class_register/lesson.html:150
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr "Person"
 
-#: forms.py:107 templates/alsijil/class_register/lesson.html:151
-#: templates/alsijil/class_register/week_view.html:93
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
+#: templates/alsijil/class_register/week_view.html:109
 #: templates/alsijil/print/full_register.html:75
-#: templates/alsijil/print/full_register.html:305
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr "Abwesend"
 
-#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
 #: templates/alsijil/print/full_register.html:84
-#: templates/alsijil/print/full_register.html:280
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr "Entschuldigt"
 
-#: forms.py:109 templates/alsijil/class_register/lesson.html:155
-#: templates/alsijil/class_register/lesson.html:195
-#: templates/alsijil/print/full_register.html:307
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr "Bemerkungen"
 
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr "Klassenbuch"
 
@@ -87,78 +87,77 @@ msgstr "Aktuelle Woche"
 msgid "Register absence"
 msgstr "Abwesenheit eintragen"
 
-#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
-msgid "Personal note filters"
-msgstr "Filter für persönliche Notizen"
-
-#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
 #: templates/alsijil/excuse_type/list.html:9
 msgid "Excuse types"
 msgstr "Entschuldigungsarten"
 
-#: models.py:18
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+
+#: models.py:18 models.py:124
 msgid "Short name"
 msgstr "Kurzname"
 
-#: models.py:20
+#: models.py:20 models.py:126
 msgid "Name"
 msgstr "Name"
 
-#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
-#: templates/alsijil/class_register/lesson.html:187
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
 msgid "Excuse type"
 msgstr "Entschuldigungsart"
 
-#: models.py:70
+#: models.py:75
 msgid "Personal note"
 msgstr "Persönliche Notiz"
 
-#: models.py:71 templates/alsijil/class_register/lesson.html:143
-#: templates/alsijil/class_register/week_view.html:88
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
 msgid "Personal notes"
 msgstr "Persönliche Notizen"
 
-#: models.py:94 templates/alsijil/print/full_register.html:357
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr "Stundenthema"
 
-#: models.py:95 templates/alsijil/print/full_register.html:358
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr "Hausaufgaben"
 
-#: models.py:96
+#: models.py:102
 msgid "Group note"
 msgstr "Gruppennotiz"
 
-#: models.py:99 templates/alsijil/class_register/lesson.html:119
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
 msgid "Lesson documentation"
 msgstr "Stunden-Dokumentation"
 
-#: models.py:100
+#: models.py:107
 msgid "Lesson documentations"
 msgstr "Stunden-Dokumentationen"
 
-#: models.py:114
-msgid "Identifier"
-msgstr "Kennung"
-
-#: models.py:120 templates/alsijil/print/full_register.html:253
-msgid "Description"
-msgstr "Beschreibung"
-
-#: models.py:124
-msgid "Match expression"
-msgstr "Suchausdruck"
+#: models.py:137
+msgid "Extra mark"
+msgstr ""
 
-#: models.py:128
-msgid "Personal note filter"
-msgstr "Filter für persönliche Notizen"
+#: preferences.py:16
+msgid "Block adding personal notes for cancelled lessons"
+msgstr ""
 
-#: tables.py:17 tables.py:31
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: tables.py:37
+#: tables.py:22 tables.py:42
 msgid "Delete"
 msgstr "Löschen"
 
@@ -172,7 +171,7 @@ msgid "Lesson"
 msgstr "Unterrichtsstunde"
 
 #: templates/alsijil/class_register/lesson.html:14
-#: templates/alsijil/class_register/lesson.html:71
+#: templates/alsijil/class_register/lesson.html:83
 #, python-format
 msgid "%(period)s. period"
 msgstr "%(period)s. Stunde"
@@ -185,40 +184,41 @@ msgstr "Vorherige Unterrichtsstunde"
 msgid "Next lesson"
 msgstr "Nächste Unterrichtsstunde"
 
-#: templates/alsijil/class_register/lesson.html:70
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
+msgid "Change history"
+msgstr "Veränderungen"
+
+#: templates/alsijil/class_register/lesson.html:82
 msgid "Overview: Previous lesson"
 msgstr "Ãœbersicht: Vorherige Stunde"
 
-#: templates/alsijil/class_register/lesson.html:77
+#: templates/alsijil/class_register/lesson.html:89
 msgid "Lesson topic of previous lesson:"
 msgstr "Stundenthema der vorherigen Stunde:"
 
-#: templates/alsijil/class_register/lesson.html:84
+#: templates/alsijil/class_register/lesson.html:96
 msgid "Homework for this lesson:"
 msgstr "Hausaufgaben zu dieser Stunde:"
 
-#: templates/alsijil/class_register/lesson.html:91
+#: templates/alsijil/class_register/lesson.html:103
 msgid "Group notes for previous lesson:"
 msgstr "Gruppennotizen für die vorherige Stunde:"
 
-#: templates/alsijil/class_register/lesson.html:98
+#: templates/alsijil/class_register/lesson.html:110
 msgid "Absent persons:"
 msgstr "Abwesende Personen:"
 
-#: templates/alsijil/class_register/lesson.html:105
+#: templates/alsijil/class_register/lesson.html:117
 msgid "Late persons:"
 msgstr "Verspätete Personen:"
 
-#: templates/alsijil/class_register/lesson.html:130
-msgid "Change history"
-msgstr "Veränderungen"
-
-#: templates/alsijil/class_register/lesson.html:152
-#: templates/alsijil/print/full_register.html:292
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr "Verspätung"
 
-#: templates/alsijil/class_register/lesson.html:173
+#: templates/alsijil/class_register/lesson.html:188
 msgid "Tardiness (in m)"
 msgstr "Verspätung (in m)"
 
@@ -239,37 +239,42 @@ msgstr "KW %(week)s: %(instance)s"
 msgid "Period"
 msgstr "Stunde"
 
-#: templates/alsijil/class_register/week_view.html:51
-#: templates/alsijil/print/full_register.html:151
-#: templates/alsijil/print/full_register.html:182
+#: templates/alsijil/class_register/week_view.html:52
+#, fuzzy
+#| msgid "Group"
+msgid "Groups"
+msgstr "Gruppe"
+
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
 msgid "Subject"
 msgstr "Fach"
 
-#: templates/alsijil/class_register/week_view.html:52
+#: templates/alsijil/class_register/week_view.html:55
 msgid "Teachers"
 msgstr "Lehrkräfte"
 
-#: templates/alsijil/class_register/week_view.html:94
+#: templates/alsijil/class_register/week_view.html:110
 msgid "unexcused"
 msgstr "unentschuldigt"
 
-#: templates/alsijil/class_register/week_view.html:97
+#: templates/alsijil/class_register/week_view.html:113
 msgid "Summed up tardiness"
 msgstr "Summierte Verspätung"
 
-#: templates/alsijil/class_register/week_view.html:121
+#: templates/alsijil/class_register/week_view.html:142
 msgid "No lessons available"
 msgstr "Keine Stunden verfügbar"
 
-#: templates/alsijil/class_register/week_view.html:124
+#: templates/alsijil/class_register/week_view.html:145
 msgid ""
 "\n"
 "            There are no lessons for the selected group or teacher in this week.\n"
 "          "
 msgstr ""
 "\n"
-"            Es gibt keine Stunden für die ausgewählte Gruppe oder Lehrkraft "
-"in dieser Woche.\n"
+"            Es gibt keine Stunden für die ausgewählte Gruppe oder Lehrkraft in dieser Woche.\n"
 "          "
 
 #: templates/alsijil/excuse_type/create.html:6
@@ -291,20 +296,28 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"      Diese Funktion sollte nur benutzt werden, um Alternativen zur normalen "
-"Entschuldigung, welche von sich aus extra gezählt wird, zu definieren.\n"
-"Benutzen Sie diese Funktion nicht, um eine Entschuldigungsart für normale "
-"Entschuldigungen zu erstellen oder wenn Sie nicht zwischen verschiedenen "
-"Entschuldigungsarten unterscheiden möchten.\n"
+"      Diese Funktion sollte nur benutzt werden, um Alternativen zur normalen Entschuldigung, welche von sich aus extra gezählt wird, zu definieren.\n"
+"Benutzen Sie diese Funktion nicht, um eine Entschuldigungsart für normale Entschuldigungen zu erstellen oder wenn Sie nicht zwischen verschiedenen Entschuldigungsarten unterscheiden möchten.\n"
 "    "
 
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:114
+#: templates/alsijil/print/full_register.html:126
 msgid "(e)"
 msgstr "(e)"
 
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:118
+#: templates/alsijil/print/full_register.html:130
 msgid "(u)"
 msgstr "(u)"
 
@@ -313,44 +326,22 @@ msgid "Data complete"
 msgstr "Daten vollständig"
 
 #: templates/alsijil/partials/lesson_status_icon.html:12
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
+msgstr "Stunde ist ausgefallen"
+
+#: templates/alsijil/partials/lesson_status_icon.html:14
 msgid "Missing data"
 msgstr "Fehlende Daten"
 
-#: templates/alsijil/partials/lesson_status_icon.html:14
+#: templates/alsijil/partials/lesson_status_icon.html:16
 msgid "Pending"
 msgstr "Findet gerade statt"
 
 #: templates/alsijil/partials/lesson_status_icon.html:18
-#: templates/alsijil/print/full_register.html:392
-msgid "Lesson cancelled"
-msgstr "Stunde ist ausgefallen"
-
-#: templates/alsijil/partials/lesson_status_icon.html:20
 msgid "Substitution"
 msgstr "Vertretung"
 
-#: templates/alsijil/personal_note_filter/list.html:7
-msgid "All personal note filters"
-msgstr "Alle Filter für persönliche Notizen"
-
-#: templates/alsijil/personal_note_filter/list.html:12
-msgid "Add filter"
-msgstr "Filter hinzufügen"
-
-#: templates/alsijil/personal_note_filter/manage.html:7
-#: templates/alsijil/personal_note_filter/manage.html:14
-msgid "Update personal note filter"
-msgstr "Filter für persönliche Notizen aktualisieren"
-
-#: templates/alsijil/personal_note_filter/manage.html:9
-#: templates/alsijil/personal_note_filter/manage.html:16
-msgid "Create personal note filter"
-msgstr "Filter für persönliche Notizen erstellen"
-
-#: templates/alsijil/personal_note_filter/manage.html:29
-msgid "Delete filter"
-msgstr "Filter löschen"
-
 #: templates/alsijil/print/full_register.html:6
 msgid "Class register:"
 msgstr "Klassenbuch:"
@@ -374,8 +365,7 @@ msgid ""
 msgstr ""
 "\n"
 "        Dieser Ausdruck ist für Archivierungszwecke gedacht. Die Hauptkopie\n"
-"            des Klassenbuches ist im AlekSIS-Schul-Informations-System "
-"gespeichert.\n"
+"            des Klassenbuches ist im AlekSIS-Schul-Informations-System gespeichert.\n"
 "      "
 
 #: templates/alsijil/print/full_register.html:45
@@ -387,10 +377,8 @@ msgid ""
 "      "
 msgstr ""
 "\n"
-"        Kopien des Klassenbuches, sowohl digital als auch als Ausdruck, "
-"dürfen\n"
-"            ausschließlich in der Schule und/oder auf von der Schule "
-"autorisierten Geräten\n"
+"        Kopien des Klassenbuches, sowohl digital als auch als Ausdruck, dürfen\n"
+"            ausschließlich in der Schule und/oder auf von der Schule autorisierten Geräten\n"
 "            gespeichert werden.\n"
 "      "
 
@@ -402,8 +390,7 @@ msgid ""
 "      "
 msgstr ""
 "\n"
-"        Die Leitung der Gruppe sowie die Schulleitung bestätigen die obigen "
-"Hinweise sowie\n"
+"        Die Leitung der Gruppe sowie die Schulleitung bestätigen die obigen Hinweise sowie\n"
 "            die Richtigkeit des Ausdrucks.\n"
 "      "
 
@@ -424,7 +411,7 @@ msgid "Late"
 msgstr "Verspätet"
 
 #: templates/alsijil/print/full_register.html:81
-#: templates/alsijil/print/full_register.html:288
+#: templates/alsijil/print/full_register.html:283
 msgid "Unexcused"
 msgstr "Unentschuldigt"
 
@@ -432,180 +419,222 @@ msgstr "Unentschuldigt"
 msgid "Custom excuse types"
 msgstr "Benutzerdefinierte Entschuldigunsarten"
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr "Personen in der Gruppe"
 
-#: templates/alsijil/print/full_register.html:108
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr "Nr."
 
-#: templates/alsijil/print/full_register.html:109
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr "Nachname"
 
-#: templates/alsijil/print/full_register.html:110
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr "Vorname"
 
-#: templates/alsijil/print/full_register.html:111
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: templates/alsijil/print/full_register.html:112
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: templates/alsijil/print/full_register.html:113
+#: templates/alsijil/print/full_register.html:125
 msgid "(a)"
 msgstr "(a)"
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:131
 msgid "(b)"
 msgstr "(b)"
 
-#: templates/alsijil/print/full_register.html:146
+#: templates/alsijil/print/full_register.html:164
 msgid "Teachers and lessons in group"
 msgstr "Lehrkräfte und Fächer der Gruppe"
 
-#: templates/alsijil/print/full_register.html:153
-#: templates/alsijil/print/full_register.html:184
+#: templates/alsijil/print/full_register.html:171
+#: templates/alsijil/print/full_register.html:202
 msgid "Lesson start"
 msgstr "Unterrichtsbeginn"
 
-#: templates/alsijil/print/full_register.html:154
-#: templates/alsijil/print/full_register.html:185
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr "Unterrichtsende"
 
-#: templates/alsijil/print/full_register.html:155
-#: templates/alsijil/print/full_register.html:186
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr "Pro Woche"
 
-#: templates/alsijil/print/full_register.html:176
+#: templates/alsijil/print/full_register.html:194
 msgid "Teachers and lessons in child groups"
 msgstr "Lehrkräfte und Fächer von Untergruppen"
 
-#: templates/alsijil/print/full_register.html:209
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr "Persönliche Übersicht"
 
-#: templates/alsijil/print/full_register.html:211
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr "Kontaktdetails"
 
-#: templates/alsijil/print/full_register.html:249
-msgid "Statistics on remarks"
-msgstr "Statistiken zu Bemerkungen"
-
-#: templates/alsijil/print/full_register.html:254
-msgid "Count"
-msgstr "Anzahl"
-
-#: templates/alsijil/print/full_register.html:271
+#: templates/alsijil/print/full_register.html:266
 msgid "Absences and tardiness"
 msgstr "Abwesenheiten und Verspätungen"
 
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:269
 msgid "Absences"
 msgstr "Absenzen"
 
-#: templates/alsijil/print/full_register.html:279
+#: templates/alsijil/print/full_register.html:274
 msgid "thereof"
 msgstr "davon"
 
-#: templates/alsijil/print/full_register.html:297
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr "Relevante persönliche Notizen"
 
-#: templates/alsijil/print/full_register.html:301
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr "Datum"
 
-#: templates/alsijil/print/full_register.html:302
-#: templates/alsijil/print/full_register.html:355
+#: templates/alsijil/print/full_register.html:309
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr "Std."
 
-#: templates/alsijil/print/full_register.html:303
-#: templates/alsijil/print/full_register.html:356
+#: templates/alsijil/print/full_register.html:310
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr "Fa."
 
-#: templates/alsijil/print/full_register.html:304
-#: templates/alsijil/print/full_register.html:360
+#: templates/alsijil/print/full_register.html:311
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr "Lk."
 
-#: templates/alsijil/print/full_register.html:306
+#: templates/alsijil/print/full_register.html:313
 msgid "Tard."
 msgstr "Verspät."
 
-#: templates/alsijil/print/full_register.html:322
+#: templates/alsijil/print/full_register.html:330
 msgid "Yes"
 msgstr "Ja"
 
-#: templates/alsijil/print/full_register.html:327
-#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:335
 #: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
 msgid "e"
 msgstr "e"
 
-#: templates/alsijil/print/full_register.html:349
+#: templates/alsijil/print/full_register.html:363
 msgid "Lesson documentation for week"
 msgstr "Unterrichtsdokumentation für Woche"
 
-#: templates/alsijil/print/full_register.html:359
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr "Notizen"
 
-#: views.py:66
+#: views.py:76
 msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
 "Sie haben eine ungültige Stunde ausgewählt oder es\n"
 "      läuft momentan keine Stunde."
 
-#: views.py:80
+#: views.py:90
 msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr "Ihnen ist es nicht erlaubt, eine Eintragung für eine Unterrichtsstunde in der Zukunft vorzunehmen."
 
-#: views.py:106
+#: views.py:116
 msgid "The lesson documentation has been saved."
 msgstr "Die Stunden-Dokumentation wurde gespeichert."
 
-#: views.py:121
+#: views.py:136
 msgid "The personal notes have been saved."
 msgstr "Die persönlichen Notizen wurden gespeichert."
 
-#: views.py:303
+#: views.py:327
 msgid "There is no current school term."
 msgstr "Es gibt aktuell kein Schuljahr."
 
-#: views.py:419
+#: views.py:463
 msgid "The absence has been saved."
 msgstr "Die Abwesenheit wurde gespeichert."
 
-#: views.py:459
-msgid "The filter has been saved"
+#: views.py:488
+#, fuzzy
+#| msgid "The excuse type has been created."
+msgid "The extra mark has been created."
+msgstr "Die Entschuldigungsart wurde erstellt."
+
+#: views.py:499
+#, fuzzy
+#| msgid "The filter has been saved"
+msgid "The extra mark has been saved."
 msgstr "Der Filter wurde gespeichert"
 
-#: views.py:474
-msgid "The filter has been deleted."
+#: views.py:509
+#, fuzzy
+#| msgid "The filter has been deleted."
+msgid "The extra mark has been deleted."
 msgstr "Der Filter wurde gespeichert."
 
-#: views.py:497
+#: views.py:529
 msgid "The excuse type has been created."
 msgstr "Die Entschuldigungsart wurde erstellt."
 
-#: views.py:508
+#: views.py:540
 msgid "The excuse type has been saved."
 msgstr "Die Entschuldigunsart wurde gespeichert."
 
-#: views.py:518
+#: views.py:550
 msgid "The excuse type has been deleted."
 msgstr "Die Entschuldigungsart wurde gelöscht."
 
+#~ msgid "Personal note filters"
+#~ msgstr "Filter für persönliche Notizen"
+
+#~ msgid "Identifier"
+#~ msgstr "Kennung"
+
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
+
+#~ msgid "Match expression"
+#~ msgstr "Suchausdruck"
+
+#~ msgid "Personal note filter"
+#~ msgstr "Filter für persönliche Notizen"
+
+#~ msgid "All personal note filters"
+#~ msgstr "Alle Filter für persönliche Notizen"
+
+#~ msgid "Add filter"
+#~ msgstr "Filter hinzufügen"
+
+#~ msgid "Update personal note filter"
+#~ msgstr "Filter für persönliche Notizen aktualisieren"
+
+#~ msgid "Create personal note filter"
+#~ msgstr "Filter für persönliche Notizen erstellen"
+
+#~ msgid "Delete filter"
+#~ msgstr "Filter löschen"
+
+#~ msgid "Statistics on remarks"
+#~ msgstr "Statistiken zu Bemerkungen"
+
+#~ msgid "Count"
+#~ msgstr "Anzahl"
+
 #~ msgid "Room"
 #~ msgstr "Raum"
 
diff --git a/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
index cf0fdc479b7bc6078c1587307271b709ea49de33..fa8b44b705f77e077073e91f7c27d6deb92aee7f 100644
--- a/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-26 16:10+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: 2020-07-26 14:08+0000\n"
 "Last-Translator: Marlene Grundey <grundema@katharineum.de>\n"
 "Language-Team: French <https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/fr/>\n"
@@ -22,12 +22,12 @@ msgstr ""
 msgid "Homework for the next lesson"
 msgstr ""
 
-#: forms.py:50 templates/alsijil/print/full_register.html:181
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr "Groupe"
 
-#: forms.py:56 templates/alsijil/print/full_register.html:152
-#: templates/alsijil/print/full_register.html:183
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr "Profs"
 
@@ -47,30 +47,31 @@ msgstr "Date de fin"
 msgid "From period"
 msgstr "De la période"
 
-#: forms.py:105 templates/alsijil/class_register/lesson.html:150
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr "Personne"
 
-#: forms.py:107 templates/alsijil/class_register/lesson.html:151
-#: templates/alsijil/class_register/week_view.html:93
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
+#: templates/alsijil/class_register/week_view.html:109
 #: templates/alsijil/print/full_register.html:75
-#: templates/alsijil/print/full_register.html:305
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr "Absent(e)"
 
-#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
 #: templates/alsijil/print/full_register.html:84
-#: templates/alsijil/print/full_register.html:280
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr "Excusé"
 
-#: forms.py:109 templates/alsijil/class_register/lesson.html:155
-#: templates/alsijil/class_register/lesson.html:195
-#: templates/alsijil/print/full_register.html:307
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr "Remarque"
 
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr "Registre de la classe"
 
@@ -86,92 +87,89 @@ msgstr "Semaine actuelle"
 msgid "Register absence"
 msgstr "Registre de Absence"
 
-#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
-msgid "Personal note filters"
-msgstr "Filtres de notes personnelles"
-
-#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
 #: templates/alsijil/excuse_type/list.html:9
 #, fuzzy
 #| msgid "Excused"
 msgid "Excuse types"
 msgstr "Excusé"
 
-#: models.py:18
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+
+#: models.py:18 models.py:124
 #, fuzzy
 #| msgid "First name"
 msgid "Short name"
 msgstr "Prénom"
 
-#: models.py:20
+#: models.py:20 models.py:126
 msgid "Name"
 msgstr ""
 
-#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
-#: templates/alsijil/class_register/lesson.html:187
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
 #, fuzzy
 #| msgid "Excused"
 msgid "Excuse type"
 msgstr "Excusé"
 
-#: models.py:70
+#: models.py:75
 #, fuzzy
 #| msgid "Personal notes"
 msgid "Personal note"
 msgstr "Notes personnelles"
 
-#: models.py:71 templates/alsijil/class_register/lesson.html:143
-#: templates/alsijil/class_register/week_view.html:88
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
 msgid "Personal notes"
 msgstr "Notes personnelles"
 
-#: models.py:94 templates/alsijil/print/full_register.html:357
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr "Sujet de cours"
 
-#: models.py:95 templates/alsijil/print/full_register.html:358
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr "Devoirs"
 
-#: models.py:96
+#: models.py:102
 #, fuzzy
 #| msgid "Group"
 msgid "Group note"
 msgstr "Groupe"
 
-#: models.py:99 templates/alsijil/class_register/lesson.html:119
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
 msgid "Lesson documentation"
 msgstr "Documentation de cours"
 
-#: models.py:100
+#: models.py:107
 #, fuzzy
 #| msgid "Lesson documentation"
 msgid "Lesson documentations"
 msgstr "Documentation de cours"
 
-#: models.py:114
-msgid "Identifier"
-msgstr "Identificateur"
-
-#: models.py:120 templates/alsijil/print/full_register.html:253
-msgid "Description"
-msgstr "Description"
-
-#: models.py:124
-msgid "Match expression"
+#: models.py:137
+msgid "Extra mark"
 msgstr ""
 
-#: models.py:128
-#, fuzzy
-#| msgid "Personal note filters"
-msgid "Personal note filter"
-msgstr "Filtres de notes personnelles"
+#: preferences.py:16
+msgid "Block adding personal notes for cancelled lessons"
+msgstr ""
 
-#: tables.py:17 tables.py:31
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
 
-#: tables.py:37
+#: tables.py:22 tables.py:42
 msgid "Delete"
 msgstr ""
 
@@ -185,7 +183,7 @@ msgid "Lesson"
 msgstr "Cours"
 
 #: templates/alsijil/class_register/lesson.html:14
-#: templates/alsijil/class_register/lesson.html:71
+#: templates/alsijil/class_register/lesson.html:83
 #, fuzzy, python-format
 #| msgid "From period"
 msgid "%(period)s. period"
@@ -203,42 +201,43 @@ msgstr "Lecon actuelle"
 msgid "Next lesson"
 msgstr "Lecon actuelle"
 
-#: templates/alsijil/class_register/lesson.html:70
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
+msgid "Change history"
+msgstr "Changement d' histoire"
+
+#: templates/alsijil/class_register/lesson.html:82
 msgid "Overview: Previous lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:77
+#: templates/alsijil/class_register/lesson.html:89
 msgid "Lesson topic of previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:84
+#: templates/alsijil/class_register/lesson.html:96
 msgid "Homework for this lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:91
+#: templates/alsijil/class_register/lesson.html:103
 msgid "Group notes for previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:98
+#: templates/alsijil/class_register/lesson.html:110
 #, fuzzy
 #| msgid "Absences"
 msgid "Absent persons:"
 msgstr "Absences"
 
-#: templates/alsijil/class_register/lesson.html:105
+#: templates/alsijil/class_register/lesson.html:117
 msgid "Late persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:130
-msgid "Change history"
-msgstr "Changement d' histoire"
-
-#: templates/alsijil/class_register/lesson.html:152
-#: templates/alsijil/print/full_register.html:292
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr "Retard"
 
-#: templates/alsijil/class_register/lesson.html:173
+#: templates/alsijil/class_register/lesson.html:188
 #, fuzzy
 #| msgid "Tardiness"
 msgid "Tardiness (in m)"
@@ -261,29 +260,35 @@ msgstr ""
 msgid "Period"
 msgstr "Période"
 
-#: templates/alsijil/class_register/week_view.html:51
-#: templates/alsijil/print/full_register.html:151
-#: templates/alsijil/print/full_register.html:182
+#: templates/alsijil/class_register/week_view.html:52
+#, fuzzy
+#| msgid "Group"
+msgid "Groups"
+msgstr "Groupe"
+
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
 msgid "Subject"
 msgstr "Sujet"
 
-#: templates/alsijil/class_register/week_view.html:52
+#: templates/alsijil/class_register/week_view.html:55
 msgid "Teachers"
 msgstr "Profs"
 
-#: templates/alsijil/class_register/week_view.html:94
+#: templates/alsijil/class_register/week_view.html:110
 msgid "unexcused"
 msgstr "Injustifié(e)"
 
-#: templates/alsijil/class_register/week_view.html:97
+#: templates/alsijil/class_register/week_view.html:113
 msgid "Summed up tardiness"
 msgstr "Résumé des retards"
 
-#: templates/alsijil/class_register/week_view.html:121
+#: templates/alsijil/class_register/week_view.html:142
 msgid "No lessons available"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:124
+#: templates/alsijil/class_register/week_view.html:145
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -317,13 +322,24 @@ msgid ""
 "    "
 msgstr ""
 
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:114
+#: templates/alsijil/print/full_register.html:126
 msgid "(e)"
 msgstr ""
 
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:118
+#: templates/alsijil/print/full_register.html:130
 msgid "(u)"
 msgstr ""
 
@@ -332,50 +348,22 @@ msgid "Data complete"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:12
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
+msgstr "Cours annulés"
+
+#: templates/alsijil/partials/lesson_status_icon.html:14
 msgid "Missing data"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:14
+#: templates/alsijil/partials/lesson_status_icon.html:16
 msgid "Pending"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:18
-#: templates/alsijil/print/full_register.html:392
-msgid "Lesson cancelled"
-msgstr "Cours annulés"
-
-#: templates/alsijil/partials/lesson_status_icon.html:20
 msgid "Substitution"
 msgstr ""
 
-#: templates/alsijil/personal_note_filter/list.html:7
-#, fuzzy
-#| msgid "Personal note filters"
-msgid "All personal note filters"
-msgstr "Filtres de notes personnelles"
-
-#: templates/alsijil/personal_note_filter/list.html:12
-msgid "Add filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:7
-#: templates/alsijil/personal_note_filter/manage.html:14
-#, fuzzy
-#| msgid "Personal note filters"
-msgid "Update personal note filter"
-msgstr "Filtres de notes personnelles"
-
-#: templates/alsijil/personal_note_filter/manage.html:9
-#: templates/alsijil/personal_note_filter/manage.html:16
-#, fuzzy
-#| msgid "Personal note filters"
-msgid "Create personal note filter"
-msgstr "Filtres de notes personnelles"
-
-#: templates/alsijil/personal_note_filter/manage.html:29
-msgid "Delete filter"
-msgstr ""
-
 #: templates/alsijil/print/full_register.html:6
 #, fuzzy
 #| msgid "Class register"
@@ -434,7 +422,7 @@ msgid "Late"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:81
-#: templates/alsijil/print/full_register.html:288
+#: templates/alsijil/print/full_register.html:283
 msgid "Unexcused"
 msgstr "injustifié(e)"
 
@@ -442,184 +430,220 @@ msgstr "injustifié(e)"
 msgid "Custom excuse types"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr "Personnes en groupe"
 
-#: templates/alsijil/print/full_register.html:108
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr "Non."
 
-#: templates/alsijil/print/full_register.html:109
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: templates/alsijil/print/full_register.html:110
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr "Prénom"
 
-#: templates/alsijil/print/full_register.html:111
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr "Sexe"
 
-#: templates/alsijil/print/full_register.html:112
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr "Date d'anniversaire"
 
-#: templates/alsijil/print/full_register.html:113
+#: templates/alsijil/print/full_register.html:125
 msgid "(a)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:131
 msgid "(b)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:146
+#: templates/alsijil/print/full_register.html:164
 msgid "Teachers and lessons in group"
 msgstr "Profs et cours en groupe"
 
-#: templates/alsijil/print/full_register.html:153
-#: templates/alsijil/print/full_register.html:184
+#: templates/alsijil/print/full_register.html:171
+#: templates/alsijil/print/full_register.html:202
 msgid "Lesson start"
 msgstr "Début de cours"
 
-#: templates/alsijil/print/full_register.html:154
-#: templates/alsijil/print/full_register.html:185
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr "Fin de cours"
 
-#: templates/alsijil/print/full_register.html:155
-#: templates/alsijil/print/full_register.html:186
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr "Par semaine"
 
-#: templates/alsijil/print/full_register.html:176
+#: templates/alsijil/print/full_register.html:194
 #, fuzzy
 #| msgid "Teachers and lessons in group"
 msgid "Teachers and lessons in child groups"
 msgstr "Profs et cours en groupe"
 
-#: templates/alsijil/print/full_register.html:209
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr "Vue d'ensemble personnelle"
 
-#: templates/alsijil/print/full_register.html:211
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr "Détails de contact"
 
-#: templates/alsijil/print/full_register.html:249
-msgid "Statistics on remarks"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:254
-msgid "Count"
-msgstr "Compter"
-
-#: templates/alsijil/print/full_register.html:271
+#: templates/alsijil/print/full_register.html:266
 msgid "Absences and tardiness"
 msgstr "Absences et retards"
 
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:269
 msgid "Absences"
 msgstr "Absences"
 
-#: templates/alsijil/print/full_register.html:279
+#: templates/alsijil/print/full_register.html:274
 msgid "thereof"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:297
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr "Notes personnelles importantes"
 
-#: templates/alsijil/print/full_register.html:301
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr "Date"
 
-#: templates/alsijil/print/full_register.html:302
-#: templates/alsijil/print/full_register.html:355
+#: templates/alsijil/print/full_register.html:309
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:303
-#: templates/alsijil/print/full_register.html:356
+#: templates/alsijil/print/full_register.html:310
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:304
-#: templates/alsijil/print/full_register.html:360
+#: templates/alsijil/print/full_register.html:311
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:306
+#: templates/alsijil/print/full_register.html:313
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:322
+#: templates/alsijil/print/full_register.html:330
 msgid "Yes"
 msgstr "Oui"
 
-#: templates/alsijil/print/full_register.html:327
-#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:335
 #: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
 msgid "e"
 msgstr "e"
 
-#: templates/alsijil/print/full_register.html:349
+#: templates/alsijil/print/full_register.html:363
 #, fuzzy
 #| msgid "Lesson documentation for calendar week"
 msgid "Lesson documentation for week"
 msgstr "Documentation de cours pour la semaine calendrier"
 
-#: templates/alsijil/print/full_register.html:359
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr "Notes"
 
-#: views.py:66
+#: views.py:76
 msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
 
-#: views.py:80
+#: views.py:90
 msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""
 
-#: views.py:106
+#: views.py:116
 #, fuzzy
 #| msgid "Lesson documentation for calendar week"
 msgid "The lesson documentation has been saved."
 msgstr "Documentation de cours pour la semaine calendrier"
 
-#: views.py:121
+#: views.py:136
 msgid "The personal notes have been saved."
 msgstr ""
 
-#: views.py:303
+#: views.py:327
 msgid "There is no current school term."
 msgstr ""
 
-#: views.py:419
+#: views.py:463
 msgid "The absence has been saved."
 msgstr ""
 
-#: views.py:459
-msgid "The filter has been saved"
-msgstr ""
+#: views.py:488
+#, fuzzy
+#| msgid "Lesson documentation for calendar week"
+msgid "The extra mark has been created."
+msgstr "Documentation de cours pour la semaine calendrier"
+
+#: views.py:499
+#, fuzzy
+#| msgid "Lesson documentation for calendar week"
+msgid "The extra mark has been saved."
+msgstr "Documentation de cours pour la semaine calendrier"
 
-#: views.py:474
-msgid "The filter has been deleted."
+#: views.py:509
+msgid "The extra mark has been deleted."
 msgstr ""
 
-#: views.py:497
+#: views.py:529
 msgid "The excuse type has been created."
 msgstr ""
 
-#: views.py:508
+#: views.py:540
 msgid "The excuse type has been saved."
 msgstr ""
 
-#: views.py:518
+#: views.py:550
 msgid "The excuse type has been deleted."
 msgstr ""
 
+#~ msgid "Personal note filters"
+#~ msgstr "Filtres de notes personnelles"
+
+#~ msgid "Identifier"
+#~ msgstr "Identificateur"
+
+#~ msgid "Description"
+#~ msgstr "Description"
+
+#, fuzzy
+#~| msgid "Personal note filters"
+#~ msgid "Personal note filter"
+#~ msgstr "Filtres de notes personnelles"
+
+#, fuzzy
+#~| msgid "Personal note filters"
+#~ msgid "All personal note filters"
+#~ msgstr "Filtres de notes personnelles"
+
+#, fuzzy
+#~| msgid "Personal note filters"
+#~ msgid "Update personal note filter"
+#~ msgstr "Filtres de notes personnelles"
+
+#, fuzzy
+#~| msgid "Personal note filters"
+#~ msgid "Create personal note filter"
+#~ msgstr "Filtres de notes personnelles"
+
+#~ msgid "Count"
+#~ msgstr "Compter"
+
 #~ msgid "Room"
 #~ msgstr "Salle"
 
diff --git a/aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
index 02b275330dfb4e5882c0b211538134e445f05fa6..8d23b91ba87783c3e16698f4626b6949de23f1f1 100644
--- a/aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/la/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-26 16:10+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: 2020-07-26 14:08+0000\n"
 "Last-Translator: Julian <leuckerj@gmail.com>\n"
 "Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-alsijil/la/>\n"
@@ -22,12 +22,12 @@ msgstr ""
 msgid "Homework for the next lesson"
 msgstr ""
 
-#: forms.py:50 templates/alsijil/print/full_register.html:181
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr "Grex"
 
-#: forms.py:56 templates/alsijil/print/full_register.html:152
-#: templates/alsijil/print/full_register.html:183
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr ""
 
@@ -47,30 +47,31 @@ msgstr ""
 msgid "From period"
 msgstr ""
 
-#: forms.py:105 templates/alsijil/class_register/lesson.html:150
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr "Persona"
 
-#: forms.py:107 templates/alsijil/class_register/lesson.html:151
-#: templates/alsijil/class_register/week_view.html:93
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
+#: templates/alsijil/class_register/week_view.html:109
 #: templates/alsijil/print/full_register.html:75
-#: templates/alsijil/print/full_register.html:305
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr ""
 
-#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
 #: templates/alsijil/print/full_register.html:84
-#: templates/alsijil/print/full_register.html:280
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr ""
 
-#: forms.py:109 templates/alsijil/class_register/lesson.html:155
-#: templates/alsijil/class_register/lesson.html:195
-#: templates/alsijil/print/full_register.html:307
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr ""
 
@@ -86,84 +87,83 @@ msgstr ""
 msgid "Register absence"
 msgstr ""
 
-#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
-msgid "Personal note filters"
-msgstr ""
-
-#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
 #: templates/alsijil/excuse_type/list.html:9
 msgid "Excuse types"
 msgstr ""
 
-#: models.py:18
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+
+#: models.py:18 models.py:124
 #, fuzzy
 #| msgid "First name"
 msgid "Short name"
 msgstr "Primus nomen"
 
-#: models.py:20
+#: models.py:20 models.py:126
 msgid "Name"
 msgstr ""
 
-#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
-#: templates/alsijil/class_register/lesson.html:187
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
 msgid "Excuse type"
 msgstr ""
 
-#: models.py:70
+#: models.py:75
 #, fuzzy
 #| msgid "Person"
 msgid "Personal note"
 msgstr "Persona"
 
-#: models.py:71 templates/alsijil/class_register/lesson.html:143
-#: templates/alsijil/class_register/week_view.html:88
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
 msgid "Personal notes"
 msgstr ""
 
-#: models.py:94 templates/alsijil/print/full_register.html:357
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:95 templates/alsijil/print/full_register.html:358
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr ""
 
-#: models.py:96
+#: models.py:102
 #, fuzzy
 #| msgid "Group"
 msgid "Group note"
 msgstr "Grex"
 
-#: models.py:99 templates/alsijil/class_register/lesson.html:119
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
 msgid "Lesson documentation"
 msgstr ""
 
-#: models.py:100
+#: models.py:107
 msgid "Lesson documentations"
 msgstr ""
 
-#: models.py:114
-msgid "Identifier"
-msgstr ""
-
-#: models.py:120 templates/alsijil/print/full_register.html:253
-msgid "Description"
-msgstr "Descriptio"
-
-#: models.py:124
-msgid "Match expression"
+#: models.py:137
+msgid "Extra mark"
 msgstr ""
 
-#: models.py:128
-msgid "Personal note filter"
+#: preferences.py:16
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
 
-#: tables.py:17 tables.py:31
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
 
-#: tables.py:37
+#: tables.py:22 tables.py:42
 msgid "Delete"
 msgstr ""
 
@@ -177,7 +177,7 @@ msgid "Lesson"
 msgstr ""
 
 #: templates/alsijil/class_register/lesson.html:14
-#: templates/alsijil/class_register/lesson.html:71
+#: templates/alsijil/class_register/lesson.html:83
 #, python-format
 msgid "%(period)s. period"
 msgstr ""
@@ -190,40 +190,41 @@ msgstr ""
 msgid "Next lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:70
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
+msgid "Change history"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:82
 msgid "Overview: Previous lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:77
+#: templates/alsijil/class_register/lesson.html:89
 msgid "Lesson topic of previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:84
+#: templates/alsijil/class_register/lesson.html:96
 msgid "Homework for this lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:91
+#: templates/alsijil/class_register/lesson.html:103
 msgid "Group notes for previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:98
+#: templates/alsijil/class_register/lesson.html:110
 msgid "Absent persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:105
+#: templates/alsijil/class_register/lesson.html:117
 msgid "Late persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:130
-msgid "Change history"
-msgstr ""
-
-#: templates/alsijil/class_register/lesson.html:152
-#: templates/alsijil/print/full_register.html:292
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:173
+#: templates/alsijil/class_register/lesson.html:188
 msgid "Tardiness (in m)"
 msgstr ""
 
@@ -244,29 +245,35 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:51
-#: templates/alsijil/print/full_register.html:151
-#: templates/alsijil/print/full_register.html:182
+#: templates/alsijil/class_register/week_view.html:52
+#, fuzzy
+#| msgid "Group"
+msgid "Groups"
+msgstr "Grex"
+
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:52
+#: templates/alsijil/class_register/week_view.html:55
 msgid "Teachers"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:94
+#: templates/alsijil/class_register/week_view.html:110
 msgid "unexcused"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:97
+#: templates/alsijil/class_register/week_view.html:113
 msgid "Summed up tardiness"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:121
+#: templates/alsijil/class_register/week_view.html:142
 msgid "No lessons available"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:124
+#: templates/alsijil/class_register/week_view.html:145
 msgid ""
 "\n"
 "            There are no lessons for the selected group or teacher in this week.\n"
@@ -292,13 +299,24 @@ msgid ""
 "    "
 msgstr ""
 
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:114
+#: templates/alsijil/print/full_register.html:126
 msgid "(e)"
 msgstr ""
 
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:118
+#: templates/alsijil/print/full_register.html:130
 msgid "(u)"
 msgstr ""
 
@@ -307,44 +325,22 @@ msgid "Data complete"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:12
-msgid "Missing data"
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:14
-msgid "Pending"
+msgid "Missing data"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:18
-#: templates/alsijil/print/full_register.html:392
-msgid "Lesson cancelled"
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:20
+#: templates/alsijil/partials/lesson_status_icon.html:18
 msgid "Substitution"
 msgstr ""
 
-#: templates/alsijil/personal_note_filter/list.html:7
-msgid "All personal note filters"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/list.html:12
-msgid "Add filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:7
-#: templates/alsijil/personal_note_filter/manage.html:14
-msgid "Update personal note filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:9
-#: templates/alsijil/personal_note_filter/manage.html:16
-msgid "Create personal note filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:29
-msgid "Delete filter"
-msgstr ""
-
 #: templates/alsijil/print/full_register.html:6
 msgid "Class register:"
 msgstr ""
@@ -401,7 +397,7 @@ msgid "Late"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:81
-#: templates/alsijil/print/full_register.html:288
+#: templates/alsijil/print/full_register.html:283
 msgid "Unexcused"
 msgstr ""
 
@@ -409,174 +405,177 @@ msgstr ""
 msgid "Custom excuse types"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:108
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:109
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr "Secondus nomen"
 
-#: templates/alsijil/print/full_register.html:110
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr "Primus nomen"
 
-#: templates/alsijil/print/full_register.html:111
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr "Genus"
 
-#: templates/alsijil/print/full_register.html:112
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr "Dies natalis"
 
-#: templates/alsijil/print/full_register.html:113
+#: templates/alsijil/print/full_register.html:125
 msgid "(a)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:131
 msgid "(b)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:146
+#: templates/alsijil/print/full_register.html:164
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:153
-#: templates/alsijil/print/full_register.html:184
+#: templates/alsijil/print/full_register.html:171
+#: templates/alsijil/print/full_register.html:202
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:154
-#: templates/alsijil/print/full_register.html:185
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:155
-#: templates/alsijil/print/full_register.html:186
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:176
+#: templates/alsijil/print/full_register.html:194
 msgid "Teachers and lessons in child groups"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:209
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:211
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:249
-msgid "Statistics on remarks"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:254
-msgid "Count"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:271
+#: templates/alsijil/print/full_register.html:266
 msgid "Absences and tardiness"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:269
 msgid "Absences"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:279
+#: templates/alsijil/print/full_register.html:274
 msgid "thereof"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:297
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:301
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr "dies"
 
-#: templates/alsijil/print/full_register.html:302
-#: templates/alsijil/print/full_register.html:355
+#: templates/alsijil/print/full_register.html:309
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:303
-#: templates/alsijil/print/full_register.html:356
+#: templates/alsijil/print/full_register.html:310
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:304
-#: templates/alsijil/print/full_register.html:360
+#: templates/alsijil/print/full_register.html:311
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:306
+#: templates/alsijil/print/full_register.html:313
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:322
+#: templates/alsijil/print/full_register.html:330
 msgid "Yes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:327
-#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:335
 #: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
 msgid "e"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:349
+#: templates/alsijil/print/full_register.html:363
 msgid "Lesson documentation for week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:359
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr ""
 
-#: views.py:66
+#: views.py:76
 msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
 
-#: views.py:80
+#: views.py:90
 msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""
 
-#: views.py:106
+#: views.py:116
 msgid "The lesson documentation has been saved."
 msgstr ""
 
-#: views.py:121
+#: views.py:136
 msgid "The personal notes have been saved."
 msgstr ""
 
-#: views.py:303
+#: views.py:327
 msgid "There is no current school term."
 msgstr ""
 
-#: views.py:419
+#: views.py:463
 msgid "The absence has been saved."
 msgstr ""
 
-#: views.py:459
-msgid "The filter has been saved"
+#: views.py:488
+msgid "The extra mark has been created."
 msgstr ""
 
-#: views.py:474
-msgid "The filter has been deleted."
+#: views.py:499
+msgid "The extra mark has been saved."
 msgstr ""
 
-#: views.py:497
+#: views.py:509
+msgid "The extra mark has been deleted."
+msgstr ""
+
+#: views.py:529
 msgid "The excuse type has been created."
 msgstr ""
 
-#: views.py:508
+#: views.py:540
 msgid "The excuse type has been saved."
 msgstr ""
 
-#: views.py:518
+#: views.py:550
 msgid "The excuse type has been deleted."
 msgstr ""
+
+#~ msgid "Description"
+#~ msgstr "Descriptio"
diff --git a/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
index c6b337e73f6b33c3b537b7070f556dba6916bf52..6c135ee070af949f1a52f1eef843fdf53d28047c 100644
--- a/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/nb_NO/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-26 16:10+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 msgid "Homework for the next lesson"
 msgstr ""
 
-#: forms.py:50 templates/alsijil/print/full_register.html:181
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr ""
 
-#: forms.py:56 templates/alsijil/print/full_register.html:152
-#: templates/alsijil/print/full_register.html:183
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr ""
 
@@ -46,30 +46,31 @@ msgstr ""
 msgid "From period"
 msgstr ""
 
-#: forms.py:105 templates/alsijil/class_register/lesson.html:150
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr ""
 
-#: forms.py:107 templates/alsijil/class_register/lesson.html:151
-#: templates/alsijil/class_register/week_view.html:93
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
+#: templates/alsijil/class_register/week_view.html:109
 #: templates/alsijil/print/full_register.html:75
-#: templates/alsijil/print/full_register.html:305
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr ""
 
-#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
 #: templates/alsijil/print/full_register.html:84
-#: templates/alsijil/print/full_register.html:280
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr ""
 
-#: forms.py:109 templates/alsijil/class_register/lesson.html:155
-#: templates/alsijil/class_register/lesson.html:195
-#: templates/alsijil/print/full_register.html:307
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr ""
 
@@ -85,78 +86,77 @@ msgstr ""
 msgid "Register absence"
 msgstr ""
 
-#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
-msgid "Personal note filters"
-msgstr ""
-
-#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
 #: templates/alsijil/excuse_type/list.html:9
 msgid "Excuse types"
 msgstr ""
 
-#: models.py:18
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+
+#: models.py:18 models.py:124
 msgid "Short name"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 models.py:126
 msgid "Name"
 msgstr ""
 
-#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
-#: templates/alsijil/class_register/lesson.html:187
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
 msgid "Excuse type"
 msgstr ""
 
-#: models.py:70
+#: models.py:75
 msgid "Personal note"
 msgstr ""
 
-#: models.py:71 templates/alsijil/class_register/lesson.html:143
-#: templates/alsijil/class_register/week_view.html:88
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
 msgid "Personal notes"
 msgstr ""
 
-#: models.py:94 templates/alsijil/print/full_register.html:357
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:95 templates/alsijil/print/full_register.html:358
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr ""
 
-#: models.py:96
+#: models.py:102
 msgid "Group note"
 msgstr ""
 
-#: models.py:99 templates/alsijil/class_register/lesson.html:119
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
 msgid "Lesson documentation"
 msgstr ""
 
-#: models.py:100
+#: models.py:107
 msgid "Lesson documentations"
 msgstr ""
 
-#: models.py:114
-msgid "Identifier"
+#: models.py:137
+msgid "Extra mark"
 msgstr ""
 
-#: models.py:120 templates/alsijil/print/full_register.html:253
-msgid "Description"
+#: preferences.py:16
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
 
-#: models.py:124
-msgid "Match expression"
-msgstr ""
-
-#: models.py:128
-msgid "Personal note filter"
-msgstr ""
-
-#: tables.py:17 tables.py:31
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
 
-#: tables.py:37
+#: tables.py:22 tables.py:42
 msgid "Delete"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Lesson"
 msgstr ""
 
 #: templates/alsijil/class_register/lesson.html:14
-#: templates/alsijil/class_register/lesson.html:71
+#: templates/alsijil/class_register/lesson.html:83
 #, python-format
 msgid "%(period)s. period"
 msgstr ""
@@ -183,40 +183,41 @@ msgstr ""
 msgid "Next lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:70
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
+msgid "Change history"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:82
 msgid "Overview: Previous lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:77
+#: templates/alsijil/class_register/lesson.html:89
 msgid "Lesson topic of previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:84
+#: templates/alsijil/class_register/lesson.html:96
 msgid "Homework for this lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:91
+#: templates/alsijil/class_register/lesson.html:103
 msgid "Group notes for previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:98
+#: templates/alsijil/class_register/lesson.html:110
 msgid "Absent persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:105
+#: templates/alsijil/class_register/lesson.html:117
 msgid "Late persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:130
-msgid "Change history"
-msgstr ""
-
-#: templates/alsijil/class_register/lesson.html:152
-#: templates/alsijil/print/full_register.html:292
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:173
+#: templates/alsijil/class_register/lesson.html:188
 msgid "Tardiness (in m)"
 msgstr ""
 
@@ -237,29 +238,33 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:51
-#: templates/alsijil/print/full_register.html:151
-#: templates/alsijil/print/full_register.html:182
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Groups"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:52
+#: templates/alsijil/class_register/week_view.html:55
 msgid "Teachers"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:94
+#: templates/alsijil/class_register/week_view.html:110
 msgid "unexcused"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:97
+#: templates/alsijil/class_register/week_view.html:113
 msgid "Summed up tardiness"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:121
+#: templates/alsijil/class_register/week_view.html:142
 msgid "No lessons available"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:124
+#: templates/alsijil/class_register/week_view.html:145
 msgid ""
 "\n"
 "            There are no lessons for the selected group or teacher in this week.\n"
@@ -285,13 +290,24 @@ msgid ""
 "    "
 msgstr ""
 
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:114
+#: templates/alsijil/print/full_register.html:126
 msgid "(e)"
 msgstr ""
 
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:118
+#: templates/alsijil/print/full_register.html:130
 msgid "(u)"
 msgstr ""
 
@@ -300,44 +316,22 @@ msgid "Data complete"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:12
-msgid "Missing data"
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:14
-msgid "Pending"
+msgid "Missing data"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:18
-#: templates/alsijil/print/full_register.html:392
-msgid "Lesson cancelled"
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:20
+#: templates/alsijil/partials/lesson_status_icon.html:18
 msgid "Substitution"
 msgstr ""
 
-#: templates/alsijil/personal_note_filter/list.html:7
-msgid "All personal note filters"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/list.html:12
-msgid "Add filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:7
-#: templates/alsijil/personal_note_filter/manage.html:14
-msgid "Update personal note filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:9
-#: templates/alsijil/personal_note_filter/manage.html:16
-msgid "Create personal note filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:29
-msgid "Delete filter"
-msgstr ""
-
 #: templates/alsijil/print/full_register.html:6
 msgid "Class register:"
 msgstr ""
@@ -394,7 +388,7 @@ msgid "Late"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:81
-#: templates/alsijil/print/full_register.html:288
+#: templates/alsijil/print/full_register.html:283
 msgid "Unexcused"
 msgstr ""
 
@@ -402,174 +396,174 @@ msgstr ""
 msgid "Custom excuse types"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:108
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:109
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:110
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:111
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:112
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:113
+#: templates/alsijil/print/full_register.html:125
 msgid "(a)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:131
 msgid "(b)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:146
+#: templates/alsijil/print/full_register.html:164
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:153
-#: templates/alsijil/print/full_register.html:184
+#: templates/alsijil/print/full_register.html:171
+#: templates/alsijil/print/full_register.html:202
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:154
-#: templates/alsijil/print/full_register.html:185
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:155
-#: templates/alsijil/print/full_register.html:186
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:176
+#: templates/alsijil/print/full_register.html:194
 msgid "Teachers and lessons in child groups"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:209
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:211
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:249
-msgid "Statistics on remarks"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:254
-msgid "Count"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:271
+#: templates/alsijil/print/full_register.html:266
 msgid "Absences and tardiness"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:269
 msgid "Absences"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:279
+#: templates/alsijil/print/full_register.html:274
 msgid "thereof"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:297
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:301
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:302
-#: templates/alsijil/print/full_register.html:355
+#: templates/alsijil/print/full_register.html:309
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:303
-#: templates/alsijil/print/full_register.html:356
+#: templates/alsijil/print/full_register.html:310
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:304
-#: templates/alsijil/print/full_register.html:360
+#: templates/alsijil/print/full_register.html:311
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:306
+#: templates/alsijil/print/full_register.html:313
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:322
+#: templates/alsijil/print/full_register.html:330
 msgid "Yes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:327
-#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:335
 #: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
 msgid "e"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:349
+#: templates/alsijil/print/full_register.html:363
 msgid "Lesson documentation for week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:359
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr ""
 
-#: views.py:66
+#: views.py:76
 msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
 
-#: views.py:80
+#: views.py:90
 msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""
 
-#: views.py:106
+#: views.py:116
 msgid "The lesson documentation has been saved."
 msgstr ""
 
-#: views.py:121
+#: views.py:136
 msgid "The personal notes have been saved."
 msgstr ""
 
-#: views.py:303
+#: views.py:327
 msgid "There is no current school term."
 msgstr ""
 
-#: views.py:419
+#: views.py:463
 msgid "The absence has been saved."
 msgstr ""
 
-#: views.py:459
-msgid "The filter has been saved"
+#: views.py:488
+msgid "The extra mark has been created."
+msgstr ""
+
+#: views.py:499
+msgid "The extra mark has been saved."
 msgstr ""
 
-#: views.py:474
-msgid "The filter has been deleted."
+#: views.py:509
+msgid "The extra mark has been deleted."
 msgstr ""
 
-#: views.py:497
+#: views.py:529
 msgid "The excuse type has been created."
 msgstr ""
 
-#: views.py:508
+#: views.py:540
 msgid "The excuse type has been saved."
 msgstr ""
 
-#: views.py:518
+#: views.py:550
 msgid "The excuse type has been deleted."
 msgstr ""
diff --git a/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po b/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
index c6b337e73f6b33c3b537b7070f556dba6916bf52..6c135ee070af949f1a52f1eef843fdf53d28047c 100644
--- a/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
+++ b/aleksis/apps/alsijil/locale/tr_TR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-26 16:10+0200\n"
+"POT-Creation-Date: 2020-08-03 20:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,12 +21,12 @@ msgstr ""
 msgid "Homework for the next lesson"
 msgstr ""
 
-#: forms.py:50 templates/alsijil/print/full_register.html:181
+#: forms.py:50 templates/alsijil/print/full_register.html:199
 msgid "Group"
 msgstr ""
 
-#: forms.py:56 templates/alsijil/print/full_register.html:152
-#: templates/alsijil/print/full_register.html:183
+#: forms.py:56 templates/alsijil/print/full_register.html:170
+#: templates/alsijil/print/full_register.html:201
 msgid "Teacher"
 msgstr ""
 
@@ -46,30 +46,31 @@ msgstr ""
 msgid "From period"
 msgstr ""
 
-#: forms.py:105 templates/alsijil/class_register/lesson.html:150
+#: forms.py:105 templates/alsijil/class_register/lesson.html:163
 msgid "Person"
 msgstr ""
 
-#: forms.py:107 templates/alsijil/class_register/lesson.html:151
-#: templates/alsijil/class_register/week_view.html:93
+#: forms.py:107 templates/alsijil/class_register/lesson.html:164
+#: templates/alsijil/class_register/week_view.html:109
 #: templates/alsijil/print/full_register.html:75
-#: templates/alsijil/print/full_register.html:305
+#: templates/alsijil/print/full_register.html:312
 msgid "Absent"
 msgstr ""
 
-#: forms.py:108 templates/alsijil/class_register/lesson.html:153
+#: forms.py:108 templates/alsijil/class_register/lesson.html:166
 #: templates/alsijil/print/full_register.html:84
-#: templates/alsijil/print/full_register.html:280
+#: templates/alsijil/print/full_register.html:275
 msgid "Excused"
 msgstr ""
 
-#: forms.py:109 templates/alsijil/class_register/lesson.html:155
-#: templates/alsijil/class_register/lesson.html:195
-#: templates/alsijil/print/full_register.html:307
+#: forms.py:109 templates/alsijil/class_register/lesson.html:170
+#: templates/alsijil/class_register/lesson.html:223
+#: templates/alsijil/class_register/lesson.html:231
+#: templates/alsijil/print/full_register.html:314
 msgid "Remarks"
 msgstr ""
 
-#: menus.py:6 templates/alsijil/print/full_register.html:16
+#: menus.py:6 preferences.py:8 templates/alsijil/print/full_register.html:16
 msgid "Class register"
 msgstr ""
 
@@ -85,78 +86,77 @@ msgstr ""
 msgid "Register absence"
 msgstr ""
 
-#: menus.py:34 models.py:129 templates/alsijil/personal_note_filter/list.html:8
-msgid "Personal note filters"
-msgstr ""
-
-#: menus.py:40 models.py:32 templates/alsijil/excuse_type/list.html:8
+#: menus.py:34 models.py:32 templates/alsijil/excuse_type/list.html:8
 #: templates/alsijil/excuse_type/list.html:9
 msgid "Excuse types"
 msgstr ""
 
-#: models.py:18
+#: menus.py:40 models.py:66 models.py:138
+#: templates/alsijil/class_register/lesson.html:168
+#: templates/alsijil/extra_mark/list.html:8
+#: templates/alsijil/extra_mark/list.html:9
+#: templates/alsijil/print/full_register.html:293
+msgid "Extra marks"
+msgstr ""
+
+#: models.py:18 models.py:124
 msgid "Short name"
 msgstr ""
 
-#: models.py:20
+#: models.py:20 models.py:126
 msgid "Name"
 msgstr ""
 
-#: models.py:31 models.py:59 templates/alsijil/class_register/lesson.html:154
-#: templates/alsijil/class_register/lesson.html:187
+#: models.py:31 models.py:60 templates/alsijil/class_register/lesson.html:167
+#: templates/alsijil/class_register/lesson.html:202
 msgid "Excuse type"
 msgstr ""
 
-#: models.py:70
+#: models.py:75
 msgid "Personal note"
 msgstr ""
 
-#: models.py:71 templates/alsijil/class_register/lesson.html:143
-#: templates/alsijil/class_register/week_view.html:88
+#: models.py:76 templates/alsijil/class_register/lesson.html:64
+#: templates/alsijil/class_register/lesson.html:156
+#: templates/alsijil/class_register/week_view.html:104
 msgid "Personal notes"
 msgstr ""
 
-#: models.py:94 templates/alsijil/print/full_register.html:357
+#: models.py:99 templates/alsijil/class_register/week_view.html:56
+#: templates/alsijil/print/full_register.html:371
 msgid "Lesson topic"
 msgstr ""
 
-#: models.py:95 templates/alsijil/print/full_register.html:358
+#: models.py:100 templates/alsijil/print/full_register.html:372
 msgid "Homework"
 msgstr ""
 
-#: models.py:96
+#: models.py:102
 msgid "Group note"
 msgstr ""
 
-#: models.py:99 templates/alsijil/class_register/lesson.html:119
+#: models.py:106 templates/alsijil/class_register/lesson.html:60
+#: templates/alsijil/class_register/lesson.html:143
 msgid "Lesson documentation"
 msgstr ""
 
-#: models.py:100
+#: models.py:107
 msgid "Lesson documentations"
 msgstr ""
 
-#: models.py:114
-msgid "Identifier"
+#: models.py:137
+msgid "Extra mark"
 msgstr ""
 
-#: models.py:120 templates/alsijil/print/full_register.html:253
-msgid "Description"
+#: preferences.py:16
+msgid "Block adding personal notes for cancelled lessons"
 msgstr ""
 
-#: models.py:124
-msgid "Match expression"
-msgstr ""
-
-#: models.py:128
-msgid "Personal note filter"
-msgstr ""
-
-#: tables.py:17 tables.py:31
+#: tables.py:16 tables.py:36
 msgid "Edit"
 msgstr ""
 
-#: tables.py:37
+#: tables.py:22 tables.py:42
 msgid "Delete"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgid "Lesson"
 msgstr ""
 
 #: templates/alsijil/class_register/lesson.html:14
-#: templates/alsijil/class_register/lesson.html:71
+#: templates/alsijil/class_register/lesson.html:83
 #, python-format
 msgid "%(period)s. period"
 msgstr ""
@@ -183,40 +183,41 @@ msgstr ""
 msgid "Next lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:70
+#: templates/alsijil/class_register/lesson.html:68
+#: templates/alsijil/class_register/lesson.html:249
+msgid "Change history"
+msgstr ""
+
+#: templates/alsijil/class_register/lesson.html:82
 msgid "Overview: Previous lesson"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:77
+#: templates/alsijil/class_register/lesson.html:89
 msgid "Lesson topic of previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:84
+#: templates/alsijil/class_register/lesson.html:96
 msgid "Homework for this lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:91
+#: templates/alsijil/class_register/lesson.html:103
 msgid "Group notes for previous lesson:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:98
+#: templates/alsijil/class_register/lesson.html:110
 msgid "Absent persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:105
+#: templates/alsijil/class_register/lesson.html:117
 msgid "Late persons:"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:130
-msgid "Change history"
-msgstr ""
-
-#: templates/alsijil/class_register/lesson.html:152
-#: templates/alsijil/print/full_register.html:292
+#: templates/alsijil/class_register/lesson.html:165
+#: templates/alsijil/print/full_register.html:287
 msgid "Tardiness"
 msgstr ""
 
-#: templates/alsijil/class_register/lesson.html:173
+#: templates/alsijil/class_register/lesson.html:188
 msgid "Tardiness (in m)"
 msgstr ""
 
@@ -237,29 +238,33 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:51
-#: templates/alsijil/print/full_register.html:151
-#: templates/alsijil/print/full_register.html:182
+#: templates/alsijil/class_register/week_view.html:52
+msgid "Groups"
+msgstr ""
+
+#: templates/alsijil/class_register/week_view.html:54
+#: templates/alsijil/print/full_register.html:169
+#: templates/alsijil/print/full_register.html:200
 msgid "Subject"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:52
+#: templates/alsijil/class_register/week_view.html:55
 msgid "Teachers"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:94
+#: templates/alsijil/class_register/week_view.html:110
 msgid "unexcused"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:97
+#: templates/alsijil/class_register/week_view.html:113
 msgid "Summed up tardiness"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:121
+#: templates/alsijil/class_register/week_view.html:142
 msgid "No lessons available"
 msgstr ""
 
-#: templates/alsijil/class_register/week_view.html:124
+#: templates/alsijil/class_register/week_view.html:145
 msgid ""
 "\n"
 "            There are no lessons for the selected group or teacher in this week.\n"
@@ -285,13 +290,24 @@ msgid ""
 "    "
 msgstr ""
 
+#: templates/alsijil/extra_mark/create.html:6
+#: templates/alsijil/extra_mark/create.html:7
+#: templates/alsijil/extra_mark/list.html:14
+msgid "Create extra mark"
+msgstr ""
+
+#: templates/alsijil/extra_mark/edit.html:6
+#: templates/alsijil/extra_mark/edit.html:7
+msgid "Edit extra mark"
+msgstr ""
+
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:114
+#: templates/alsijil/print/full_register.html:126
 msgid "(e)"
 msgstr ""
 
 #: templates/alsijil/partials/absences.html:4
-#: templates/alsijil/print/full_register.html:118
+#: templates/alsijil/print/full_register.html:130
 msgid "(u)"
 msgstr ""
 
@@ -300,44 +316,22 @@ msgid "Data complete"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:12
-msgid "Missing data"
+#: templates/alsijil/print/full_register.html:406
+msgid "Lesson cancelled"
 msgstr ""
 
 #: templates/alsijil/partials/lesson_status_icon.html:14
-msgid "Pending"
+msgid "Missing data"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:18
-#: templates/alsijil/print/full_register.html:392
-msgid "Lesson cancelled"
+#: templates/alsijil/partials/lesson_status_icon.html:16
+msgid "Pending"
 msgstr ""
 
-#: templates/alsijil/partials/lesson_status_icon.html:20
+#: templates/alsijil/partials/lesson_status_icon.html:18
 msgid "Substitution"
 msgstr ""
 
-#: templates/alsijil/personal_note_filter/list.html:7
-msgid "All personal note filters"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/list.html:12
-msgid "Add filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:7
-#: templates/alsijil/personal_note_filter/manage.html:14
-msgid "Update personal note filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:9
-#: templates/alsijil/personal_note_filter/manage.html:16
-msgid "Create personal note filter"
-msgstr ""
-
-#: templates/alsijil/personal_note_filter/manage.html:29
-msgid "Delete filter"
-msgstr ""
-
 #: templates/alsijil/print/full_register.html:6
 msgid "Class register:"
 msgstr ""
@@ -394,7 +388,7 @@ msgid "Late"
 msgstr ""
 
 #: templates/alsijil/print/full_register.html:81
-#: templates/alsijil/print/full_register.html:288
+#: templates/alsijil/print/full_register.html:283
 msgid "Unexcused"
 msgstr ""
 
@@ -402,174 +396,174 @@ msgstr ""
 msgid "Custom excuse types"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:103
+#: templates/alsijil/print/full_register.html:101
+msgid "Available extra marks"
+msgstr ""
+
+#: templates/alsijil/print/full_register.html:115
 msgid "Persons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:108
+#: templates/alsijil/print/full_register.html:120
 msgid "No."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:109
+#: templates/alsijil/print/full_register.html:121
 msgid "Last name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:110
+#: templates/alsijil/print/full_register.html:122
 msgid "First name"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:111
+#: templates/alsijil/print/full_register.html:123
 msgid "Sex"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:112
+#: templates/alsijil/print/full_register.html:124
 msgid "Date of birth"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:113
+#: templates/alsijil/print/full_register.html:125
 msgid "(a)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:119
+#: templates/alsijil/print/full_register.html:131
 msgid "(b)"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:146
+#: templates/alsijil/print/full_register.html:164
 msgid "Teachers and lessons in group"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:153
-#: templates/alsijil/print/full_register.html:184
+#: templates/alsijil/print/full_register.html:171
+#: templates/alsijil/print/full_register.html:202
 msgid "Lesson start"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:154
-#: templates/alsijil/print/full_register.html:185
+#: templates/alsijil/print/full_register.html:172
+#: templates/alsijil/print/full_register.html:203
 msgid "Lesson end"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:155
-#: templates/alsijil/print/full_register.html:186
+#: templates/alsijil/print/full_register.html:173
+#: templates/alsijil/print/full_register.html:204
 msgid "Per week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:176
+#: templates/alsijil/print/full_register.html:194
 msgid "Teachers and lessons in child groups"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:209
+#: templates/alsijil/print/full_register.html:227
 msgid "Personal overview"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:211
+#: templates/alsijil/print/full_register.html:229
 msgid "Contact details"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:249
-msgid "Statistics on remarks"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:254
-msgid "Count"
-msgstr ""
-
-#: templates/alsijil/print/full_register.html:271
+#: templates/alsijil/print/full_register.html:266
 msgid "Absences and tardiness"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:274
+#: templates/alsijil/print/full_register.html:269
 msgid "Absences"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:279
+#: templates/alsijil/print/full_register.html:274
 msgid "thereof"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:297
+#: templates/alsijil/print/full_register.html:304
 msgid "Relevant personal notes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:301
+#: templates/alsijil/print/full_register.html:308
 msgid "Date"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:302
-#: templates/alsijil/print/full_register.html:355
+#: templates/alsijil/print/full_register.html:309
+#: templates/alsijil/print/full_register.html:369
 msgid "Pe."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:303
-#: templates/alsijil/print/full_register.html:356
+#: templates/alsijil/print/full_register.html:310
+#: templates/alsijil/print/full_register.html:370
 msgid "Subj."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:304
-#: templates/alsijil/print/full_register.html:360
+#: templates/alsijil/print/full_register.html:311
+#: templates/alsijil/print/full_register.html:374
 msgid "Te."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:306
+#: templates/alsijil/print/full_register.html:313
 msgid "Tard."
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:322
+#: templates/alsijil/print/full_register.html:330
 msgid "Yes"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:327
-#: templates/alsijil/print/full_register.html:409
+#: templates/alsijil/print/full_register.html:335
 #: templates/alsijil/print/full_register.html:424
+#: templates/alsijil/print/full_register.html:439
 msgid "e"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:349
+#: templates/alsijil/print/full_register.html:363
 msgid "Lesson documentation for week"
 msgstr ""
 
-#: templates/alsijil/print/full_register.html:359
+#: templates/alsijil/print/full_register.html:373
 msgid "Notes"
 msgstr ""
 
-#: views.py:66
+#: views.py:76
 msgid "You either selected an invalid lesson or there is currently no lesson in progress."
 msgstr ""
 
-#: views.py:80
+#: views.py:90
 msgid "You are not allowed to create a lesson documentation for a lesson in the future."
 msgstr ""
 
-#: views.py:106
+#: views.py:116
 msgid "The lesson documentation has been saved."
 msgstr ""
 
-#: views.py:121
+#: views.py:136
 msgid "The personal notes have been saved."
 msgstr ""
 
-#: views.py:303
+#: views.py:327
 msgid "There is no current school term."
 msgstr ""
 
-#: views.py:419
+#: views.py:463
 msgid "The absence has been saved."
 msgstr ""
 
-#: views.py:459
-msgid "The filter has been saved"
+#: views.py:488
+msgid "The extra mark has been created."
+msgstr ""
+
+#: views.py:499
+msgid "The extra mark has been saved."
 msgstr ""
 
-#: views.py:474
-msgid "The filter has been deleted."
+#: views.py:509
+msgid "The extra mark has been deleted."
 msgstr ""
 
-#: views.py:497
+#: views.py:529
 msgid "The excuse type has been created."
 msgstr ""
 
-#: views.py:508
+#: views.py:540
 msgid "The excuse type has been saved."
 msgstr ""
 
-#: views.py:518
+#: views.py:550
 msgid "The excuse type has been deleted."
 msgstr ""