diff --git a/biscuit/apps/alsijil/templates/alsijil/group_week.html b/biscuit/apps/alsijil/templates/alsijil/group_week.html
index d14a1faa86ab1df56e60af0ddbb005433019b8d1..65f7e9b28ecdf6808bd53ed1138d02db45c04dd1 100644
--- a/biscuit/apps/alsijil/templates/alsijil/group_week.html
+++ b/biscuit/apps/alsijil/templates/alsijil/group_week.html
@@ -1,15 +1,11 @@
 {# -*- engine:django -*- #}
 
-{% extends "core/base.html" %}
+{% extends "core/turnable.html" %}
 {% load bootstrap4 font_awesome i18n week_helpers %}
 
 {% block bootstrap4_title %}{% blocktrans%}Current week{% endblocktrans %} — {{ block.super }}{% endblock %}
 
-{% block page_title %}
-  {% blocktrans %}Week{% endblocktrans %} {{ week }} ({{ week|week_start }} - {{ week|week_end }}), {{ group.name }}
-{% endblock %}
-
-{% block content %}
+{% block current_content %}
   <form method="get">
     <ul id="timetable_select_form">
       {{ select_form.as_ul }}
@@ -25,14 +21,6 @@
         <div class="card">
           <div class="card-header bg-light text-dark">
             {% blocktrans %}Lessons{% endblocktrans %}
-            <div class="btn-group" role="group" aria-label="Week actions">
-              <a href="{% url 'group_week_by_week' week_prev %}?{{ request.GET.urlencode }}" class="btn btn-secondary">
-                {% fa 'arrow-left' %}
-              </a>
-              <a href="{% url 'group_week_by_week' week_next %}?{{ request.GET.urlencode }}" class="btn btn-secondary">
-                {% fa 'arrow-right' %}
-              </a>
-            </div>
           </div>
           <div class="card-body">
             {% regroup lesson_periods by period.get_weekday_display as periods_by_day %}
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 90dcd448402a87ec7ee863e43ad47a1a3e0d3fa7..aa742d945f8c5d3a43ede51a7627d948626182f7 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -147,9 +147,12 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse
     # Add a form to filter the view
     select_form = SelectForm(request.GET or None)
 
+
+
+    context['current_head'] = _('Week (%s %s - %s) ') % (wanted_week, week_start, week_end)
     context['week'] = wanted_week
-    context['week_next'] = wanted_week + 1
-    context['week_prev'] = wanted_week - 1
+    context['url_next'] = '%s?%s' % (redirect('group_week_by_week', week=wanted_week + 1), request.GET.urlencode())
+    context['url_prev'] = '%s?%s' % (redirect('group_week_by_week', week=wanted_week - 1), request.GET.urlencode())
     context['group'] = group
     context['lesson_periods'] = lesson_periods
     context['persons'] = persons