diff --git a/formula10/controller/admin_controller.py b/formula10/controller/admin_controller.py
index 27f0d1e..d3c593d 100644
--- a/formula10/controller/admin_controller.py
+++ b/formula10/controller/admin_controller.py
@@ -31,7 +31,15 @@ def result_enter_post(race_name: str) -> Response:
     dnfs: List[str] = request.form.getlist("dnf-drivers")
     excluded: List[str] = request.form.getlist("excluded-drivers")
 
-    # @todo Ugly
+    fastest_lap: str | None = request.form.get("fastest-lap")
+    sprint_pxxs: List[str] = request.form.getlist("sprint-pxx-drivers")
+    sprint_dnf_drivers: List[str] = request.form.getlist("sprint-dnf-drivers")
+
+    # @todo Integrate these into update_race_result()
+    print("Fastest lap:", fastest_lap)
+    print("Sprint:", sprint_pxxs)
+    print("Sprint DNFs:", sprint_dnf_drivers)
+
     race_id: int = Model().race_by(race_name=race_name).id
     return update_race_result(race_id, pxxs, first_dnfs, dnfs, excluded)
 
diff --git a/formula10/domain/template_model.py b/formula10/domain/template_model.py
index 669775f..8d2bdca 100644
--- a/formula10/domain/template_model.py
+++ b/formula10/domain/template_model.py
@@ -69,6 +69,14 @@ class TemplateModel(Model):
     def current_race(self) -> Race | None:
         return self.first_race_without_result()
 
+    def active_result_race_or_current_race(self) -> Race:
+        if self.active_result is not None:
+            return self.active_result.race
+        elif self.current_race is not None:
+            return self.current_race
+        else:
+            return self.all_races()[0]
+
     def active_result_race_name_or_current_race_name(self) -> str:
         if self.active_result is not None:
             return self.active_result.race.name
diff --git a/formula10/static/style/grid.css b/formula10/static/style/grid.css
index ba408d7..a7a7ae0 100644
--- a/formula10/static/style/grid.css
+++ b/formula10/static/style/grid.css
@@ -24,4 +24,4 @@
         grid-row-gap: 0;
         grid-column-gap: 8px;
     }
-}
+}
\ No newline at end of file
diff --git a/formula10/templates/result.jinja b/formula10/templates/result.jinja
index 2d1cd61..3390b54 100644
--- a/formula10/templates/result.jinja
+++ b/formula10/templates/result.jinja
@@ -42,24 +42,117 @@
 
 {% block body %}
 
-    <div class="grid card-grid">
+    {% set race_result_open=model.race_result_open(model.active_result_race_name_or_current_race_name()) %}
+    {% if race_result_open == true %}
+        {% set action_save_href = "/result-enter/" ~ model.active_result_race_name_or_current_race_name_sanitized() %}
+    {% else %}
+        {% set action_save_href = "" %}
+    {% endif %}
 
