diff --git a/passbook/admin/templates/administration/application/list.html b/passbook/admin/templates/administration/application/list.html
index 517fe3b5e..fe90d8e2d 100644
--- a/passbook/admin/templates/administration/application/list.html
+++ b/passbook/admin/templates/administration/application/list.html
@@ -9,6 +9,7 @@
 
 {% block content %}
 <div class="container">
+  <h1>{% trans "Applications" %}</h1>
   <a href="{% url 'passbook_admin:application-create' %}" class="btn btn-primary">
     {% trans 'Create...' %}
   </a>
@@ -27,8 +28,8 @@
         <tr>
           <td>{{ application.name }}</td>
           <td>{{ application.provider }}</td>
-          <td><a href="{% url 'passbook_admin:application-update' pk=application.uuid %}">{% trans 'Edit' %}</a></td>
-          <td><a href="{% url 'passbook_admin:application-delete' pk=application.uuid %}">{% trans 'Delete' %}</a></td>
+          <td><a href="{% url 'passbook_admin:application-update' pk=application.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a></td>
+          <td><a href="{% url 'passbook_admin:application-delete' pk=application.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a></td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/passbook/admin/templates/administration/rule/create.html b/passbook/admin/templates/administration/rule/create.html
deleted file mode 100644
index eff352942..000000000
--- a/passbook/admin/templates/administration/rule/create.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "generic/create.html" %}
-
-{% load i18n %}
-
-{% block title %}
-{% blocktrans with type=request.GET.type %}Create {{ type }}{% endblocktrans %}
-{% endblock %}
-
-{% block above_form %}
-<h1>{% blocktrans with type=request.GET.type %}Create {{ type }}{% endblocktrans %}</h1>
-{% endblock %}
\ No newline at end of file
diff --git a/passbook/admin/templates/administration/rule/list.html b/passbook/admin/templates/administration/rule/list.html
index 9dd13e781..9e9b65cd3 100644
--- a/passbook/admin/templates/administration/rule/list.html
+++ b/passbook/admin/templates/administration/rule/list.html
@@ -9,6 +9,7 @@
 
 {% block content %}
 <div class="container">
+  <h1>{% trans "Rules" %}</h1>
   <div class="dropdown">
     <button class="btn btn-primary dropdown-toggle" type="button" id="createDropdown" data-toggle="dropdown">
       {% trans 'Create...' %}
@@ -35,8 +36,8 @@
         <tr>
           <td>{{ rule.name }}</td>
           <td>{{ rule|fieldtype }}</td>
-          <td><a href="{% url 'passbook_admin:rule-update' pk=rule.uuid %}">{% trans 'Edit' %}</a></td>
-          <td><a href="{% url 'passbook_admin:rule-delete' pk=rule.uuid %}">{% trans 'Delete' %}</a></td>
+          <td><a href="{% url 'passbook_admin:rule-update' pk=rule.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a></td>
+          <td><a href="{% url 'passbook_admin:rule-delete' pk=rule.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a></td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/passbook/admin/templates/administration/source/create.html b/passbook/admin/templates/administration/source/create.html
deleted file mode 100644
index eff352942..000000000
--- a/passbook/admin/templates/administration/source/create.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "generic/create.html" %}
-
-{% load i18n %}
-
-{% block title %}
-{% blocktrans with type=request.GET.type %}Create {{ type }}{% endblocktrans %}
-{% endblock %}
-
-{% block above_form %}
-<h1>{% blocktrans with type=request.GET.type %}Create {{ type }}{% endblocktrans %}</h1>
-{% endblock %}
\ No newline at end of file
diff --git a/passbook/admin/templates/administration/source/list.html b/passbook/admin/templates/administration/source/list.html
index a79a8fa27..444f0b873 100644
--- a/passbook/admin/templates/administration/source/list.html
+++ b/passbook/admin/templates/administration/source/list.html
@@ -5,6 +5,7 @@
 
 {% block content %}
 <div class="container">
+  <h1>{% trans "Sources" %}</h1>
   <div class="dropdown">
     <button class="btn btn-primary dropdown-toggle" type="button" id="createDropdown" data-toggle="dropdown">
       {% trans 'Create...' %}
@@ -31,8 +32,8 @@
         <tr>
           <td>{{ source.name }}</td>
           <td>{{ source.cast|fieldtype }}</td>
-          <td><a href="{% url 'passbook_admin:source-update' pk=source.uuid %}">{% trans 'Edit' %}</a></td>
-          <td><a href="{% url 'passbook_admin:source-delete' pk=source.uuid %}">{% trans 'Delete' %}</a></td>
+          <td><a href="{% url 'passbook_admin:source-update' pk=source.uuid %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a></td>
+          <td><a href="{% url 'passbook_admin:source-delete' pk=source.uuid %}?back={{ request.get_full_path }}">{% trans 'Delete' %}</a></td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/passbook/admin/templates/generic/list.html b/passbook/admin/templates/generic/list.html
index c0fa90cb2..a3ee7ac83 100644
--- a/passbook/admin/templates/generic/list.html
+++ b/passbook/admin/templates/generic/list.html
@@ -20,7 +20,7 @@
         <tr>
           <td>{{ source.name }}</td>
           <td>{{ source.cast|fieldtype }}</td>
-          <td><a href="{% url 'passbook_admin:source-update' pk=source.pk %}">{% trans 'Edit' %}</a></td>
+          <td><a href="{% url 'passbook_admin:source-update' pk=source.pk %}?back={{ request.get_full_path }}">{% trans 'Edit' %}</a></td>
         </tr>
       {% endfor %}
     </tbody>