diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py
index 41c7c0b8836bdb3bc2b636afe9ae451593931957..bfa3dd7def75c3891f4cf32b0369ad7f6d7f0ee4 100644
--- a/aleksis/apps/alsijil/model_extensions.py
+++ b/aleksis/apps/alsijil/model_extensions.py
@@ -1,9 +1,9 @@
 from datetime import date
+from calendarweek import CalendarWeek
 
 from django.db.models import Exists, F, OuterRef
 
 from aleksis.apps.chronos.models import LessonPeriod
-from aleksis.apps.chronos.util import CalendarWeek
 from aleksis.core.models import Group, Person
 
 from .models import PersonalNote
diff --git a/aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html b/aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html
index 29fbd5493b5b4edb14125d6957f8437347e19c0f..0d9a6d5dcb753b8a63a1ab91762adcfaaf924799 100644
--- a/aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html
+++ b/aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html
@@ -5,15 +5,11 @@
 {% block page_title %}{% blocktrans %}Manage personal note filter{% endblocktrans %}{% endblock %}
 
 {% block content %}
-<div class="d-flex justify-content-between">
-    <div class="btn-group" role="group" aria-label="Filter actions">
-      {% if personal_note_filter %}
-        <a href="{% url 'delete_personal_note_filter' personal_note_filter.id %}" class="btn btn-danger">
-          <i class="material-icons">trash</i>
-        </a>
-      {% endif %}
-    </div>
-  </div>
+  {% if personal_note_filter %}
+    <a href="{% url 'delete_personal_note_filter' personal_note_filter.id %}" class="waves-effect waves-dark btn red">
+      <i class="material-icons">add</i>{% blocktrans %}Add filter{% endblocktrans %}
+    </a>
+  {% endif %}
 
   <form method="post">
     {% csrf_token %}
diff --git a/aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html b/aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html
index 2ad1a7b526812a790c6693a32fb090325f04460b..200a00e3de9e649aec1a9c05bd099968b99662c4 100644
--- a/aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html
+++ b/aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html
@@ -7,8 +7,8 @@
 {% block page_title %}{% blocktrans %}List of all personal note filters{% endblocktrans %}{% endblock %}
 
 {% block content %}
-  <a href="{% url 'create_personal_note_filter' %}" class="waves-effect waves-dark btn">
-    <i class="material-icons">add</i>
+  <a href="{% url 'create_personal_note_filter' %}" class="waves-effect waves-dark green btn">
+    <i class="material-icons">add</i>{% blocktrans %}Add filter{% endblock %}
   </a>
 
   {% render_table personal_note_filters_table %}
diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py
index ea54bc23622738a1f388f54b720d51ac161702c6..77f69af3c8ebf297e8c5e1326e3829ae108ebe86 100644
--- a/aleksis/apps/alsijil/views.py
+++ b/aleksis/apps/alsijil/views.py
@@ -1,3 +1,4 @@
+from calendarweek import CalendarWeek
 from datetime import date, datetime, timedelta
 from typing import Optional
 
@@ -12,7 +13,6 @@ from django.utils.translation import ugettext as _
 from django_tables2 import RequestConfig
 
 from aleksis.apps.chronos.models import LessonPeriod
-from aleksis.apps.chronos.util import CalendarWeek
 from aleksis.core.decorators import admin_required
 from aleksis.core.models import Group, Person, School
 from aleksis.core.util import messages