diff --git a/docs/members.rst b/docs/members.rst
index 688f1f18a49ad1efb708f297abcf4cfb6c396b0c..82954818ad5c99b0e880cc893a6e43bc1e739d27 100644
--- a/docs/members.rst
+++ b/docs/members.rst
@@ -24,6 +24,14 @@ members.admin module
    :undoc-members:
    :show-inheritance:
 
+members.admin\_views module
+---------------------------
+
+.. automodule:: members.admin_views
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 members.apps module
 -------------------
 
diff --git a/docs/utils.templatetags.rst b/docs/utils.templatetags.rst
index 445de90a3e1d817bf515339de93bf9887972d8c4..e9454c40759f7eea69483683f7555a0d29a3fdb4 100644
--- a/docs/utils.templatetags.rst
+++ b/docs/utils.templatetags.rst
@@ -25,3 +25,11 @@ utils.templatetags.thumbnail module
    :undoc-members:
    :show-inheritance:
 
+utils.templatetags.urlparams module
+-----------------------------------
+
+.. automodule:: utils.templatetags.urlparams
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
diff --git a/website/members/admin.py b/website/members/admin.py
index 5abef9a376742d281f8e0ebacabb4090f02bf986..5ad277ba1cf0d741a917a52dcbbefbc759f9656c 100644
--- a/website/members/admin.py
+++ b/website/members/admin.py
@@ -8,10 +8,11 @@ from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from django.contrib.auth.models import User
 from django.db.models import Q, Count
 from django.http import HttpResponse
+from django.urls import path
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 
-from members import services
+from members import services, admin_views
 from members.models import EmailChange, Member
 from . import forms, models
 
@@ -206,6 +207,16 @@ class UserAdmin(BaseUserAdmin):
             )
     minimise_data.short_description = _('Minimise data for the selected users')
 
+    def get_urls(self):
+        urls = super().get_urls()
+        custom_urls = [
+            path('iban-export/',
+                 self.admin_site.admin_view(
+                     admin_views.IbanExportView.as_view()),
+                 name='members_member_ibanexport'),
+        ]
+        return custom_urls + urls
+
 
 @admin.register(models.Member)
 class MemberAdmin(UserAdmin):
diff --git a/website/members/admin_views.py b/website/members/admin_views.py
new file mode 100644
index 0000000000000000000000000000000000000000..de6d62cb24e9bbe5b24417885c3a148f177a7e03
--- /dev/null
+++ b/website/members/admin_views.py
@@ -0,0 +1,46 @@
+"""Admin views provided by the members package"""
+import csv
+
+from django.contrib.admin.views.decorators import staff_member_required
+from django.contrib.auth.decorators import permission_required
+from django.http import HttpResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from members.models import Member
+
+
+@method_decorator(staff_member_required, 'dispatch')
+@method_decorator(permission_required('auth.change_user'), 'dispatch')
+class IbanExportView(View):
+    """
+    Exports IBANs of users that have set auto renew to true in their accounts
+    """
+    def get(self, request, **kwargs) -> HttpResponse:
+        header_fields = ['name', 'username', 'iban', 'bic']
+        rows = []
+
+        members = Member.current_members.filter(
+            profile__auto_renew=True)
+
+        for member in members:
+            if (member.current_membership.type != 'honorary' and
+                    member.bank_accounts.exists()):
+                bank_account = member.bank_accounts.last()
+                rows.append({
+                    'name': bank_account.name,
+                    'username': member.username,
+                    'iban': bank_account.iban,
+                    'bic': bank_account.bic
+                })
+
+        response = HttpResponse(content_type='text/csv')
+        writer = csv.DictWriter(response, header_fields)
+        writer.writeheader()
+
+        for row in rows:
+            writer.writerow(row)
+
+        response['Content-Disposition'] = (
+            'attachment; filename="iban-export.csv"')
+        return response
diff --git a/website/members/api/serializers.py b/website/members/api/serializers.py
index bf5c13d0a5d9568d9937061fcd3fbf432c1a42bb..be71e23f69b352e3c8074e9a202fbd68ce96d1e7 100644
--- a/website/members/api/serializers.py
+++ b/website/members/api/serializers.py
@@ -1,3 +1,4 @@
+"""DRF serializers defined by the members package"""
 from django.templatetags.static import static
 from django.urls import reverse
 from rest_framework import serializers
@@ -9,6 +10,7 @@ from thaliawebsite.api.services import create_image_thumbnail_dict
 
 
 class MemberBirthdaySerializer(CalenderJSSerializer):
+    """Serializer that renders the member birthdays to the CalendarJS format"""
     class Meta(CalenderJSSerializer.Meta):
         model = Member
 
@@ -47,6 +49,7 @@ class MemberBirthdaySerializer(CalenderJSSerializer):
 
 
 class ProfileRetrieveSerializer(serializers.ModelSerializer):
