diff --git a/formula10.py b/formula10.py
index 264150f..ddc9c34 100644
--- a/formula10.py
+++ b/formula10.py
@@ -31,7 +31,7 @@ def save():
 @app.route("/race")
 def guessraceresults():
     users = User.query.all()
-    raceresults = RaceResult.query.all()
+    raceresults = RaceResult.query.all()[::-1]
     drivers = Driver.query.all()
 
     guesses = dict()  # The guesses for which raceresults exist
@@ -45,7 +45,7 @@ def guessraceresults():
             nextguesses[guess.user_id] = guess
 
     # TODO: Getting by ID might be stupid, get by date instead?
-    nextid = raceresults[-1].race_id + 1 if len(raceresults) > 0 else 1
+    nextid = raceresults[0].race_id + 1 if len(raceresults) > 0 else 1
     nextrace = Race.query.filter_by(id=nextid).first()
 
     return render_template("race.jinja",
diff --git a/templates/race.jinja b/templates/race.jinja
index 745a9a2..1ea7ce5 100644
--- a/templates/race.jinja
+++ b/templates/race.jinja
@@ -28,41 +28,10 @@
             <td>&nbsp;</td>
         </tr>
 
-        {# Race Results #}
-        {% for raceresult in raceresults %}
-            <tr>
-                <td>{{ raceresult.race.grandprix }}</td>
-
-                {% for user in users %}
-                    <td>
-                        {% if (raceresult.race_id in guesses) and (user.name in guesses.get(raceresult.race_id)) %}
-                            {% set pxx = guesses.get(raceresult.race_id).get(user.name).pxx.abbr %}
-                            {% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.abbr %}
-                            <ul class="list-group list-group-flush">
-                                <li class="list-group-item {% if pxx == raceresult.pxx.abbr %}text-success fw-bold{% endif %}">
-                                    P{{ raceresult.race.pxx }}: {{ pxx }}</li>
-                                <li class="list-group-item {% if dnf == raceresult.dnf.abbr %}text-success fw-bold{% endif %}">
-                                    DNF: {{ dnf }}</li>
-                            </ul>
-                        {% endif %}
-                    </td>
-                {% endfor %}
-
-
-                <td>
-                    <ul class="list-group list-group-flush">
-                        <li class="list-group-item">P{{ raceresult.race.pxx }}: {{ raceresult.pxx.abbr }}</li>
-                        <li class="list-group-item {% if raceresult.dnf.abbr == 'NON' %}text-muted{% endif %}">
-                            DNF: {{ raceresult.dnf.abbr }}</li>
-                    </ul>
-                </td>
-            </tr>
-        {% endfor %}
-
         {# Next Race Guess #}
         {% if nextrace is not none %}
             <tr>
-                <td>{{ nextrace.grandprix }}</td>
+                <td><span class="fw-bold">{{ nextrace.id }}:</span> {{ nextrace.grandprix }}</td>
 
                 {% for user in users %}
                     <td>
@@ -143,6 +112,37 @@
                     </form>
                 </td>
             </tr>
+
+            {# Race Results #}
+            {% for raceresult in raceresults %}
+                <tr>
+                    <td><span class="fw-bold">{{ raceresult.race.id }}:</span> {{ raceresult.race.grandprix }}</td>
+
+                    {% for user in users %}
+                        <td>
+                            {% if (raceresult.race_id in guesses) and (user.name in guesses.get(raceresult.race_id)) %}
+                                {% set pxx = guesses.get(raceresult.race_id).get(user.name).pxx.abbr %}
+                                {% set dnf = guesses.get(raceresult.race_id).get(user.name).dnf.abbr %}
+                                <ul class="list-group list-group-flush">
+                                    <li class="list-group-item {% if pxx == raceresult.pxx.abbr %}text-success fw-bold{% endif %}">
+                                        P{{ raceresult.race.pxx }}: {{ pxx }}</li>
+                                    <li class="list-group-item {% if dnf == raceresult.dnf.abbr %}text-success fw-bold{% endif %}">
+                                        DNF: {{ dnf }}</li>
+                                </ul>
+                            {% endif %}
+                        </td>
+                    {% endfor %}
+
+
+                    <td>
+                        <ul class="list-group list-group-flush">
+                            <li class="list-group-item">P{{ raceresult.race.pxx }}: {{ raceresult.pxx.abbr }}</li>
+                            <li class="list-group-item {% if raceresult.dnf.abbr == 'NON' %}text-muted{% endif %}">
+                                DNF: {{ raceresult.dnf.abbr }}</li>
+                        </ul>
+                    </td>
+                </tr>
+            {% endfor %}
         {% endif %}
 
         </tbody>