diff --git a/templates/mailman-django/lists/mass_subscribe.html b/templates/mailman-django/lists/mass_subscribe.html
index ea3060c..c231b20 100644
--- a/templates/mailman-django/lists/mass_subscribe.html
+++ b/templates/mailman-django/lists/mass_subscribe.html
@@ -1,36 +1,23 @@
 {% extends "mailman-django/base.html" %}
 {% load i18n %}
 
-{% block links%}
-{% url list_info fqdn_listname as url_list_info %}
-{% url list_delete fqdn_listname as url_list_delete %}
-{% url list_settings fqdn_listname as url_list_settings %}
-
-{% blocktrans %}
-
-You can also <a href="{{url_list_info}}">subscribe or unsubscribe</a> a user to the list "the normal way" or <a href="{{ url_list_delete }}">delete</a> the list. To go back to the general settings page, please click <a href="{{ url_list_settings}}">here</a>.{% endblocktrans %}
+{% block heading %}
+    {% trans "Mass Subscribe Users <span> to" %} {{list.fqdn_listname}}</span>
 {% endblock %}
 
-{% block content %}
+{% block header %}
+    <div class="mm_box">
+        <div class="mm_boxHeader">{% trans "Form" %}</div>
 
-<h1>{% trans "Mass Subscribe Users" %}</h1>
+        <p>{% blocktrans %}Here you can mass subscribe users to the list    <em>{{ list.fqdn_listname }}</em>. To do so, please enter one name on each row.{% endblocktrans %}</p>
 
-<p id=logout><a href="{% url logout %}">{% trans "Logout" %}</a></p>
+        <form action="{% url mass_subscribe list.fqdn_listname %}" method="post" class="mass_subscribe">
 
-<p>{% blocktrans %}Here you can mass subscribe users to the list <em>{{ fqdn_listname }}</em>. To do so, please enter one name on each row.{% endblocktrans %}</p>
+        {{ form.as_div }}
 
-{% if message %}
-    <p id="message">{{ message }}</p>
-{% endif %}
-
-<form action="{% url mass_subscribe fqdn_listname %}" method="post" class="mass_subscribe">
-
-{{ form.as_div }}
-
-    <div class="field">
-        <button type="submit">{% trans "Subscribe users" %}</button>
+            <div class="field">
+                <button type="submit">{% trans "Subscribe users" %}</button>
+            </div>
+        </form>
     </div>
-
-</form>
-
 {% endblock %}
diff --git a/urls.py b/urls.py
index ae5c902..aa3d245 100644
--- a/urls.py
+++ b/urls.py
@@ -30,13 +30,13 @@
     url(r'^lists/$', 'list_index', name = 'list_index'),
     url(r'^lists/new/$', 'list_new', name = 'list_new'),
     url(r'^lists/(?P<fqdn_listname>[^/]+)/$', 'list_summary', name = 'list_summary'), #PUBLIC
-    url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/(?:(?P<option>subscribe|unsubscribe)?)(/(?P<user_email>.+))?$', 'list_subscriptions', name = 'list_subscriptions'),
+    url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/(?:(?P<option>subscribe|unsubscribe)?)(/(?P<user_email>.+))?$', 'list_subscriptions', name = 'list_subscriptions'),#public
+    url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/mass_subscribe/$', 'mass_subscribe', name = 'mass_subscribe'),#admin
     url(r'^delete_list/(?P<fqdn_listname>[^/]+)/$', 'list_delete', name = 'list_delete'),
     url(r'^user_settings/(?P<member>[^/]+)/$', 'user_settings', kwargs={"tab": "user"}, name = 'user_settings'),
     url(r'^membership_settings/(?P<member>[^/]+)/$', 'user_settings', kwargs={"tab": "membership"}, name = 'membership_settings'),
     #url(r'^settings/(?P<fqdn_listname>[^/]+)/(?P<visible_section>[^/]+)?/(?P<visible_option>.+)?$', 'list_settings', name = 'list_settings'),
     url(r'^settings/(?P<fqdn_listname>[^/]+)/(?P<visible_section>[^/]+)?(?:/(?P<visible_option>.*))?$', 'list_settings', name = 'list_settings'),    
-    url(r'^settings/(?P<fqdn_listname>[^/]+)/mass_subscribe/$', 'mass_subscribe', name = 'mass_subscribe'),
     ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)#https://docs.djangoproject.com/en/dev/howto/static-files/#serving-static-files-in-production
 
 
diff --git a/views.py b/views.py
index 314c77c..d40e6b6 100644
--- a/views.py
+++ b/views.py
@@ -292,7 +292,7 @@
                                          }
                                          ,context_instance=RequestContext(request))
 
-#@login_required
+#@login_required #debug
 def list_delete(request, fqdn_listname = None, 
                 template = 'mailman-django/lists/index.html'):
     """
@@ -386,7 +386,7 @@
                                          }
                                          ,context_instance=RequestContext(request))
 
-@login_required
+#@login_required #debug
 def mass_subscribe(request, fqdn_listname = None, 
                    template = 'mailman-django/lists/mass_subscribe.html'):
     """