+    """Serializer that renders a member profile"""
     class Meta:
         model = Profile
         fields = ('pk', 'display_name', 'avatar', 'profile_description',
@@ -92,6 +95,7 @@ class ProfileRetrieveSerializer(serializers.ModelSerializer):
 
 
 class MemberListSerializer(serializers.ModelSerializer):
+    """Serializer that renders a list of members"""
     class Meta:
         model = Member
         fields = ('pk', 'display_name', 'avatar')
@@ -114,6 +118,7 @@ class MemberListSerializer(serializers.ModelSerializer):
 
 
 class ProfileEditSerializer(serializers.ModelSerializer):
+    """Serializer that renders a profile to be edited"""
     class Meta:
         model = Profile
         fields = ('pk', 'email', 'first_name', 'last_name', 'address_street',
diff --git a/website/members/api/urls.py b/website/members/api/urls.py
index 35d75933dfa9da04899d9b286de5cdb4b2f983ff..e3601152228addf8bc4c3505ddd83bb2e702ab10 100644
--- a/website/members/api/urls.py
+++ b/website/members/api/urls.py
@@ -1,3 +1,4 @@
+"""DRF routes defined by the members package"""
 from rest_framework import routers
 
 from members.api import viewsets
diff --git a/website/members/api/viewsets.py b/website/members/api/viewsets.py
index 80eb74d6b6889a6b5af29cba2cd9526989037bcc..451279fb944ae58ec5f98aef165d1419ed71c838 100644
--- a/website/members/api/viewsets.py
+++ b/website/members/api/viewsets.py
@@ -1,7 +1,8 @@
+"""DRF viewsets defined by the members package"""
 import copy
 
 from rest_framework import permissions
-from rest_framework import viewsets, filters
+from rest_framework import viewsets, filters, mixins
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
@@ -14,7 +15,8 @@ from utils.snippets import extract_date_range
 
 
 class MemberViewset(viewsets.ReadOnlyModelViewSet,
-                    viewsets.mixins.UpdateModelMixin):
+                    mixins.UpdateModelMixin):
+    """Viewset that renders or edits a member"""
     queryset = Member.objects.all()
     filter_backends = (filters.OrderingFilter, filters.SearchFilter,)
     ordering_fields = ('profile__starting_year', 'first_name', 'last_name')
diff --git a/website/members/apps.py b/website/members/apps.py
index cf3d2508d51851f40b47ec292dc272e4f2c5233e..ade1e03a9b37923e06bcced7ca308648dba7b31d 100644
--- a/website/members/apps.py
+++ b/website/members/apps.py
@@ -1,3 +1,4 @@
+"""Configuration for the members package"""
 from django.apps import AppConfig
 from django.utils.translation import gettext_lazy as _
 
diff --git a/website/members/decorators.py b/website/members/decorators.py
index f1f36b409bd4c3dcfb656eda3adf769536d0e756..dcf8252c415fc9a68b6d11082930b1a5efe64c87 100644
--- a/website/members/decorators.py
+++ b/website/members/decorators.py
@@ -1,3 +1,4 @@
+"""Decorators provided by the members package"""
 from django.core.exceptions import PermissionDenied
 
 
@@ -6,6 +7,9 @@ def membership_required(view_function):
 
 
 class ActiveMembershipRequired(object):
+    """
+    Decorator that checks if the user has an active membership
+    """
     def __init__(self, view_function):
         self.view_function = view_function
 
diff --git a/website/members/emails.py b/website/members/emails.py
index 8386087d915dbf0aafa126e135bcbd1fb603af80..acf0581b898050548d728b5703a6fc15d644e643 100644
--- a/website/members/emails.py
+++ b/website/members/emails.py
@@ -1,3 +1,4 @@
+"""The emails defined by the members package"""
 from datetime import timedelta
 import logging
 
diff --git a/website/members/forms.py b/website/members/forms.py
index ff30b79e37464d844717f232fd41babb9afcb9fe..0e4a13ef78992db8890ea7d91f59680e75ee13d3 100644
--- a/website/members/forms.py
+++ b/website/members/forms.py
@@ -1,14 +1,16 @@
+"""Forms defined by the members package"""
 from django import forms
 from django.contrib.auth.forms import UserChangeForm as BaseUserChangeForm
 from django.contrib.auth.forms import UserCreationForm as BaseUserCreationForm
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 
-from members import emails, models
+from members import emails
 from .models import Profile
 
 
 class ProfileForm(forms.ModelForm):
+    """Form with all the user editable fields of a Profile model"""
     class Meta:
         fields = ['address_street', 'address_street2',
                   'address_postal_code', 'address_city', 'address_country',
@@ -22,6 +24,10 @@ class ProfileForm(forms.ModelForm):
 
 
 class UserCreationForm(BaseUserCreationForm):
+    """
+    Custom Form that removes the password fields from user creation
+    and sends a welcome message when a user is created
+    """
     # Don't forget to edit the formset in admin.py!
     # This is a stupid quirk of the user admin.
 
@@ -71,6 +77,10 @@ class UserCreationForm(BaseUserCreationForm):
 
 
 class UserChangeForm(BaseUserChangeForm):
+    """
+    Custom user edit form that adds fields for first/last name and email
+    It also force-lowercases the username on save
+    """
     first_name = forms.CharField(
         label=_('First name'),
         required=True,
@@ -104,9 +114,3 @@ class UserChangeForm(BaseUserChangeForm):
             self.cleaned_data['username'] = (self.cleaned_data['username']
                                              .lower())
         super().clean()
-
-
-class EmailChangeForm(forms.ModelForm):
-    class Meta:
-        model = models.EmailChange
-        fields = ['email', 'member']
diff --git a/website/members/middleware.py b/website/members/middleware.py
index b4c2a999ed4e0a51f114a9ba8a67fee8a72cf2b5..15d69b79b4bf07918b8fd51dec4e98376b121ed8 100644
--- a/website/members/middleware.py
+++ b/website/members/middleware.py
@@ -1,3 +1,4 @@
+"""Middleware provided by the members package"""
 from django.utils.functional import SimpleLazyObject
 
 from members.models import Member
@@ -11,6 +12,9 @@ def get_member(request):
 
 
 class MemberMiddleware:
+    """
+    Adds the member attribute to requests
+    """
     def __init__(self, get_response):
         self.get_response = get_response
 
diff --git a/website/members/models.py b/website/members/models.py
index 43ca253659712c8bb21df9f274e523c1fc198ca8..b7bff7f45b0c5095b5543b06a8c479a5f37ccbcc 100644
--- a/website/members/models.py
+++ b/website/members/models.py
@@ -1,3 +1,4 @@
+"""Models defined in the members package"""
 import logging
 import operator
 import os
diff --git a/website/members/services.py b/website/members/services.py
index 651207b0fc8510a14fb775e3e3025bd43350388b..2df3e47088846626506fd667b3262517f03146d3 100644
--- a/website/members/services.py
+++ b/website/members/services.py
@@ -1,4 +1,6 @@
+"""Services defined in the members package"""
 from datetime import date
+from typing import Callable, List, Dict, Union, Any
 
 from django.db.models import Q, Count
 from django.utils import timezone
@@ -9,7 +11,13 @@ from members.models import Membership, Member
 from utils.snippets import datetime_to_lectureyear
 
 
-def _member_group_memberships(member, skip_condition):
+def _member_group_memberships(
+        member: Member, skip_condition: Callable[[Membership], bool]
+) -> Dict[str, Any]:
+    """
+    Determines the group membership of a user based on a condition
+    :return: Object with group memberships
+    """
     memberships = member.membergroupmembership_set.all()
     data = {}
 
@@ -45,9 +53,13 @@ def _member_group_memberships(member, skip_condition):
     return data
 
 
-def member_achievements(member):
+def member_achievements(member) -> List:
+    """
+    Derives a list of achievements of a member
+    Committee and board memberships + mentorships
+    """
     achievements = _member_group_memberships(
-        member, lambda membership: hasattr(membership.group, 'society'))
+        member, lambda membership: hasattr(membership, 'society'))
 
     mentor_years = member.mentorship_set.all()
     for mentor_year in mentor_years:
@@ -63,14 +75,21 @@ def member_achievements(member):
     return sorted(achievements.values(), key=lambda x: x['earliest'])
 
 
-def member_societies(member):
+def member_societies(member) -> List:
+    """
+    Derives a list of societies a member was part of
+    """
     societies = _member_group_memberships(member, lambda membership: (
         hasattr(membership.group, 'board') or
         hasattr(membership.group, 'committee')))
     return sorted(societies.values(), key=lambda x: x['earliest'])
 
 
-def gen_stats_member_type(member_types):
+def gen_stats_member_type(member_types) -> Dict[str, int]:
+    """
+    Generate a dictionary where every key is a member type with
+    the value being the number of current members of that type
+    """
     total = dict()
     for member_type in member_types:
         total[member_type] = (Membership
@@ -83,7 +102,8 @@ def gen_stats_member_type(member_types):
     return total
 
 
-def gen_stats_year(member_types):
+def gen_stats_year(
+        member_types) -> List[Dict[Union[str, Any], Union[int, Any]]]:
     """
     Generate list with 6 entries, where each entry represents the total amount
     of Thalia members in a year. The sixth element contains all the multi-year
@@ -123,7 +143,7 @@ def gen_stats_year(member_types):
     return stats_year
 
 
-def verify_email_change(change_request):
+def verify_email_change(change_request) -> None:
     """
     Mark the email change request as verified
 
@@ -135,7 +155,7 @@ def verify_email_change(change_request):
     process_email_change(change_request)
 
 
-def confirm_email_change(change_request):
+def confirm_email_change(change_request) -> None:
     """
     Mark the email change request as verified
 
@@ -147,7 +167,7 @@ def confirm_email_change(change_request):
     process_email_change(change_request)
 
 
-def process_email_change(change_request):
+def process_email_change(change_request) -> None:
     """
     Change the user's email address if the request was completed and
     send the completion email
@@ -164,7 +184,7 @@ def process_email_change(change_request):
     emails.send_email_change_completion_message(change_request)
 
 
-def execute_data_minimisation(dry_run=False, members=None):
+def execute_data_minimisation(dry_run=False, members=None) -> List[Member]:
     """
     Clean the profiles of members/users of whom the last membership ended
     at least 31 days ago
diff --git a/website/members/sitemaps.py b/website/members/sitemaps.py
index b39bbc3388bf1b635e257562614efa7a741f721a..2f43d9148ecd80df8b94f852893b0ee10886f3b2 100644
--- a/website/members/sitemaps.py
+++ b/website/members/sitemaps.py
@@ -1,8 +1,10 @@
+"""Sitemaps defined by the members package"""
 from django.contrib import sitemaps
 from django.urls import reverse
 
 
 class StaticViewSitemap(sitemaps.Sitemap):
+    """Static sitemap with members page"""
     priority = 0.5
     changefreq = 'daily'
 
diff --git a/website/members/templates/admin/members/change_list.html b/website/members/templates/admin/members/change_list.html
index 196f15f3a1fefb85ace52d2aa05aec7f8da61905..f263a2b3aa84c01c90ea30a0baca955a1c7f22de 100644
--- a/website/members/templates/admin/members/change_list.html
+++ b/website/members/templates/admin/members/change_list.html
@@ -3,7 +3,7 @@
 
 {% block object-tools-items %}
     <li>
-        <a href="{% url 'members:iban-export' %}">{% trans "Export IBANs for Direct Debit" %}</a>
+        <a href="{% url 'admin:members_member_ibanexport' %}">{% trans "Export IBANs for Direct Debit" %}</a>
     </li>
     {{ block.super }}
 {% endblock %}
diff --git a/website/members/templates/members/index.html b/website/members/templates/members/index.html
index b8c5bb440ecc5fea5ce5a57167c38944cddfe2e1..b9ac889e396975cf0f643df8fe268396a9fc2310 100644
--- a/website/members/templates/members/index.html
+++ b/website/members/templates/members/index.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static i18n thumbnail bootstrap4 member_card alert %}
+{% load static i18n thumbnail bootstrap4 member_card alert urlparams %}
 
 {% block title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
 {% block opengraph_title %}{% trans "members"|capfirst %} — {{ block.super }}{% endblock %}
@@ -19,50 +19,49 @@
                 </p>
 
                 <form class="search-form form-inline col-12 col-lg-6 offset-lg-3" method="get"
-                      action="{% url 'members:index' %}#members-directory">
-                    <input type="hidden" name="filter" value="{{ filter }}"/>
-                    <input class="form-control col-12 col-md-9" name="keywords" type="text" value="{{ keys }}"
+                      action="#members-directory">
+                    <input class="form-control col-12 col-md-9" name="keywords" type="text" value="{{ keys|default_if_none:'' }}"
                            placeholder="{% trans "Who are you looking for?" %}"/>
-                    <input class="btn btn-lg btn-primary col-12 mt-2 mt-md-0 col-md-3" name="submit" type="submit"
+                    <input class="btn btn-lg btn-primary col-12 mt-2 mt-md-0 col-md-3" type="submit"
                            value="{% trans "Search" %}"/>
                 </form>
 
                 <ul class="nav nav-tabs justify-content-center mt-4">
                     <li class="nav-item">
                         <a class="nav-link{% if not filter or filter == "all" %} active{% endif %}"
-                           href="{% url 'members:index' %}?filter=all{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory">
+                           href="{% url 'members:index' %}{% urlparams keywords=keys %}#members-directory">
                             {% trans "All members" %}
                         </a>
                     </li>
                     {% for year in year_range %}
                         <li class="nav-item">
                             <a class="nav-link{% if filter == year|stringformat:"i" %} active{% endif %}"
-                               href="{% url 'members:index' %}?filter={{ year }}{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory">
+                               href="{% url 'members:index' year %}{% urlparams keywords=keys %}#members-directory">
                                 {{ year }}
                             </a>
                         </li>
                     {% endfor %}
                     <li class="nav-item">
                         <a class="nav-link{% if filter == "older" %} active{% endif %}"
-                           href="{% url 'members:index' %}?filter=older{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory">
+                           href="{% url 'members:index' 'older' %}{% urlparams keywords=keys %}#members-directory">
                             {% trans "Older" %}
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link{% if filter == "benefactors" %} active{% endif %}"
-                           href="{% url 'members:index' %}?filter=benefactors{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory">
+                           href="{% url 'members:index' 'benefactors' %}{% urlparams keywords=keys %}#members-directory">
                             {% trans "Benefactors" %}
                         </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link{% if filter == "honorary" %} active{% endif %}"
-                           href="{% url 'members:index' %}?filter=honorary{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory">
+                           href="{% url 'members:index' 'honorary' %}{% urlparams keywords=keys %}#members-directory">
                             {% trans "Honorary Members" %}
                             </a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link{% if filter == "former" %} active{% endif %}"
-                           href="{% url 'members:index' %}?filter=former{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory">
+                           href="{% url 'members:index' 'former' %}{% urlparams keywords=keys %}#members-directory">
                             {% trans "Former Members" %}
                         </a>
                     </li>
@@ -84,27 +83,27 @@
 
                     <nav>
                         <ul class="pagination justify-content-center mt-4">
-                            {% if members.has_previous %}
+                            {% if page_obj.has_previous %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{% url 'members:index' %}?page={{ members.previous_page_number }}{% if filter %}&filter={{ filter }}{% endif %}{% if keywords %}&keywords={{ keys }}{% endif %}#members-directory">
+                                       href="?page={{ page_obj.previous_page_number }}{% if keywords %}&keywords={{ keys }}{% endif %}#members-directory">
                                         <span aria-hidden="true">&laquo;</span>
                                         <span class="sr-only">Previous</span>
                                     </a>
                                 </li>
                             {% endif %}
                             {% for page in page_range %}
-                                <li class="page-item{% if page == members.number %} active{% endif %}">
+                                <li class="page-item{% if page == page_obj.number %} active{% endif %}">
                                     <a class="page-link"
-                                       href="{% url 'members:index' %}?page={{ page }}{% if filter %}&filter={{ filter }}{% endif %}{% if keywords %}&keywords={{ keys }}{% endif %}#members-director">
+                                       href="?page={{ page }}{% if keywords %}&keywords={{ keys }}{% endif %}#members-director">
                                         {{ page }}
                                     </a>
                                 </li>
                             {% endfor %}
-                            {% if members.has_next %}
+                            {% if page_obj.has_next %}
                                 <li class="page-item">
                                     <a class="page-link"
-                                       href="{% url 'members:index' %}?page={{ members.next_page_number }}{% if filter %}&filter={{ filter }}{% endif %}{% if keywords %}&keywords={{ keys }}{% endif %}">
+                                       href="?page={{ page_obj.next_page_number }}{% if keywords %}&keywords={{ keys }}{% endif %}">
                                         <span aria-hidden="true">&raquo;</span>
                                         <span class="sr-only">Next</span>
                                     </a>
diff --git a/website/members/templates/members/edit_profile.html b/website/members/templates/members/user/edit_profile.html
similarity index 93%
rename from website/members/templates/members/edit_profile.html
rename to website/members/templates/members/user/edit_profile.html
index 408efdeb3d2caa6fd6ef7baf1544b617d8e07cc8..701ee5623db1dfca3f232d07ee19a7b1267ccc78 100644
--- a/website/members/templates/members/edit_profile.html
+++ b/website/members/templates/members/user/edit_profile.html
@@ -10,9 +10,10 @@
         <div class="container">
             <h1 class="text-center section-title">{% trans "edit profile"|capfirst %}</h1>
 
-            {% if saved %}
-                {% trans "Your profile has been updated successfully." as success_text %}
-                {% alert 'success' success_text dismissable=True %}
+            {% if messages %}
+                {% for message in messages %}
+                    {% alert message.tags message %}
+                {% endfor %}
             {% endif %}
 
             {% if form.errors %}
diff --git a/website/members/templates/members/email_change.html b/website/members/templates/members/user/email_change.html
similarity index 100%
rename from website/members/templates/members/email_change.html
rename to website/members/templates/members/user/email_change.html
diff --git a/website/members/templates/members/email_change_confirmed.html b/website/members/templates/members/user/email_change_confirmed.html
similarity index 100%
rename from website/members/templates/members/email_change_confirmed.html
rename to website/members/templates/members/user/email_change_confirmed.html
diff --git a/website/members/templates/members/email_change_requested.html b/website/members/templates/members/user/email_change_requested.html
similarity index 100%
rename from website/members/templates/members/email_change_requested.html
rename to website/members/templates/members/user/email_change_requested.html
diff --git a/website/members/templates/members/email_change_verified.html b/website/members/templates/members/user/email_change_verified.html
similarity index 100%
rename from website/members/templates/members/email_change_verified.html
rename to website/members/templates/members/user/email_change_verified.html
diff --git a/website/members/templates/members/user.html b/website/members/templates/members/user/index.html
similarity index 100%
rename from website/members/templates/members/user.html
rename to website/members/templates/members/user/index.html
diff --git a/website/members/templates/members/profile.html b/website/members/templates/members/user/profile.html
similarity index 100%
rename from website/members/templates/members/profile.html
rename to website/members/templates/members/user/profile.html
diff --git a/website/members/tests/test_models.py b/website/members/tests/test_models.py
index cb47be343abee3f33a034fc6116b7134951fe3ac..7965415b466c371ab36b2153cfedf78e45eea293 100644
--- a/website/members/tests/test_models.py
+++ b/website/members/tests/test_models.py
@@ -1,9 +1,9 @@
-from datetime import date, datetime, timedelta
+from datetime import datetime
+
 from django.test import TestCase
 from django.utils import timezone
 
-from members.models import (Profile, Member, Membership)
-from members.views import filter_users
+from members.models import (Profile, Member)
 
 
 class MemberBirthdayTest(TestCase):
@@ -144,51 +144,3 @@ class MemberDisplayNameTest(TestCase):
         self.profile.nickname = 'John'
         self.assertEqual('\'John\' Test', self.profile.display_name())
         self.assertEqual('John', self.profile.short_display_name())
-
-
-class MembershipFilterTest(TestCase):
-
-    @classmethod
-    def setUpTestData(cls):
-        # Add 10 members with default membership
-        members = [Member(id=i, username=i) for i in range(7)]
-        Member.objects.bulk_create(members)
-        profiles = [Profile(user_id=i) for i in range(7)]
-        Profile.objects.bulk_create(profiles)
-
-        Membership(user_id=0, type=Membership.HONORARY,
-                   until=date.today() + timedelta(days=1)).save()
-
-        Membership(user_id=1, type=Membership.BENEFACTOR,
-                   until=date.today() + timedelta(days=1)).save()
-
-        Membership(user_id=2, type=Membership.MEMBER,
-                   until=date.today() + timedelta(days=1)).save()
-
-        Membership(user_id=3, type=Membership.MEMBER,
-                   until=date.today() + timedelta(days=1)).save()
-        Membership(user_id=3, type=Membership.MEMBER,
-                   until=date.today() - timedelta(days=365*10)).save()
-
-        Membership(user_id=4, type=Membership.BENEFACTOR,
-                   until=date.today() + timedelta(days=1)).save()
-        Membership(user_id=4, type=Membership.MEMBER,
-                   until=date.today() - timedelta(days=365*10)).save()
-
-        Membership(user_id=5, type=Membership.MEMBER,
-                   until=date.today() - timedelta(days=365*10)).save()
-
-        # user_id=6 has no memberships at all
-
-    def test_honorary(self):
-        members = filter_users('honorary', '', [date.today().year])
-        self.assertEqual(len(members), 1)
-        self.assertEqual(members[0].id, 0)
-
-    def test_former(self):
-        members = filter_users('former', '', [date.today().year])
-        self.assertEqual(len(members), 3)
-        for member in members:
-            self.assertIn(member.id, {4, 5, 6})
-
-    # TODO more tests for other cases and move to services
diff --git a/website/members/tests/test_views.py b/website/members/tests/test_views.py
new file mode 100644
index 0000000000000000000000000000000000000000..328b3402833f136d93629bc63cac203ca9139315
--- /dev/null
+++ b/website/members/tests/test_views.py
@@ -0,0 +1,58 @@
+from datetime import date, timedelta
+
+from django.test import TestCase
+
+from members.models import Member, Profile, Membership
+from members.views import MembersIndex
+
+
+class MembersIndexText(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        # Add 10 members with default membership
+        members = [Member(id=i, username=i) for i in range(7)]
+        Member.objects.bulk_create(members)
+        profiles = [Profile(user_id=i) for i in range(7)]
+        Profile.objects.bulk_create(profiles)
+
+        Membership(user_id=0, type=Membership.HONORARY,
+                   until=date.today() + timedelta(days=1)).save()
+
+        Membership(user_id=1, type=Membership.BENEFACTOR,
+                   until=date.today() + timedelta(days=1)).save()
+
+        Membership(user_id=2, type=Membership.MEMBER,
+                   until=date.today() + timedelta(days=1)).save()
+
+        Membership(user_id=3, type=Membership.MEMBER,
+                   until=date.today() + timedelta(days=1)).save()
+        Membership(user_id=3, type=Membership.MEMBER,
+                   until=date.today() - timedelta(days=365*10)).save()
+
+        Membership(user_id=4, type=Membership.BENEFACTOR,
+                   until=date.today() + timedelta(days=1)).save()
+        Membership(user_id=4, type=Membership.MEMBER,
+                   until=date.today() - timedelta(days=365*10)).save()
+
+        Membership(user_id=5, type=Membership.MEMBER,
+                   until=date.today() - timedelta(days=365*10)).save()
+
+        # user_id=6 has no memberships at all
+
+    def test_honorary_query_filter(self):
+        view = MembersIndex()
+        view.query_filter = 'honorary'
+        view.year_range = [date.today().year]
+        members = view.get_queryset()
+        self.assertEqual(len(members), 1)
+        self.assertEqual(members[0].id, 0)
+
+    def test_former_query_filter(self):
+        view = MembersIndex()
+        view.query_filter = 'former'
+        view.year_range = [date.today().year]
+        members = view.get_queryset()
+        self.assertEqual(len(members), 3)
+        for member in members:
+            self.assertIn(member.id, {4, 5, 6})
diff --git a/website/members/urls.py b/website/members/urls.py
index ab6ee8facdfe7534d265908dc074955700d274d4..73ed6095fbce50f70a7de848d3dba89b2ab7a2b7 100644
--- a/website/members/urls.py
+++ b/website/members/urls.py
@@ -1,32 +1,36 @@
+"""The routes defined by the members package"""
 from django.urls import path, include
 
-from . import views
+from members.views import (
+    MembersIndex, StatisticsView, ProfileDetailView,
+    UserAccountView, UserProfileUpdateView,
+    EmailChangeFormView,
+    EmailChangeVerifyView, EmailChangeConfirmView
+)
 
 app_name = "members"
 
 urlpatterns = [
-    path('iban-export/', views.iban_export,
-         name='iban-export'),
     path('members/', include([
-        path('', views.index,
-             name='index'),
-        path('statistics/', views.statistics,
+        path('', MembersIndex.as_view(), name='index'),
+        path('<slug:filter>/', MembersIndex.as_view(), name='index'),
+        path('statistics/', StatisticsView.as_view(),
              name='statistics'),
-        path('profile/<int:pk>', views.profile,
+        path('profile/<int:pk>', ProfileDetailView.as_view(),
              name='profile'),
     ])),
     path('user/', include([
-        path('', views.user,
+        path('', UserAccountView.as_view(),
              name='user'),
-        path('edit-profile/', views.edit_profile,
+        path('edit-profile/', UserProfileUpdateView.as_view(),
              name='edit-profile'),
-        path('change-email/', views.EmailChangeFormView.as_view(),
+        path('change-email/', EmailChangeFormView.as_view(),
              name='email-change'),
         path('change-email/verify/<uuid:key>/',
-             views.EmailChangeVerifyView.as_view(),
+             EmailChangeVerifyView.as_view(),
              name='email-change-verify'),
         path('change-email/confirm/<uuid:key>/',
-             views.EmailChangeConfirmView.as_view(),
+             EmailChangeConfirmView.as_view(),
              name='email-change-confirm'),
     ])),
 ]
diff --git a/website/members/views.py b/website/members/views.py
index ddeee4d6847ac0169b590086871b50aa43b91ce5..8b1dd56995ff6fe10b9adec5368e8dd1d6ba855b 100644
--- a/website/members/views.py
+++ b/website/members/views.py
@@ -1,33 +1,40 @@
-import csv
+"""Views provided by the members package"""
 import json
 from datetime import date, datetime
-from django.contrib.auth.decorators import login_required, permission_required
-from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
-from django.db.models import Q
-from django.http import HttpResponse, Http404
-from django.shortcuts import get_object_or_404, render
+
+from django.contrib.auth.decorators import login_required
+from django.contrib.messages.views import SuccessMessageMixin
+from django.db.models import Q, QuerySet
+from django.http import Http404, HttpResponse
+from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
+from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
-from django.utils.translation import gettext as _
-from django.views.generic import FormView
-from django.views.generic.base import TemplateResponseMixin, View
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import (ListView, DetailView, UpdateView,
+                                  CreateView)
+from django.views.generic.base import TemplateResponseMixin, View, TemplateView
 from rest_framework.authtoken.models import Token
 from rest_framework.authtoken.views import ObtainAuthToken
 from rest_framework.response import Response
 
 import pizzas.services
 from members import services, emails
-from members.models import EmailChange, Membership
+from members.decorators import membership_required
+from members.models import EmailChange, Membership, Member, Profile
 from utils.snippets import datetime_to_lectureyear
 from . import models
-from .forms import ProfileForm, EmailChangeForm
+from .forms import ProfileForm
 from .services import member_achievements
 from .services import member_societies
 
 
 class ObtainThaliaAuthToken(ObtainAuthToken):
+    """
+    Custom override of the AuthToken view to force lowercase the username
+    """
 
-    def post(self, request, *args, **kwargs):
+    def post(self, request, *args, **kwargs) -> HttpResponse:
         serializer = self.serializer_class(data={
             'username': request.data.get('username').lower()
             if 'username' in request.data else None,
@@ -39,232 +46,222 @@ class ObtainThaliaAuthToken(ObtainAuthToken):
         return Response({'token': token.key})
 
 
-def filter_users(tab, keywords, year_range):
-    memberships_query = Q(until__gt=datetime.now()) | Q(until=None)
-    members_query = ~Q(id=None)
-
-    if tab and tab.isdigit():
-        members_query &= Q(profile__starting_year=int(tab))
-        memberships_query &= Q(type=Membership.MEMBER)
-    elif tab == 'older':
-        members_query &= Q(profile__starting_year__lt=year_range[-1])
-        memberships_query &= Q(type=Membership.MEMBER)
-    elif tab == 'former':
-        # Filter out all current active memberships
-        memberships_query &= (Q(type=Membership.MEMBER) |
-                              Q(type=Membership.HONORARY))
-        memberships = models.Membership.objects.filter(memberships_query)
-        members_query &= ~Q(pk__in=memberships.values('user__pk'))
+@method_decorator(login_required, 'dispatch')
+@method_decorator(membership_required, 'dispatch')
+class MembersIndex(ListView):
+    """
+    View that renders the members overview
+    """
+    model = Member
+    paginate_by = 28
+    template_name = 'members/index.html'
+    context_object_name = 'members'
+    keywords = None
+    query_filter = ''
+    year_range = []
+
+    def setup(self, request, *args, **kwargs) -> None:
+        super().setup(request, *args, **kwargs)
+        current_lectureyear = datetime_to_lectureyear(date.today())
+        self.year_range = list(reversed(range(current_lectureyear - 5,
+                                              current_lectureyear + 1)))
+        self.keywords = request.GET.get('keywords', '').split() or None
+        self.query_filter = kwargs.get('filter', None)
+
+    def get_queryset(self) -> QuerySet:
+        memberships_query = Q(until__gt=datetime.now()) | Q(until=None)
+        members_query = ~Q(id=None)
+
+        if self.query_filter and self.query_filter.isdigit():
+            members_query &= Q(profile__starting_year=int(self.query_filter))
+            memberships_query &= Q(type=Membership.MEMBER)
+        elif self.query_filter == 'older':
+            members_query &= Q(profile__starting_year__lt=self.year_range[-1])
+            memberships_query &= Q(type=Membership.MEMBER)
+        elif self.query_filter == 'former':
+            # Filter out all current active memberships
+            memberships_query &= (Q(type=Membership.MEMBER) |
+                                  Q(type=Membership.HONORARY))
+            memberships = Membership.objects.filter(memberships_query)
+            members_query &= ~Q(pk__in=memberships.values('user__pk'))
         # Members_query contains users that are not currently (honorary)member
-    elif tab == 'benefactors':
-        memberships_query &= Q(type=Membership.BENEFACTOR)
-    elif tab == 'honorary':
-        memberships_query = Q(until__gt=datetime.now().date()) | Q(until=None)
-        memberships_query &= Q(type=Membership.HONORARY)
-
-    if keywords:
-        for key in keywords:
-            members_query &= (
-                (Q(profile__nickname__icontains=key) &
-                 # Works because relevant options all have `nick` in their key
-                 Q(profile__display_name_preference__contains='nick')) |
-                Q(first_name__icontains=key) |
-                Q(last_name__icontains=key) |
-                Q(username__icontains=key))
-
-    if tab == 'former':
-        memberships_query = (Q(type=Membership.MEMBER) |
-                             Q(type=Membership.HONORARY))
-        memberships = models.Membership.objects.filter(memberships_query)
-        all_memberships = models.Membership.objects.all()
-        # Only keep members that were once members, or are legacy users that
-        #  do not have any memberships at all
-        members_query &= (Q(pk__in=memberships.values('user__pk')) |
-                          ~Q(pk__in=all_memberships.values('user__pk')))
-    else:
-        memberships = models.Membership.objects.filter(memberships_query)
-        members_query &= Q(pk__in=memberships.values('user__pk'))
-    return (models.Member.objects
-            .filter(members_query)
-            .annotate()
-            .order_by('first_name'))
-
-
-@login_required
-def index(request):
-    query_filter = '' if request.GET.get(
-        'filter') is None else request.GET.get('filter')
-    keywords = '' if request.GET.get('keywords') is None else request.GET.get(
-        'keywords').split()
-
-    page = request.GET.get('page')
-    page = 1 if page is None or not page.isdigit() else int(page)
-
-    current_lectureyear = datetime_to_lectureyear(date.today())
-    year_range = list(reversed(range(current_lectureyear - 5,
-                                     current_lectureyear + 1)))
-
-    members = filter_users(query_filter, keywords, year_range)
-
-    paginator = Paginator(members, 24)
-
-    try:
-        members = paginator.page(page)
-    except PageNotAnInteger:
-        # If page is not an integer, deliver first page.
-        members = paginator.page(1)
-    except EmptyPage:
-        # If page is out of range (e.g. 9999), deliver last page of results.
-        members = paginator.page(paginator.num_pages)
-
-    page_range = range(1, paginator.num_pages + 1)
-    if paginator.num_pages > 7:
-        if page > 3:
-            page_range_end = paginator.num_pages
-            if page + 3 <= paginator.num_pages:
-                page_range_end = page + 3
-
-            page_range = range(page - 2, page_range_end)
-            while page_range.stop - page_range.start < 5:
-                page_range = range(page_range.start - 1, page_range.stop)
+        elif self.query_filter == 'benefactors':
+            memberships_query &= Q(type=Membership.BENEFACTOR)
+        elif self.query_filter == 'honorary':
+            memberships_query = Q(until__gt=datetime.now().date()) | Q(
+                until=None)
+            memberships_query &= Q(type=Membership.HONORARY)
+
+        if self.keywords:
+            for key in self.keywords:
+                # Works because relevant options all have `nick` in their key
+                members_query &= (
+                    (Q(profile__nickname__icontains=key) &
+                     Q(profile__display_name_preference__contains='nick')) |
+                    Q(first_name__icontains=key) |
+                    Q(last_name__icontains=key) |
+                    Q(username__icontains=key))
+
+        if self.query_filter == 'former':
+            memberships_query = (Q(type=Membership.MEMBER) |
+                                 Q(type=Membership.HONORARY))
+            memberships = Membership.objects.filter(memberships_query)
+            all_memberships = Membership.objects.all()
+            # Only keep members that were once members, or are legacy users
+            # that do not have any memberships at all
+            members_query &= (Q(pk__in=memberships.values('user__pk')) |
+                              ~Q(pk__in=all_memberships.values('user__pk')))
         else:
-            page_range = range(1, 6)
-
-    return render(request, 'members/index.html',
-                  {'members': members, 'filter': query_filter,
-                   'year_range': year_range, 'page_range': page_range,
-                   'keywords': keywords})
-
-
-@login_required
-def profile(request, pk=None):
-    if pk:
-        member = get_object_or_404(models.Member, pk=int(pk))
-    else:
-        member = request.member
-
-    # Group the memberships under the committees for easier template rendering
-    achievements = member_achievements(member)
-    societies = member_societies(member)
-
-    membership = member.current_membership
-    membership_type = _("Unknown membership history")
-    if membership:
-        membership_type = membership.get_type_display()
-    elif member.has_been_honorary_member():
-        membership_type = _("Former honorary member")
-    elif member.has_been_member():
-        membership_type = _("Former member")
-    elif member.latest_membership:
-        membership_type = _("Former benefactor")
-
-    return render(request, 'members/profile.html',
-                  {
-                      'achievements': achievements,
-                      'societies': societies,
-                      'member': member,
-                      'membership_type': membership_type,
-                  })
-
-
-@login_required
-def user(request):
-    return render(request, 'members/user.html')
-
-
-@login_required
-def edit_profile(request):
-    profile = get_object_or_404(models.Profile, user=request.user)
-    saved = False
-
-    if request.POST:
-        form = ProfileForm(request.POST, request.FILES, instance=profile)
-        if form.is_valid():
-            saved = True
-            form.save()
-    else:
-        form = ProfileForm(instance=profile)
-
-    return render(request, 'members/edit_profile.html',
-                  {'form': form, 'saved': saved})
-
-
-@permission_required('auth.change_user')
-def iban_export(request):
-    header_fields = ['name', 'username', 'iban', 'bic']
-    rows = []
-
-    members = models.Member.current_members.filter(
-        profile__auto_renew=True)
-
-    for member in members:
-        if (member.current_membership.type != 'honorary' and
-                member.bank_accounts.exists()):
-            bank_account = member.bank_accounts.last()
-            rows.append({
-                'name': bank_account.name,
-                'username': member.username,
-                'iban': bank_account.iban,
-                'bic': bank_account.bic
-            })
+            memberships = Membership.objects.filter(memberships_query)
+            members_query &= Q(pk__in=memberships.values('user__pk'))
+        return Member.objects.filter(members_query).order_by('first_name')
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+
+        page = context['page_obj'].number
+        paginator = context['paginator']
+
+        page_range = range(1, paginator.num_pages + 1)
+        if paginator.num_pages > 7:
+            if page > 3:
+                page_range_end = paginator.num_pages
+                if page + 3 <= paginator.num_pages:
+                    page_range_end = page + 3
+
+                page_range = range(page - 2, page_range_end)
+                while page_range.stop - page_range.start < 5:
+                    page_range = range(page_range.start - 1, page_range.stop)
+            else:
+                page_range = range(1, 6)
+
+        context.update({
+            'filter': self.query_filter,
+            'page_range': page_range,
+            'year_range': self.year_range,
+            'keywords': self.keywords
+        })
 
-    response = HttpResponse(content_type='text/csv')
-    writer = csv.DictWriter(response, header_fields)
-    writer.writeheader()
+        return context
 
-    for row in rows:
-        writer.writerow(row)
 
-    response['Content-Disposition'] = (
-        'attachment; filename="iban-export.csv"')
-    return response
+@method_decorator(login_required, 'dispatch')
+class ProfileDetailView(DetailView):
+    """
+    View that renders a member's profile
+    """
+    context_object_name = 'member'
+    model = Member
+    template_name = 'members/user/profile.html'
+
+    def setup(self, request, *args, **kwargs) -> None:
+        if 'pk' not in kwargs:
+            kwargs['pk'] = request.member.pk
+        super().setup(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+        member = context['member']
+
+        achievements = member_achievements(member)
+        societies = member_societies(member)
+
+        membership = member.current_membership
+        membership_type = _("Unknown membership history")
+        if membership:
+            membership_type = membership.get_type_display()
+        elif member.has_been_honorary_member():
+            membership_type = _("Former honorary member")
+        elif member.has_been_member():
+            membership_type = _("Former member")
+        elif member.latest_membership:
+            membership_type = _("Former benefactor")
+
+        context.update({
+            'achievements': achievements,
+            'societies': societies,
+            'membership_type': membership_type,
+        })
 
+        return context
 
-@login_required
-def statistics(request):
-    member_types = [t[0] for t in Membership.MEMBERSHIP_TYPES]
 
-    # The numbers
-    total = models.Member.current_members.count()
+@method_decorator(login_required, 'dispatch')
+class UserAccountView(TemplateView):
+    """
+    View that renders the account options page
+    """
+    template_name = 'members/user/index.html'
+
+
+@method_decorator(login_required, 'dispatch')
+class UserProfileUpdateView(SuccessMessageMixin, UpdateView):
+    """
+    View that allows a user to update their profile
+    """
+    template_name = 'members/user/edit_profile.html'
+    model = Profile
+    form_class = ProfileForm
+    success_url = reverse_lazy('members:edit-profile')
+    success_message = _('Your profile has been updated successfully.')
 
-    context = {
-        "total_members": total,
-        "statistics": json.dumps({
-            "cohort_sizes": services.gen_stats_year(member_types),
-            "member_type_distribution":
-                services.gen_stats_member_type(member_types),
-            "total_pizza_orders": pizzas.services.gen_stats_pizza_orders(),
-            "current_pizza_orders":
-                pizzas.services.gen_stats_current_pizza_orders(),
+    def get_object(self, queryset=None) -> Profile:
+        return get_object_or_404(models.Profile, user=self.request.user)
+
+
+@method_decorator(login_required, 'dispatch')
+class StatisticsView(TemplateView):
+    """
+    View that renders the statistics page
+    """
+    template_name = 'members/statistics.html'
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+
+        member_types = [t[0] for t in Membership.MEMBERSHIP_TYPES]
+        total = models.Member.current_members.count()
+
+        context.update({
+            "total_members": total,
+            "statistics": json.dumps({
+                "cohort_sizes": services.gen_stats_year(member_types),
+                "member_type_distribution":
+                    services.gen_stats_member_type(member_types),
+                "total_pizza_orders": pizzas.services.gen_stats_pizza_orders(),
+                "current_pizza_orders":
+                    pizzas.services.gen_stats_current_pizza_orders(),
+            })
         })
-    }
 
-    return render(request, 'members/statistics.html', context)
+        return context
 
 
 @method_decorator(login_required, name='dispatch')
-class EmailChangeFormView(FormView):
+class EmailChangeFormView(CreateView):
     """
     View that renders the email change form
     """
-    form_class = EmailChangeForm
-    template_name = 'members/email_change.html'
+    model = EmailChange
+    fields = ['email', 'member']
+    template_name = 'members/user/email_change.html'
 
-    def get_initial(self):
+    def get_initial(self) -> dict:
         initial = super().get_initial()
         initial['email'] = self.request.member.email
         return initial
 
-    def post(self, request, *args, **kwargs):
+    def post(self, request, *args, **kwargs) -> HttpResponse:
         request.POST = request.POST.dict()
         request.POST['member'] = request.member.pk
         return super().post(request, *args, **kwargs)
 
-    def form_valid(self, form):
+    def form_valid(self, form) -> HttpResponse:
         change_request = form.save()
         emails.send_email_change_confirmation_messages(change_request)
-        return TemplateResponse(request=self.request,
-                                template='members/email_change_requested.html')
+        return TemplateResponse(
+            request=self.request,
+            template='members/user/email_change_requested.html')
 
 
 @method_decorator(login_required, name='dispatch')
@@ -272,9 +269,9 @@ class EmailChangeConfirmView(View, TemplateResponseMixin):
     """
     View that renders an HTML template and confirms the old email address
     """
-    template_name = 'members/email_change_confirmed.html'
+    template_name = 'members/user/email_change_confirmed.html'
 
-    def get(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs) -> HttpResponse:
         if not EmailChange.objects.filter(confirm_key=kwargs['key']).exists():
             raise Http404
 
@@ -290,9 +287,9 @@ class EmailChangeVerifyView(View, TemplateResponseMixin):
     """
     View that renders an HTML template and verifies the new email address
     """
-    template_name = 'members/email_change_verified.html'
+    template_name = 'members/user/email_change_verified.html'
 
-    def get(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs) -> HttpResponse:
         if not EmailChange.objects.filter(verify_key=kwargs['key']).exists():
             raise Http404
 
diff --git a/website/thaliawebsite/urls.py b/website/thaliawebsite/urls.py
index 329c8eba53001b51477a73bf09bceb74e8ef66da..72320262a197781335a6eedad83147587bcb4265 100644
--- a/website/thaliawebsite/urls.py
+++ b/website/thaliawebsite/urls.py
@@ -89,10 +89,9 @@ urlpatterns = [  # pylint: disable=invalid-name
         path('sibling-associations/', SiblingAssociationsView.as_view(), name='sibling-associations'),
         url(r'^thabloid/', include('thabloid.urls')),
     ])),
-    url(r'^', include([  # 'for members' menu
+    url(r'^members/', include([  # 'for members' menu
         path('become-active/', BecomeActiveView.as_view(), name='become-active'),
         url(r'^photos/', include('photos.urls')),
-        path('statistics/', members.views.statistics, name='statistics'),
         path('styleguide/', StyleGuideView.as_view(), name='styleguide'),
     ])),
     url(r'^career/', include('partners.urls')),
diff --git a/website/utils/templatetags/urlparams.py b/website/utils/templatetags/urlparams.py
new file mode 100644
index 0000000000000000000000000000000000000000..55678cccf18298aac20e36a874ce083753c11d93
--- /dev/null
+++ b/website/utils/templatetags/urlparams.py
@@ -0,0 +1,12 @@
+from django import template
+from urllib.parse import urlencode
+
+register = template.Library()
+
+
+@register.simple_tag
+def urlparams(*_, **kwargs):
+    safe_args = {k: v for k, v in kwargs.items() if v is not None}
+    if safe_args:
+        return '?{}'.format(urlencode(safe_args))
+    return ''