diff --git a/pastebin/apps/dpaste/templates/dpaste/snippet_details.html b/pastebin/apps/dpaste/templates/dpaste/snippet_details.html
index 1916dfc..1f2ceb0 100644
--- a/pastebin/apps/dpaste/templates/dpaste/snippet_details.html
+++ b/pastebin/apps/dpaste/templates/dpaste/snippet_details.html
@@ -1,6 +1,7 @@
 {% extends "dpaste/base.html" %}
 {% load mptt_tags %}
 {% load i18n %}
+{% load dpaste_tags %}
 
 {% block extrahead %}
      {% if request.session.userprefs %}
@@ -24,7 +25,6 @@
         <span class="date">{{ snippet.published|date:_("DATETIME_FORMAT") }} ({% trans "UTC" %})</span>
     </h1>
 {% endblock %}
-{% load dpaste_tags %}
 
 {% block content %}
 <div id="diff" style="display:none;">diff</div>
diff --git a/pastebin/apps/dpaste/templates/dpaste/snippet_list.html b/pastebin/apps/dpaste/templates/dpaste/snippet_list.html
index 658b522..4b01def 100644
--- a/pastebin/apps/dpaste/templates/dpaste/snippet_list.html
+++ b/pastebin/apps/dpaste/templates/dpaste/snippet_list.html
@@ -1,7 +1,8 @@
 {% extends "dpaste/base.html" %}
 {% load i18n %}
+{% load dpaste_tags %}
 
-{% block title %}{% trans "Snippet" %} #{{ snippet.pk }}{% endblock %}
+{% block title %}{% trans "Snippet List" %}{% endblock %}
 {% block headline %}
 <h1>{% blocktrans %}Your latest {{ snippets_max }} snippets{% endblocktrans %}</h1>
 {% endblock %}
@@ -10,11 +11,21 @@
     {% if snippet_list %}
     {% for snippet in snippet_list %}
     <h2>
-        <a href="{{ snippet.get_absolute_url }}">{% trans "Snippet" %} #{{ snippet.pk }}</a>
-        ~ {{ snippet.published|date:_("DATETIME_FORMAT") }}
+        <a title="{{ snippet.published|date:_("DATETIME_FORMAT") }}" href="{{ snippet.get_absolute_url }}">
+            {{ snippet.published|timesince }} ago
+        </a>
     </h2>
-    <p style="color: #555; margin: 8px 0 20px 0;">{{ snippet.content|truncatewords:40 }}</p>
-    {% endfor %}
+
+    <div class="snippet">
+    <table>
+        <tr>
+            <th><pre class="code">{% for l in lines %}<a href="#l{{ forloop.counter }}" id="l{{ forloop.counter }}">{{ forloop.counter }}</a>{% endfor %}</pre></th>
+            <td><pre class="code">{% for line in snippet|highlight:5 %}<div class="line" id="l{{ forloop.counter }}">{% if line %}{{ line|safe }}{% else %}&nbsp;{% endif %}</div>{% endfor %}
+<a title="{{ snippet.published|date:_("DATETIME_FORMAT") }}" href="{{ snippet.get_absolute_url }}">... see full snippet.</a></pre><td>
+        </tr>
+    </table>
+    </div>
+            {% endfor %}
     {% else %}
     <p>{% trans "No snippets available." %}</p>
     {% endif %}
diff --git a/pastebin/apps/dpaste/templatetags/dpaste_tags.py b/pastebin/apps/dpaste/templatetags/dpaste_tags.py
index 1b5279f..d545929 100644
--- a/pastebin/apps/dpaste/templatetags/dpaste_tags.py
+++ b/pastebin/apps/dpaste/templatetags/dpaste_tags.py
@@ -10,8 +10,12 @@ def in_list(value,arg):
     return value in arg
 
 @register.filter
-def highlight(snippet):
+def highlight(snippet, maxlines=None):
     h = pygmentize(snippet.content, snippet.lexer)
     if not h:
-        return snippet.content.splitlines()
-    return h.splitlines()
\ No newline at end of file
+        s = snippet.content.splitlines()
+    s = h.splitlines()
+
+    if maxlines:
+        return s[:maxlines]
+    return s
\ No newline at end of file