-        <div class="card shadow-sm mb-2" style="max-width: 450px;">
+    <form class="grid card-grid" action="{{ action_save_href }}" method="post">
+
+        {# Race result #}
+        <div class="card shadow-sm mb-2 w-100">
             <div class="card-header">
                 {{ model.active_result_race_name_or_current_race_name() }}
             </div>
 
             <div class="card-body">
                 <div class="d-inline-block overflow-x-scroll w-100">
-                    <div style="width: 410px;">
-                        {% set race_result_open=model.race_result_open(model.active_result_race_name_or_current_race_name()) %}
-                        {% if race_result_open == true %}
-                            {% set action_save_href = "/result-enter/" ~ model.active_result_race_name_or_current_race_name_sanitized() %}
-                        {% else %}
-                            {% set action_save_href = "" %}
-                        {% endif %}
+                    <div style="width: 460px;">
+
+                        {# Place numbers #}
+                        <ul class="list-group list-group-flush d-inline-block">
+                            {% for driver in model.all_drivers_or_active_result_standing_drivers() %}
+                                <li class="list-group-item p-1"><span id="place_number"
+                                                                      class="fw-bold">P{{ "%02d" % loop.index }}</span>:
+                                </li>
+                            {% endfor %}
+                        </ul>
+
+                        {# Drag and drop, "#columns .column" is the selector for the JS #}
+                        <ul id="columns" class="list-group list-group-flush d-inline-block float-end">
+
+                            {% for driver in model.all_drivers_or_active_result_standing_drivers() %}
+                                <li class="list-group-item {% if race_result_open == true %}column{% endif %} p-1"
+                                    {% if race_result_open == true %}draggable="true"{% endif %}>
+                                    {{ driver.name }}
+
+                                    <div class="d-inline-block float-end" style="margin-left: 30px;">
+                                        {# Fastest lap #}
+                                        <div class="form-check form-check-reverse d-inline-block">
+                                            <input type="radio" class="form-check-input"
+                                                   value="{{ driver.id }}"
+                                                   id="fastest-lap-{{ driver.id }}" name="fastest-lap"
+                                                   {% if (model.active_result is not none) and (driver.id == model.active_result.fastest_lap_driver.id) %}checked{% endif %}
+                                                   {% if race_result_open == false %}disabled="disabled"{% endif %}>
+                                            <label for="fastest-lap-{{ driver.id }}"
+                                                   class="form-check-label text-muted" data-bs-toggle="tooltip"
+                                                   title="Fastest lap">Lap</label>
+                                        </div>
+
+                                        {# Driver DNFed at first #}
+                                        <div class="form-check form-check-reverse d-inline-block"
+                                             style="margin-left: 2px;">
+                                            <input type="checkbox" class="form-check-input"
+                                                   value="{{ driver.id }}"
+                                                   id="first-dnf-{{ driver.id }}" name="first-dnf-drivers"
+                                                   {% if (model.active_result is not none) and (driver in model.active_result.initial_dnf) %}checked{% endif %}
+                                                   {% if race_result_open == false %}disabled="disabled"{% endif %}>
+                                            <label for="first-dnf-{{ driver.id }}"
+                                                   class="form-check-label text-muted">1. DNF</label>
+                                        </div>
+
+                                        {# Driver DNFed #}
+                                        <div class="form-check form-check-reverse d-inline-block"
+                                             style="margin-left: 2px;">
+                                            <input type="checkbox" class="form-check-input"
+                                                   value="{{ driver.id }}"
+                                                   id="dnf-{{ driver.id }}" name="dnf-drivers"
+                                                   {% if (model.active_result is not none) and (driver in model.active_result.all_dnfs) %}checked{% endif %}
+                                                   {% if race_result_open == false %}disabled="disabled"{% endif %}>
+                                            <label for="dnf-{{ driver.id }}"
+                                                   class="form-check-label text-muted">DNF</label>
+                                        </div>
+
+                                        {# Driver Excluded #}
+                                        <div class="form-check form-check-reverse d-inline-block"
+                                             style="margin-left: 2px;">
+                                            <input type="checkbox" class="form-check-input"
+                                                   value="{{ driver.id }}"
+                                                   id="exclude-{{ driver.id }}" name="excluded-drivers"
+                                                   {% if (model.active_result is not none) and (driver in model.active_result.standing_exclusions) %}checked{% endif %}
+                                                   {% if race_result_open == false %}disabled="disabled"{% endif %}>
+                                            <label for="exclude-{{ driver.id }}"
+                                                   class="form-check-label text-muted" data-bs-toggle="tooltip"
+                                                   title="Driver is not counted for standing">NC</label>
+                                        </div>
+                                    </div>
+
+                                    {# Standing order #}
+                                    <input type="hidden" name="pxx-drivers" value="{{ driver.id }}">
+                                </li>
+                            {% endfor %}
+                        </ul>
+
+                        <input type="submit" class="btn btn-danger mt-2 w-100" value="Save"
+                               {% if race_result_open == false %}disabled="disabled"{% endif %}>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        {# Sprint result #}
+        {% if model.active_result_race_or_current_race().has_sprint == true %}
+            <div class="card shadow-sm mb-2 w-100">
+                <div class="card-header">
+                    Sprint
+                </div>
+
+                <div class="card-body">
+                    <div class="d-inline-block overflow-x-scroll w-100">
+                        <div style="width: 275px;">
 
-                        <form action="{{ action_save_href }}" method="post">
                             {# Place numbers #}
                             <ul class="list-group list-group-flush d-inline-block">
                                 {% for driver in model.all_drivers_or_active_result_standing_drivers() %}
@@ -69,63 +162,41 @@
                                 {% endfor %}
                             </ul>
 
-                            {# Drag and drop #}
+                            {# Drag and drop, "#columns .column" is the selector for the JS #}
                             <ul id="columns" class="list-group list-group-flush d-inline-block float-end">
-
-                                {% for driver in model.all_drivers_or_active_result_standing_drivers() %}
+                                {% for driver in model.all_drivers(include_none=false) %}
                                     <li class="list-group-item {% if race_result_open == true %}column{% endif %} p-1"
                                         {% if race_result_open == true %}draggable="true"{% endif %}>
                                         {{ driver.name }}
 
                                         <div class="d-inline-block float-end" style="margin-left: 30px;">
-                                            {# Driver DNFed at first #}
-                                            <div class="form-check form-check-reverse d-inline-block">
-                                                <input type="checkbox" class="form-check-input"
-                                                       value="{{ driver.id }}"
-                                                       id="first-dnf-{{ driver.id }}" name="first-dnf-drivers"
-                                                       {% if (model.active_result is not none) and (driver in model.active_result.initial_dnf) %}checked{% endif %}
-                                                       {% if race_result_open == false %}disabled="disabled"{% endif %}>
-                                                <label for="first-dnf-{{ driver.id }}"
-                                                       class="form-check-label text-muted">1. DNF</label>
-                                            </div>
 
                                             {# Driver DNFed #}
-                                            <div class="form-check form-check-reverse d-inline-block mx-2">
+                                            <div class="form-check form-check-reverse d-inline-block"
+                                                 style="margin-left: 2px;">
                                                 <input type="checkbox" class="form-check-input"
                                                        value="{{ driver.id }}"
-                                                       id="dnf-{{ driver.id }}" name="dnf-drivers"
-                                                       {% if (model.active_result is not none) and (driver in model.active_result.all_dnfs) %}checked{% endif %}
+                                                       id="sprint-dnf-{{ driver.id }}" name="sprint-dnf-drivers"
+                                                       {% if (model.active_result is not none) and (driver in model.active_result.sprint_dnfs) %}checked{% endif %}
                                                        {% if race_result_open == false %}disabled="disabled"{% endif %}>
-                                                <label for="dnf-{{ driver.id }}"
+                                                <label for="sprint-dnf-{{ driver.id }}"
                                                        class="form-check-label text-muted">DNF</label>
                                             </div>
-
-                                            {# Driver Excluded #}
-                                            <div class="form-check form-check-reverse d-inline-block">
-                                                <input type="checkbox" class="form-check-input"
-                                                       value="{{ driver.id }}"
-                                                       id="exclude-{{ driver.id }}" name="excluded-drivers"
-                                                       {% if (model.active_result is not none) and (driver in model.active_result.standing_exclusions) %}checked{% endif %}
-                                                       {% if race_result_open == false %}disabled="disabled"{% endif %}>
-                                                <label for="exclude-{{ driver.id }}"
-                                                       class="form-check-label text-muted" data-bs-toggle="tooltip"
-                                                       title="Driver is not counted for standing">NC</label>
-                                            </div>
                                         </div>
 
                                         {# Standing order #}
-                                        <input type="hidden" name="pxx-drivers" value="{{ driver.id }}">
+                                        <input type="hidden" name="sprint-pxx-drivers" value="{{ driver.id }}">
                                     </li>
                                 {% endfor %}
                             </ul>
 
-                            <input type="submit" class="btn btn-danger mt-2 w-100" value="Save"
-                                   {% if race_result_open == false %}disabled="disabled"{% endif %}>
-                        </form>
+
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-    </div>
+        {% endif %}
+
+    </form>
 
 {% endblock body %}
\ No newline at end of file