diff --git a/src/postorius/forms.py b/src/postorius/forms.py
index 22f4694..5b17d3d 100644
--- a/src/postorius/forms.py
+++ b/src/postorius/forms.py
@@ -184,9 +184,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,
@@ -263,6 +263,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'),
@@ -282,7 +283,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={
@@ -306,6 +308,7 @@
     )
     display_name = forms.CharField(
         label=_('Display name'),
+        help_text= ('Display name is the name shown in the web interface.')
     )
     reply_goes_to_list = forms.ChoiceField(
         label=_('Reply goes to list'),
@@ -339,7 +342,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,
@@ -477,6 +480,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 aaf6a7d..82fcaa4 100644
--- a/src/postorius/templates/postorius/lists/settings.html
+++ b/src/postorius/templates/postorius/lists/settings.html
@@ -14,7 +14,7 @@
     {% if visible_section %}
 
         <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 %}
+        <form class="well list_settings" action="{% url list_settings fqdn_listname=list.fqdn_listname visible_section=visible_section visible_option=visible_option %}" method="post"> {% csrf_token %}
         {% for field in form %}
             <tr><td>
                 {{ field.errors }}
diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html
index be01b8b..cbaf444 100644
--- a/src/postorius/templates/postorius/lists/summary.html
+++ b/src/postorius/templates/postorius/lists/summary.html
@@ -11,7 +11,7 @@
 
 
     <h2>{% trans 'Description' %}</h2>
-    <p>{{list.settings.description }}</h1>
+    <p>{{list.settings.description }}</p>
   
     <h2>{% trans 'Membership' %}</h2>
     {% if user.is_authenticated %}
@@ -22,6 +22,6 @@
     </form>
     {% else %}
         <p>To subscribe or unsubscribe this list you have to be logged in.</p>
-        <p><a href="{% url user_login %}"class="btn btn-small btn-primary">Log In</a></p>
+        <p><a href="{% url user_login %}" class="btn btn-small btn-primary">Login</a></p>
     {% endif %}
 {% endblock %}
diff --git a/src/postorius/templates/postorius/menu/list_nav.html b/src/postorius/templates/postorius/menu/list_nav.html
index 9ba570d..a0aec56 100644
--- a/src/postorius/templates/postorius/menu/list_nav.html
+++ b/src/postorius/templates/postorius/menu/list_nav.html
@@ -6,7 +6,7 @@
         <li class="mm_list_held_members"><a href="{% url list_members list.fqdn_listname %}">{% trans "Members" %}</a></li>
         <li class="mm_list_held_messages"><a href="{% url list_held_messages list.fqdn_listname %}">{% trans "Held Messages" %}</a></li>
         <li class="mm_list_metrics"><a href="{% url list_metrics list.fqdn_listname %}">{% trans "Metrics" %}</a></li>
-        <li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "Settings" %}</a></li>
+        <li class="mm_list_settings"><a href="{% url list_settings list.fqdn_listname %}">{% trans "List Settings" %}</a></li>
         <li class="mm_mass_subscribe"><a href="{% url mass_subscribe list.fqdn_listname %}">{% trans "Mass Subscribe" %}</a></li>
         <li class="mm_delete_list"><a class="btn btn-mini btn-danger" href="{% url list_delete list.fqdn_listname %}">{% trans "Delete List" %}</a></li>
         <li class="mm_new_list"><a class="btn btn-mini btn-success" href="{% url list_new %}">{% trans "New List" %}</a></li>
diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html
index 5c5057d..06b82d4 100644
--- a/src/postorius/templates/postorius/user_mailmansettings.html
+++ b/src/postorius/templates/postorius/user_mailmansettings.html
@@ -21,8 +21,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>
@@ -33,7 +32,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 ec928b9..714a7ab 100644
--- a/src/postorius/templates/postorius/user_profile.html
+++ b/src/postorius/templates/postorius/user_profile.html
@@ -12,15 +12,15 @@
     			<td>{{ mm_user.display_name}}</td>
     		</tr>
     		<tr>
-    			<th>{% trans 'User name' %}</th>
+    			<th>{% trans 'Username' %}</th>
     			<td>{{ user.username}}</td>
     		</tr>
     		<tr>
-    			<th>{% trans 'Firstname' %}</th>
+    			<th>{% trans 'First name' %}</th>
     			<td>&nbsp;</td>
     		</tr>
     		<tr>
-    			<th>{% trans 'Lastname' %}</th>
+    			<th>{% trans 'Last name' %}</th>
     			<td>&nbsp;</td>
     		</tr>
     		<tr>