diff --git a/src/teams/migrations/0045_merge_20180805_1131.py b/src/teams/migrations/0045_merge_20180805_1131.py
new file mode 100644
index 00000000..5eb121ee
--- /dev/null
+++ b/src/teams/migrations/0045_merge_20180805_1131.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.0.4 on 2018-08-05 09:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('teams', '0044_auto_20180702_1507'),
+ ('teams', '0043_auto_20180804_1641'),
+ ]
+
+ operations = [
+ ]
diff --git a/src/teams/templates/shifts/shift_confirm_delete.html b/src/teams/templates/shifts/shift_confirm_delete.html
deleted file mode 100644
index 57ee688b..00000000
--- a/src/teams/templates/shifts/shift_confirm_delete.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-
- Cancel
-
-
-
-
-
-
-{% endblock %}
diff --git a/src/teams/templates/team_base.html b/src/teams/templates/team_base.html
index 8ef87216..3b36ede8 100644
--- a/src/teams/templates/team_base.html
+++ b/src/teams/templates/team_base.html
@@ -37,6 +37,12 @@ Team: {{ team.name }} | {{ block.super }}
+
+
+ Shifts
+
+
+
{% if request.user in team.responsible_members.all %}
diff --git a/src/teams/templates/team_shift_confirm_delete.html b/src/teams/templates/team_shift_confirm_delete.html
new file mode 100644
index 00000000..51b3992c
--- /dev/null
+++ b/src/teams/templates/team_shift_confirm_delete.html
@@ -0,0 +1,10 @@
+{% extends 'team_base.html' %}
+
+{% block team_content %}
+
+
+
+{% endblock %}
diff --git a/src/teams/templates/shifts/shift_form.html b/src/teams/templates/team_shift_form.html
similarity index 55%
rename from src/teams/templates/shifts/shift_form.html
rename to src/teams/templates/team_shift_form.html
index 511ba5ce..a8f9da76 100644
--- a/src/teams/templates/shifts/shift_form.html
+++ b/src/teams/templates/team_shift_form.html
@@ -1,16 +1,9 @@
-{% extends 'base.html' %}
+{% extends 'team_base.html' %}
{% load commonmark %}
{% load bootstrap3 %}
-{% block content %}
-
-
- Cancel
-
-
-
+{% block team_content %}