diff --git a/main/views.py b/main/views.py
index 04dbf78..46d38d4 100644
--- a/main/views.py
+++ b/main/views.py
@@ -10,8 +10,12 @@ from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from models import *
 
 def home(request):
-    entry_list = Entry.objects.all().order_by('created').reverse()
-    paginator = Paginator(entry_list, 10) # Show 25 entries per page
+    filter_who = request.GET.get('who')
+    if filter_who:
+        entry_list = Entry.objects.filter(user=filter_who).order_by('created').reverse()
+    else:
+        entry_list = Entry.objects.all().order_by('created').reverse()
+    paginator = Paginator(entry_list, 10) # Show 10 entries per page
 
     # Make sure page request is an int. If not, deliver first page
     try:
diff --git a/snurrweb.wsgi b/snurrweb.wsgi
index 1aa297d..770980c 100644
--- a/snurrweb.wsgi
+++ b/snurrweb.wsgi
@@ -1,7 +1,7 @@
 import os
 import sys
 
-os.environ['DJANGO_SETTINGS_MODULE'] = 'snurrweb.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
 path = os.path.dirname(os.path.abspath(__file__))
 if path not in sys.path:
diff --git a/templates/home.html b/templates/home.html
index e0a276d..b726a89 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -2,6 +2,9 @@
 {% block content %}
 <h2>Driftslogg</h2>
 {% if entries %}
+    {% if request.GET.who %}
+        <a href="/">Vis alle</a>
+    {% endif %}
     <table>
         <thead>
             <th>Hvem</th> 
@@ -10,16 +13,24 @@
         </thead>
     {%for entry in entries.object_list %}
         <tr>
-            <td>{{ entry.user }}</td>
+            <td>{% if request.GET.who != entry.user %}
+                    <a href="?who={{ entry.user }}">{{ entry.user }}</a>
+                {% else %}
+                    {{ entry.user }}
+                {%endif%}</td>
             <td>{{ entry.created|timesince }}</td>
-            <td>{{ entry.text }}</td>
+            <td>{{ entry.text|urlize }}</td>
         </tr>
     {%endfor%}
     </table>
     <div class="pagination">
         <span class="step-links">
             {% if entries.has_previous %}
-                <a href="?page={{ entries.previous_page_number }}">Forrige</a>
+                {% if request.GET.who %}
+                    <a href="?page={{ entries.previous_page_number }}&who={{ request.GET.who }}">Forrige</a>
+                {% else %}
+                    <a href="?page={{ entries.previous_page_number }}">Forrige</a>
+                {% endif %}
             {% endif %}
 
             <span class="current">
@@ -27,7 +38,11 @@
             </span>
 
             {% if entries.has_next %}
-                <a href="?page={{ entries.next_page_number }}">Neste</a>
+                {% if request.GET.who %}
+                    <a href="?page={{ entries.next_page_number }}&who={{ request.GET.who }}">Forrige</a>
+                {% else %}
+                    <a href="?page={{ entries.next_page_number }}">Forrige</a>
+                {% endif %}
             {% endif %}
         </span>
     </div>