diff --git a/src/postorius/templates/postorius/user/profile.html b/src/postorius/templates/postorius/user/profile.html
index 94f74e5..7e6124c 100644
--- a/src/postorius/templates/postorius/user/profile.html
+++ b/src/postorius/templates/postorius/user/profile.html
@@ -14,25 +14,35 @@
     <table class="table table-bordered table-striped">
         <tbody>
             <tr>
-                <td>{% trans 'Mailman display name' %}</td>
-                <td>{{ mm_user.display_name }}</td>
+                <th>{% trans 'Mailman display name' %}</th>
+                <td>
+                  <form class="form-inline" action="" method="post">
+                      {% csrf_token %}
+                      <div class="form-group">
+                          {{ name_form.display_name|add_form_control }}
+                      </div>
+                      <input type="hidden" name="formname" value="displayname" />
+                      <button class="btn btn-primary"
+                              type="submit">{% trans 'Update' %}</button>
+                  </form>
+                </td>
             </tr>
             <tr>
-                <td>{% trans 'Username' %}</td>
+                <th>{% trans 'Username' %}</th>
                 <td>{{ user.username }}</td>
             </tr>
             <tr>
-                <td>{% trans 'Main email' %}</td>
+                <th>{% trans 'Main email' %}</th>
                 <td>{{ user.email}}</td>
             </tr>
             {% if user.other_emails %}
                 <tr>
-                    <td>{% trans 'Other emails' %}</td>
-                    <td><ul class="unstyled">
+                    <th>{% trans 'Other emails' %}</th>
+                    <td>
                         {% for email in user.other_emails %}
-                            <li>{{ email }}</li>
+                            <p>&bull; {{ email }}</p>
                         {% endfor %}
-                    </ul></td>
+                    </td>
                 </tr>
             {% endif %}
             <tr>
@@ -44,32 +54,25 @@
                             to use different addresses for your subscriptions.
                         {% endblocktrans %}
                     </p>
-                    <form class="form-horizontal" action="" method="post">
+                    <form class="form-inline" action="" method="post">
                         {% csrf_token %}
                         {% if form.non_field_errors %}
                             <div class="alert alert-danger">{{ form.non_field_errors }}</div>
                         {% endif %}
 
-                        <div class="input-group col-sm-5">
+                        <div class="form-group">
                             {{ form.email|add_form_control }}
-                            <span class="input-group-btn">
-                                <button class="btn btn-primary" type="submit">
-                                    <span class="glyphicon glyphicon-plus"></span>
-                                </button>
-                            </span>
                         </div>
 
                         {% for error in form.email.errors %}
                             <div class="text-danger">{{ error }}</div>
                         {% endfor %}
+                        <button class="btn btn-primary" type="submit">
+                          {% trans 'Add' %}
+                        </button>
                     </form>
                 </td>
             </tr>
         </tbody>
     </table>
-    <hr />
-    <form class="form-horizontal" action="" method="post">
-        {% render_form_horizontal name_form 2 5 'Change display name' %}
-        <input type="hidden" name="formname" value="displayname" />
-    </form>
 {% endblock main %}