diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index da68656..e093870 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -587,13 +587,10 @@
         layout = [["Mass subscription", "emails"]]
 
 
-class UserPreferences(FieldsetForm):
-    """Form handling the user's global preferences.
+class MembershipSettings(FieldsetForm):
+    """Form handling the membership settings.
     """
     choices = ((True, _('Yes')), (False, _('No')))
-    
-    delivery_mode_choices = (("regular", _('Regular')), ("plaintext_digests",_('Plain Text Digests')),("mime_digests",_('Mime Digests')),("summary_digests", _('Summary Digests'))) 
-    delivery_status_choices = (("enabled", _('Enabled')),("by_user",_('Disabled')))
     acknowledge_posts = forms.BooleanField(
         widget=forms.RadioSelect(choices=choices),
         required=False,
@@ -611,14 +608,22 @@
         required=False,
         label=_('Receive own postings'))
     delivery_mode = forms.ChoiceField(
-	widget =  forms.Select(),
-	choices = delivery_mode_choices,
-	required = False,
-	label = _('Delivery mode'))
-    delivery_status = forms.ChoiceField(
-	widget = forms.Select(),
+        widget=forms.Select(),
+        error_messages={
+            'required': _("Please choose a mode.")},
         required=False,
-        choices= delivery_status_choices,
+        choices=(
+            ("", _("Please choose")),
+            ("delivery_mode", "some mode...")),
+        label=_('Delivery mode'))
+    delivery_status = forms.ChoiceField(
+        widget=forms.Select(),
+        error_messages={
+            'required': _("Please choose a status.")},
+        required=False,
+        choices=(
+            ("", _("Please choose")),
+            ("delivery_status", "some status...")),
         label=_('Delivery status'))
 
     class Meta:
@@ -630,6 +635,7 @@
                    "receive_list_copy", "receive_own_postings",
                    "delivery_mode", "delivery_status"]]
 
+
 class UserNew(FieldsetForm):
     """
     Form field to add a new user
diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html
index accd7d0..273292b 100644
--- a/src/postorius/templates/postorius/user_mailmansettings.html
+++ b/src/postorius/templates/postorius/user_mailmansettings.html
@@ -12,56 +12,90 @@
     {% else %}
 
     <div class="mm_subHeader">
-        <h2>{% trans "Subscription Settings" %} <span>- {{ user }}</span></h2>
+        <h1>{% trans "Subscription Settings" %} <span>- {{ user }}</span></h1>
     </div>
 
-  
+    <p><strong>Mailman display name:</strong> {{ mm_user.display_name}}</p>
+    <p><strong>Django email:</strong> {{ user.email }}</p>
+    <p><strong>Mailman primary email:</strong> {{ mm_user.email }}</p>
+    <h2>Valid email addresses for this account:</h2>
+    <ul>
+<!-- ADDRESSES/EMAIL@/MEMBERSHIPS -->
+    {% for address in mm_user.addresses %}
+        <li>{{ address }}</li>
+    {% endfor %}
+    </ul>
 
-<h2> Global Preferences Overview </h2>
-<!-- Table displaying the user's global Mailman preferencesc, may be removed-->
-<table class="table table-bordered table-striped mm_userData">
-        <tbody>
-            <tr>
-                <td>{% trans 'Receive List Copy' %}</td>
-                <td>{{ mm_user.preferences.receive_list_copy }}</td>
-            </tr>
-            <tr>
-                <td>{% trans 'Hide Address' %}</td>
-                <td>{{ mm_user.preferences.hide_address }}</td>
-            </tr>
-            <tr>
-                <td>{% trans 'Preferred Language' %}</td>
-                <td>{{ mm_user.preferences.preferred_language }}</td>
-            </tr>
-            <tr>
-                <td>{% trans 'Acknowledge Posts' %}</td>
-                <td>{{ mm_user.preferences.acknowledge_posts }}</td>
-            </tr>
-            <tr>
-                <td>{% trans 'Delivery Mode' %}</td>
-                <td>{{ mm_user.preferences.delivery_mode }}</td>
-            </tr>
-            <tr>
-                <td>{% trans 'Receive Own Postings' %}</td>
-                <td>{{ mm_user.preferences.receive_own_postings }}</td>
-            </tr>
-            <tr>
-                <td>{% trans 'Delivery Status' %}</td>
-                <td>{{ mm_user.preferences.delivery_status }}</td>
-            </tr>
-   
-        </tbody>
- </table>
+    <h2 style="color: red">WARNING: This page is currently a mockup and
+anything below this line may not work</h2>
 
