diff --git a/src/accounts/templates/accounts/signup-form.html b/src/accounts/templates/accounts/signup-form.html
index 4ddb62a..7fe5b97 100644
--- a/src/accounts/templates/accounts/signup-form.html
+++ b/src/accounts/templates/accounts/signup-form.html
@@ -3,73 +3,71 @@
 {% load i18n %}
 {% block main-content %}
 
-<div class="container">
-  <h2>{% trans "Sign up" %}</h2>
+<h2>{% trans "Sign up" %}</h2>
 
-  {% if form.errors %}
-  <div>
-    <b>{% trans "Please correct the errors below and try again." %}</b>
-  </div>
-  {% endif %}
+{% if form.errors %}
+<div>
+  <b>{% trans "Please correct the errors below and try again." %}</b>
+</div>
+{% endif %}
 
-  <div class="row">
-    <div class="col-lg-11 well">
-      <label>{% trans "Avatar" %}</label >
-        <div id="avatar">
-          <img src="{{ STATIC_URL }}img/user.png" alt="user"/>
-        </div>
-        <p>
-          {% trans "Add an avatar to your account using" %} <a href="http://gravatar.com/" target="_blank">Gravatar</a>
-        </p>
-    </div>
+<div class="row">
+  <div class="col-lg-11 well">
+    <label>{% trans "Avatar" %}</label >
+      <div id="avatar">
+        <img src="{{ STATIC_URL }}img/user.png" alt="user"/>
+      </div>
+      <p>
+        {% trans "Add an avatar to your account using" %} <a href="http://gravatar.com/" target="_blank">Gravatar</a>
+      </p>
   </div>
+</div>
 
 
-  <p class="required">
-    <label>{% trans "Required fields" %}</label>
-  </p>
+<p class="required">
+  <label>{% trans "Required fields" %}</label>
+</p>
 
-  <form action="." method="post">
-    {% csrf_token %}
+<form action="." method="post">
+  {% csrf_token %}
 
-    <div class="row">
-      <div class="col-lg-5">
-        <fieldset class="well">
-          <legend>{% trans "Personal Information" %}</legend>
-          {% render_form_field form.first_name %}
-          {% render_form_field form.last_name %}
-          {% render_form_field form.email %}
-          {% render_form_field form.username %}
-        </fieldset>
+  <div class="row">
+    <div class="col-lg-5">
+      <fieldset class="well">
+        <legend>{% trans "Personal Information" %}</legend>
+        {% render_form_field form.first_name %}
+        {% render_form_field form.last_name %}
+        {% render_form_field form.email %}
+        {% render_form_field form.username %}
+      </fieldset>
 
-        <fieldset class="well">
-          <legend>{% trans "Others" %}</legend>
-          {% render_form_field form.twitter %}
-          {% render_form_field form.facebook %}
-          {% render_form_field form.google_talk %}
-          {% render_form_field form.webpage %}
-        </fieldset>
-      </div>
+      <fieldset class="well">
+        <legend>{% trans "Others" %}</legend>
+        {% render_form_field form.twitter %}
+        {% render_form_field form.facebook %}
+        {% render_form_field form.google_talk %}
+        {% render_form_field form.webpage %}
+      </fieldset>
+    </div>
 
-      <div class="col-lg-5 col-lg-offset-1">
-        <fieldset class="well">
-          <legend>{% trans "Professionals Information" %}</legend>
-          {% render_form_field form.institution %}
-          {% render_form_field form.role %}
-        </fieldset>
+    <div class="col-lg-5 col-lg-offset-1">
+      <fieldset class="well">
+        <legend>{% trans "Professionals Information" %}</legend>
+        {% render_form_field form.institution %}
+        {% render_form_field form.role %}
+      </fieldset>
 
-        <fieldset class="well">
-          <legend>{% trans "Subscribe to mail lists" %}</legend>
-          <div class="unstyled-list">
-            {% render_form_field form.lists %}
-          </div>
-        </fieldset>
-      </div>
+      <fieldset class="well">
+        <legend>{% trans "Subscribe to mail lists" %}</legend>
+        <div class="unstyled-list">
+          {% render_form_field form.lists %}
+        </div>
+      </fieldset>
+    </div>
 
-      <div class="col-lg-2 pull-right">
-        <input type="submit" value="{% trans 'Register' %}"/>
-      </div>
+    <div class="col-lg-2 pull-right">
+      <input type="submit" value="{% trans 'Register' %}"/>
     </div>
-  </form>
-</div>
+  </div>
+</form>
 {% endblock %}
