diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index 230add0..429c493 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -210,9 +210,9 @@
         required=False,
         label= _('Include RFC2369 headers'))
     autorespond_choices = (
-        ("none", _("No automatic response")),
+        ("respond_and_continue", _("Respond and continue processing")),
         ("respond_and_discard", _("Respond and discard message")),
-        ("respond_and_continue", _("Respond and continue processing")))
+        ("none", _("No automatic response")))
     autorespond_owner = forms.ChoiceField(
         choices=autorespond_choices,
         widget=forms.RadioSelect,
@@ -289,6 +289,7 @@
         choices=action_choices)
     description = forms.CharField(
         label=_('Description'),
+        help_text=('This description is used when the mailing list is listed with other mailing lists, or in headers, and so forth. It should be as succinct as you can get it, while still identifying what the list is.'),
         widget=forms.Textarea())
     digest_size_threshold = forms.DecimalField(
         label=_('Digest size threshold'),
@@ -308,7 +309,8 @@
         label=_('Mail Host'),
         error_messages={'required': _('Please a domain name'),
                         'invalid': _('Please enter a valid domain name.')},
-        required=True)
+        required=True,
+        help_text="The \"host_name\" is the preferred name for email to mailman-related addresses on this host, and generally should be the mail host's exchanger address, if any. This setting can be useful for selecting among alternative names of a host that has multiple addresses.")
     next_digest_number = forms.IntegerField(
         label=_('Next digest number'),
         error_messages={
@@ -332,6 +334,7 @@
     )
     display_name = forms.CharField(
         label=_('Display name'),
+        help_text= ('Display name is the name shown in the web interface.')
     )
     subject_prefix = forms.CharField(
         label=_('Subject prefix'),
@@ -368,7 +371,7 @@
     admin_notify_mchanges = forms.BooleanField(
         widget=forms.RadioSelect(choices=choices),
         required=False,
-        label=_('Admin notify mchanges'))
+        label=_('Admin notify changes'))
     administrivia = forms.BooleanField(
         widget=forms.RadioSelect(choices=choices),
         required=False,
@@ -506,6 +509,8 @@
         widget=forms.Textarea,
     )
 
+    verify_with_email = forms.BooleanField(required=False)
+
     class Meta:
         """
         Class to define the name of the fieldsets and what should be
diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html
index 3d0c6ac..5127218 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -16,7 +16,6 @@
 
         <table class="well">
         <form class="well" action="{% url 'list_settings' fqdn_listname=list.fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post" class="list_settings"> {% csrf_token %}
-        {% for field in form %}
             <tr><td>
                 {{ field.errors }}
                 {{ field.label_tag }}: <br />
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index f3afda2..95af2f4 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -6,9 +6,13 @@
 {% block body_class %}list_summary{% endblock %}
 
 {% block main %}
-    {% list_nav 'list_summary' 'List Info' %}
+    {% if user.is_superuser %}
+        {% include 'postorius/menu/list_nav.html' %}
+    {% endif %}
+    <h1>{{list.display_name}}</h1>
 
-    <h2>{% trans 'About this list' %}</h2>
+
+    <h2>{% trans 'Description' %}</h2>
     <p>{{list.settings.description }}</p>
   
     <h2>{% trans 'Subscribe to this list' %}</h2>
@@ -20,6 +24,10 @@
     </form>
     {% else %}
         <p>To subscribe or unsubscribe this list you have to be logged in.</p>
+<<<<<<< TREE
         <p><a href="{% url 'user_login' %}"class="btn btn-primary">Log In</a></p>
+=======
+        <p><a href="{% url user_login %}" class="btn btn-small btn-primary">Login</a></p>
+>>>>>>> MERGE-SOURCE
     {% endif %}
 {% endblock %}
diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html
index 61b14e8..7b2f8cc 100644
--- a/src/postorius/templates/postorius/user_mailmansettings.html
+++ b/src/postorius/templates/postorius/user_mailmansettings.html
@@ -22,8 +22,7 @@
     {% for pref in mm_user.preferences %}
         <li>{{ pref }}</li>
     {% endfor %}
-    </ul>
-
+    
     <h2>List memberships:</h2>
     <p><em class="errorlist">Sample output: not real</em></p>
     <ul>
@@ -34,7 +33,6 @@
         <li>starfruit@example.com [<a href="#">listinfo</a>] 
             [<a href="#">settings</a>]</li>
     </ul>
-    </ul>
 <!--
     <script type="text/javascript"
 src="http://code.jquery.com/jquery-latest.js"></script>
diff --git a/src/postorius/templates/postorius/user_profile.html b/src/postorius/templates/postorius/user_profile.html
index 1f7e224..a8c7778 100644
--- a/src/postorius/templates/postorius/user_profile.html
+++ b/src/postorius/templates/postorius/user_profile.html
@@ -17,23 +17,23 @@
     			<td>{{ user.username}}</td>
     		</tr>
     		<tr>
-    			<td>{% trans 'Firstname' %}</td>
+    			<th>{% trans 'First name' %}</th>
     			<td>&nbsp;</td>
     		</tr>
     		<tr>
-    			<td>{% trans 'Lastname' %}</td>
+    			<th>{% trans 'Last name' %}</th>
     			<td>&nbsp;</td>
     		</tr>
     		<tr>
-    			<td>{% trans 'IRC handle' %}</td>
+    			<th>{% trans 'IRC handle' %}</th>
     			<td>&nbsp;</td>
     		</tr>
     		<tr>
-    			<td>{% trans 'Website' %}</td>
+    			<th>{% trans 'Website' %}</th>
     			<td>&nbsp;</td>
     		</tr>
     		<tr>
-    			<td>{% trans 'Twitter' %}</td>
+    			<th>{% trans 'Twitter' %}</th>
     			<td>&nbsp;</td>
     		</tr>
     	</tbody>