diff --git a/views/results.html.twig b/views/results.html.twig
index 4845192..46031a5 100644
--- a/views/results.html.twig
+++ b/views/results.html.twig
@@ -7,8 +7,8 @@
     <div class="alert alert-info">{% if records == 1 %}Retrieved 1 result.{% else %}Retrieved {{ records }} results.{% endif %}</div>
     {% if allow_filtering %}
     <div class="btn-group">
-        <a class="btn{% if filtered %} active{% endif %}" href="results/filtered">Filtered results</a>
-        <a class="btn{% if not filtered %} active{% endif %}" href="results">All results</a>
+        <a class="btn{% if filtered %} active{% endif %}" href="index.php?mode=results&filtered=1">Filtered results</a>
+        <a class="btn{% if not filtered %} active{% endif %}" href="index.php?mode=results">All results</a>
     </div>
     {% endif %}
 
@@ -26,19 +26,20 @@
             {% for record in stats %}
             <tr>
                 <td>{{ loop.index }}.</td>
-                {% if record.scene1.correct %}<td class="alert-success"><i class="icon-ok"></i>{% else %}<td class="alert-danger"><i class="icon-remove"></i>{% endif %}&nbsp;{{ record.notable.time / 1000 }} seconds</td>
-                {% if record.unnoted.correct %}<td class="alert-success"><i class="icon-ok"></i>{% else %}<td class="alert-danger"><i class="icon-remove"></i>{% endif %}&nbsp;{{ record.unnoted.time / 1000 }} seconds</td>
-                {% if record.renoted.correct %}<td class="alert-success"><i class="icon-ok"></i>{% else %}<td class="alert-danger"><i class="icon-remove"></i>{% endif %}&nbsp;{{ record.renoted.time / 1000 }} seconds</td>
+                {% if record.scene1.correct %}<td class="alert-success"><i class="icon-ok"></i>{% else %}<td class="alert-danger"><i class="icon-remove"></i>{% endif %}&nbsp;{{ record.scene1.time / 1000 }} seconds</td>
+                {% if record.scene2.correct %}<td class="alert-success"><i class="icon-ok"></i>{% else %}<td class="alert-danger"><i class="icon-remove"></i>{% endif %}&nbsp;{{ record.scene2.time / 1000 }} seconds</td>
+                {% if record.scene3.correct %}<td class="alert-success"><i class="icon-ok"></i>{% else %}<td class="alert-danger"><i class="icon-remove"></i>{% endif %}&nbsp;{{ record.scene3.time / 1000 }} seconds</td>
             </tr>
             {% endfor %}
         </tbody>
     </table>
-<!--Doing some debugging.-->	
+    
+<!--Doing some debugging.
 <pre>{{ dump(stats) }}</pre>
-<pre>{{ dump(data) }}</pre>
+<pre>{{ dump(data) }}</pre> -->
     
 	<h2 id="raw-results">Raw results</h2>
-    <p><a class="btn" href="results/download"><i class="icon-download-alt"></i> Download results</a></p>
+    <p><a class="btn" href="index.php?mode=result&download=1"><i class="icon-download-alt"></i> Download results</a></p>
     <table class="table table-striped">
         <thead>
             <tr>