diff --git a/src/colab/static/css/screen.css b/src/colab/static/css/screen.css
index d3dcef0..4e4622a 100644
--- a/src/colab/static/css/screen.css
+++ b/src/colab/static/css/screen.css
@@ -156,3 +156,28 @@ fieldset>legend {
 .blog-post-item .tags {
     margin-top: 1em;
 }
+
+.plus {
+    border: 1px dotted #ddd;
+    margin: 0;
+}
+
+.plus span {
+    vertical-align: middle;
+    height: 40px;
+    line-height: 40px;
+    font-size: 150%;
+    font-weight: bold;
+    color: #0a0;
+}
+
+.plus img {
+    vertical-align: middle;
+    cursor: pointer;
+    margin-top: 8px;
+    margin-right: 20px;
+}
+
+.plus img:hover {
+    opacity: 0.8;
+}
diff --git a/src/super_archives/templates/message-thread.html b/src/super_archives/templates/message-thread.html
index 2a44407..c8eb5ee 100644
--- a/src/super_archives/templates/message-thread.html
+++ b/src/super_archives/templates/message-thread.html
@@ -2,77 +2,83 @@
 {% load i18n %}
 {% load append_to_get %}
 {% block main-content %}
-  <div id="vote-notification" class="error hide"></div>
+<div class="row">
 
   <h2>{{ first_msg.subject_clean }}</h2>
-  <hr/>
-  <div class="span-17 border">
-    <ul>
-    {% for email in emails %}
-      <li>
-        <div id="msg-{{ email.id }}" class="email_message">
-          <div class="span-3 center">
-            <div>
-              <a href="{{ email.from_address.get_profile_link }}">
-                <img class="avatar" width="80px" heigth="80px"
-                     src="http://www.gravatar.com/avatar/{{ email.from_address.md5 }}?s=80&d=identicon" />
-                {% trans "Anonymous" as anonymous %}
-                <span>{% firstof email.from_address.get_full_name anonymous %}</span>
-              </a>
-            </div>
-            <p>{{ email.received_time|date:"SHORT_DATETIME_FORMAT" }}</p>
-            
-            <div class="plus">
-              <span>{{ email.votes_count }}</span>
-              <img title="{% trans 'Vote' %}" class="right" src="{{ STATIC_URL }}img/plus.png">
-            </div>
+  <hr />
 
-            <p class="minus {% if not user in email.vote_list %}hide{% endif %}">
-              <a href="#">{% trans "Remove votes" %}</a>
-            </p>
-          </div>
-        
-          <div class="span-13">
-            <pre>{{ email.body }}</pre>
-          </div>
-        </div>
-        {% if not forloop.last %}
-        <hr/>
-        {% endif %}
-      </li>
-    {% endfor %}
-    </ul>
-  </div>
-  <div class="span-6 filters last">
-    <h4><b>{% trans "Order by" %}:</b></h4>
-    <ul>
-      <li><a href="{% append_to_get order='voted' %}">{% trans "Votes" %}</a></li>
-      <li><a href="{% append_to_get order='date' %}">{% trans "Date" %}</a></li>
+  <div class="col-lg-3 pull-right">
+    <h4><strong>{% trans "Order by" %}:</strong></h4>
+    <ul class="none">
+      <li><span class="glyphicon glyphicon-chevron-right">
+        <a href="{% append_to_get order='voted' %}">{% trans "Votes" %}</a>
+      </span></li>
+      <li><span class="glyphicon glyphicon-chevron-right">
+        <a href="{% append_to_get order='date' %}">{% trans "Date" %}</a>
+      </span></li>
     </ul>
 
-    <hr class="space"/>
-    
-    <h4><b>{% trans "Statistics:" %}</b></h4>
-    
-    <ul>
-      <li class="quiet">{% trans "started at" %}
-        <h4>{{ first_msg.received_time|timesince }} {% trans "ago" %}</h4>
-      </li>
-      <li class="quiet">{% trans "viewed" %}
-        <h4>{{ pagehits }} {% trans "times" %}</h4>
-      </li>
-      <li class="quiet">{% trans "answered" %}
-        <h4>{{ emails|length }} {% trans "times" %}</h4>
-      </li>
-      <li class="quiet">{% trans "voted" %}
-        <h4>{{ total_votes }} {% trans "times" %}</h4>
-      </li>
+    <div>&nbsp;</div>
+
+    <h4><strong>{% trans "Statistics:" %}</strong></h4>
+
+    <ul class="none">
+      <li class="quiet"><span class="glyphicon glyphicon-chevron-right">
+        {% trans "started at" %}
+      </span></li>
+        <h5>{{ first_msg.received_time|timesince }} {% trans "ago" %}</h5>
+      <li class="quiet"><span class="glyphicon glyphicon-chevron-right">
+        {% trans "viewed" %}
+      </span></li>
+        <h5>{{ pagehits }} {% trans "times" %}</h5>
+      <li class="quiet"><span class="glyphicon glyphicon-chevron-right">
+        {% trans "answered" %}
+      </span></li>
+        <h5>{{ emails|length }} {% trans "times" %}</h5>
+      <li class="quiet"><span class="glyphicon glyphicon-chevron-right">
+        {% trans "voted" %}
+      </span></li>
+        <h5>{{ total_votes }} {% trans "times" %}</h5>
     </ul>
-    
   </div>
-  
+
+  <ul class="none">
+  {% for email in emails %}
+    <li>
+      <div class="col-lg-2 text-center">
+        <a href="{{ email.from_address.get_profile_link }}">
+          <img width="80px" height="80px"
+               src="http://www.gravatar.com/avatar/{{ email.from_address.md5 }}?s=80&d=identicon" />
+          <div>&nbsp;</div>
+          {% trans "Anonymous" as anonymous %}
+          <span>{% firstof email.from_address.get_full_name anonymous %}</span>
+        </a>
+
+        <p>{{ email.received_time|date:"SHORT_DATETIME_FORMAT" }}</p>
+
+        <div class="plus">
+          <span>{{ email.votes_count }}</span>
+          <img title="{% trans 'Vote' %}" class="pull-right" src="{{ STATIC_URL }}img/plus.png">
+        </div>
+
+        <p class="{% if not user in email.vote_list %}hide{% endif %}">
+          <a href="#">{% trans "Remove votes" %}</a>
+        </p>
+      </div>
+
+        <div class="col-lg-7">
+          <pre>{{ email.body }}</pre>
+        </div>
+      {% if not forloop.last %}
+      <div>&nbsp;</div>
+      {% endif %}
+    </li>
+  {% endfor %}
+  </ul>
+
   <script type="text/javascript" charset="utf-8">
     pagehit("{{ request.path_info }}");
   </script>
-  
-{% endblock %}  
+
+</div>
+{% endblock %}
--
libgit2 0.21.2