diff --git a/steam_chat_viewer/__init__.py b/steam_chat_viewer/__init__.py
index 9c9e40f..6d12a32 100644
--- a/steam_chat_viewer/__init__.py
+++ b/steam_chat_viewer/__init__.py
@@ -13,9 +13,9 @@ def home():
         messages = select(
             '''
                 SELECT * FROM messages
-                ORDER BY date DESC
                 WHERE from_url = :filter
                 OR to_url = :filter
+                ORDER BY date DESC
             ''',
             filter=request.args['filter']
         )
@@ -30,7 +30,7 @@ def home():
 
     return render_template(
         "home.html",
-        users=select(
+        contacts=select(
             '''
                 SELECT DISTINCT ON (url) url, name
                 FROM (
diff --git a/steam_chat_viewer/templates/home.html b/steam_chat_viewer/templates/home.html
index 6bbad2d..bd9a448 100644
--- a/steam_chat_viewer/templates/home.html
+++ b/steam_chat_viewer/templates/home.html
@@ -11,7 +11,12 @@
       <h1 class=logo><a href="{{ url_for('home') }}">STEAM Chat Logs <img src="{{ url_for('static', filename='icon.svg') }}"></a></h1>
     </header>
     <main>
-      <ul class=sms_list>
+      <ul class=contacts>
+{% for contact in contacts: -%}
+        <li><a href="{{ url_for('home', filter=contact['url']) }}">{{ contact['name'] }}</a></li>
+{% endfor -%}
+      </ul>
+      <ul class=messages>
 {% for message in messages: -%}
         <li class=message>
           <div class=metadata>