+    <h2>Preferences:</h2>
+    <p>preferences: {{ mm_user.preferences }}
+    <p>user: {{ mm_user }}
+    <p>tko
+    <p>memberships: {{ membership_lists }}
+    {% for pref in mm_user.preferences %}
+        <li>{{ pref }}</li>
+    {% endfor %}
+    
+    <p><em class="errorlist">Sample output: not real</em></p>
+    <ul>
+        <li>list1@example.com [<a href="#">listinfo</a>] 
+            [<a href="#">settings</a>]</li>
+        <li>kumquat@example.com [<a href="#">listinfo</a>] 
+            [<a href="#">settings</a>]</li>
+        <li>starfruit@example.com [<a href="#">listinfo</a>] 
+            [<a href="#">settings</a>]</li>
+    </ul>
 
-    <h2>Global Preferences Form</h2>
-    <!-- Form to modify the user's global Mailman preferences -->
+    <h2>Prefs form</h2>
     <form action="{% url 'user_mailmansettings' %}" method="post" class="well"> {% csrf_token %}
         {{ settingsform.as_p }}
         <button class="btn btn-success" type="submit">{% trans "Save" %}</button>
     </form>
 
-     
+    <h2>List Preferences Overview</h2>
+    <p><em class="errorlist">Sample output: not real</em></p>
+    <input id="btnHide" type="button" value="{% trans "Hide Descriptions" %}"/>
+    <form action="#"> {% csrf_token %}
+    <table class="table table-bordered table-striped">
+        <tr>
+            <th>{% trans "Setting" %}</th>
+            <th>{% trans "Description" %}</th>
+            <th>{% trans "Set all" %}</th>
+            <th class="rotate">list1@example.com</th>
+            <th class="rotate">kumquat@example.com</th>
+            <th class="rotate">starfruit@example.com</th>
+        </tr>
+        <tr>
+            <th>{% trans "Mail delivery" %} ({{ preference }})</th>
+            <td>Set this option to <em>Enabled</em> to receive
+messages posted
+        to this mailing list.  Set it to <em>Disabled</em> if you want
+        to stay subscribed, but don't want mail delivered to you for a
+        while (e.g. you're going on vacation).  If you disable mail
+        delivery, don't forget to re-enable it when you come back; it
+        will not be automatically re-enabled." </td>
+            <td><input type="checkbox" /></td>
+            <td><input type="checkbox" /></td>
+            <td><input type="checkbox" /></td>
+            <td><input type="checkbox" /></td>
+        </tr>
+    {% for preference in mm_user.preferences %}
+    {% endfor %}
+        <tr>
+            <th colspan="6">{% trans "Per-Email subscriptions" %}</th>
+        </tr>
+        <tr>
+            <th colspan="2">anna@example.com</th>
+            <td><input type="checkbox" /></td>
+            <td><input type="checkbox" /></td>
+            <td><input type="checkbox" /></td>
+            <td><input type="checkbox" /></td>
+        <tr>
+        </tr>
+    </table>
+    </form>
     {% endif %}
 {% endblock main %}
-~   
+~                      
diff --git a/src/postorius/views/user.py b/src/postorius/views/user.py
index b6d2d5e..a5acb5c 100644
--- a/src/postorius/views/user.py
+++ b/src/postorius/views/user.py
@@ -53,23 +53,7 @@
 
     @method_decorator(login_required)
     def post(self, request):
-        try:
-            mm_user = MailmanUser.objects.get(address=request.user.email)
-	    userprefs_form = UserPreferences(request.POST)
-	    if userprefs_form.is_valid():
-		user_preferences = mm_user.preferences
-		for key in userprefs_form.fields.keys():
-                    user_preferences[key] = userprefs_form.cleaned_data[key]
-                    user_preferences.save()
-		messages.success(request, 'Your preferences have been updated.')
-            else:
-                messages.error(request, 'Something went wrong.')
-        except MailmanApiError:
-            return utils.render_api_error(request)
-        except HTTPError, e:
-            messages.error(request, e.msg)
-        return redirect("user_mailmansettings")
-
+        raise NotImplementedError
 
     @method_decorator(login_required)
     def get(self, request):
@@ -85,12 +69,13 @@
                 'postorius/user_mailmansettings.html',
                 {'nolists': 'true'},
                 context_instance=RequestContext(request))
-        settingsform = UserPreferences(initial = mm_user.preferences)
+        settingsform = MembershipSettings()
         return render_to_response('postorius/user_mailmansettings.html',
                                   {'mm_user': mm_user,
                                    'settingsform': settingsform},
                                   context_instance=RequestContext(request))
 
+
 class UserSummaryView(MailmanUserView):
     """Shows a summary of a user.
     """