diff --git a/colab_spb/views.py b/colab_spb/views.py
index fe4021b..e63d732 100644
--- a/colab_spb/views.py
+++ b/colab_spb/views.py
@@ -2,12 +2,13 @@ from django.shortcuts import render
 from django.utils.translation import ugettext as _
 from colab.super_archives.models import MailingList, Thread
 from colab.accounts.utils import mailman
+from colab.accounts.models import User
 
 def get_list(request):
     list_name = None
     MAX = 0
     if request.GET.get('list_name'):
-	list_name = request.GET['list_name']
+	list_name = request.GET['list_name'].title()
     if request.GET.get('MAX'):
 	MAX = request.GET['MAX']
 
diff --git a/templates/discussion-message-preview.html b/templates/discussion-message-preview.html
new file mode 100644
index 0000000..ecab598
--- /dev/null
+++ b/templates/discussion-message-preview.html
@@ -0,0 +1,71 @@
+{% load i18n tz highlight %}
+
+{% if result.fullname or result.modified or result.modified_by %}
+  <div class="quiet">
+    {% if result.modified %}
+      <span class="pull-left">{{ result.modified|localtime|timesince }} {% trans "ago" %} - </span>
+    {% endif %}
+
+    {% if result.modified_by %}
+      <span class="pull-left">{% trans "by" %}
+        {% if result.modified_by_url %}
+          <a href="{{ result.modified_by_url }}">
+        {% else %}
+          <span>
+        {% endif %}
+
+        {% if query %}
+          {% highlight result.modified_by with query %}
+        {% else %}
+          {{ result.modified_by }}
+        {% endif %}
+
+        {% if result.modified_by_url %}
+          </a>
+        {% else %}
+          </span>
+        {% endif %}
+      </span>
+    {% else %}
+      <span class="pull-left">{% trans "by" %} {% trans "Anonymous" %}</span>
+    {% endif %}
+  </div>
+{% endif %}
+
+{% if result.title %}
+  <a href="{{ result.url }}
+   {% if result.type == 'thread' and result.latest_message_pk %}
+        #msg-{{ result.latest_message_pk }}
+   {% elif result.type == 'thread' and result.pk %}
+        #msg-{{ result.pk }}
+   {% endif %}" 
+
+   {% if result.latest_description %}
+     title="{{ result.latest_description|escape|truncatechars:150 }}"
+   {% elif result.description %}
+     title="{{ result.description|escape|truncatechars:150 }}"
+   {% endif %}>
+    <span class="subject">
+      <!-- a striptags filter was raising an error here because using with highlight -->
+      {% if query %}
+        {% highlight result.title with query max_length "1000" %}
+      {% else %}
+        {{ result.title }}
+      {% endif %}
+    </span>
+  </a>
+{% endif %}
+
+{% if result.description %}
+  <!-- a striptags filter was raising an error here because using with highlight -->
+  <span class="quiet"> - {% if query %}
+    {% highlight result.description with query max_length "110" %}
+  {% else %}
+    {% if result.latest_description %}
+      {{ result.latest_description|striptags|escape|truncatechars:110 }}
+    {% elif result.description %}
+      {{ result.description|striptags|escape|truncatechars:110 }}
+    {% endif %}
+  {% endif %}
+  </span>
+{% endif %}
diff --git a/templates/discussion.html b/templates/discussion.html
index 8fcff41..c2fbb92 100644
--- a/templates/discussion.html
+++ b/templates/discussion.html
@@ -1,44 +1,31 @@
-  
   {% load i18n %}
-  <h2>{% trans 'Groups'|title %}</h2>
-  <hr/>
-
   {% for listname, description, latest, most_relevant, number_of_users in lists %}
     {% if latest or most_relevant %}
-      <h3><b>{{ listname|title|lower }} {% if description %} ({{ description }}){% endif %}</b></h3>
-      <div class="btn-group btn-group-sm">
-        <a href="#" class="btn btn-default" disabled="disabled">{% blocktrans %}{{ number_of_users }} members{% endblocktrans %}</a>
-        {% if proxy.trac %}
-          <a href="/wiki/grupos/{{ listname }}" class="btn btn-default">Wiki</a>
-        {% endif %}
-      </div>
-      <hr/>
-
       <div class="row">
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
           <h4>{% trans 'latest'|title %}</h4>
-          <ul class="message-list">
+          <hr />
             {% for thread in latest %}
-              {% include "message-preview.html" with result=thread.latest_message %}
+              {% include "discussion-message-preview.html" with result=thread.latest_message %}
+              <hr />
             {% endfor %}
-          </ul>
           <div class="text-right">
             <a href="{% url 'haystack_search' %}?order=latest&list={{ listname }}&type=thread">
-              {% trans "more..." %}
+              {% trans "see all discussions" %}
             </a>
           </div>
         </div>
 
         <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
           <h4>{% trans 'most relevant'|title %}</h4>
-          <ul class="message-list">
+          <hr />
             {% for thread in most_relevant %}
-              {% include "message-preview.html" with result=thread %}
+              {% include "discussion-message-preview.html" with result=thread %}
+              <hr />
             {% endfor %}
-          </ul>
           <div class="text-right">
             <a href="{% url 'haystack_search' %}?list={{ listname }}&type=thread">
-              {% trans "more..." %}
+              {% trans "see all discussions" %}
             </a>
           </div>
         </div>
--
libgit2 0.21.2