diff --git a/app/view/pages/race/configure/reset.php b/app/view/pages/race/configure/reset.php
new file mode 100644
index 0000000..e4a9f8f
--- /dev/null
+++ b/app/view/pages/race/configure/reset.php
@@ -0,0 +1,4 @@
+<h1>Er du sikker?</h1>
+<p>Er du sikker på at du vil nullstille alle runder?</p>
+<span>[&nbsp;<a class="success" href="reset.php?confirm=1">Nullstill</a>&nbsp;]</span>
+<span>[&nbsp;<a class="danger"  href="index.php">Avbryt</a>&nbsp;]</span>
\ No newline at end of file
diff --git a/app/view/pages/race/configure/teams/delete.php b/app/view/pages/race/configure/teams/delete.php
index d870fe9..b151254 100644
--- a/app/view/pages/race/configure/teams/delete.php
+++ b/app/view/pages/race/configure/teams/delete.php
@@ -1,4 +1,4 @@
 <h1>Er du sikker?</h1>
 <p>Er du sikker på at du vil slette lag <?=htmlspecialchars($team->name)?>?</p>
-<span>[&nbsp;<a class="success" href="delete.php?item=<?=$team->id?>">Slett</a>&nbsp;]</span>
+<span>[&nbsp;<a class="success" href="delete.php?confirm=1&item=<?=$team->id?>">Slett</a>&nbsp;]</span>
 <span>[&nbsp;<a class="danger"  href="index.php">Avbryt</a>&nbsp;]</span>
\ No newline at end of file
diff --git a/app/view/pages/race/configure/teams/index.php b/app/view/pages/race/configure/teams/index.php
index c2630de..93438af 100644
--- a/app/view/pages/race/configure/teams/index.php
+++ b/app/view/pages/race/configure/teams/index.php
@@ -1,5 +1,6 @@
 <h1>Endre lagtabell</h1>
 <span class="float-right">[&nbsp;<a class="success" href="update.php">Opprett lag</a>&nbsp;]</span>
+<span class="float-right">[&nbsp;<a class="danger" href="../reset.php">Nullstill runder</a>&nbsp;]&nbsp;</span>
 <br>
 <table>
     <tr>
@@ -29,7 +30,7 @@
         echo "<td>" . htmlspecialchars($team->rounds) . "</td>";
         echo "<td>" . htmlspecialchars(($team->bestTime === NULL) ? "Ukjent" : $team->bestTime) . "</td>";
         echo "<td>"; 
-        echo "<span>[&nbsp;<a class='danger' href='delete.php?item={$team->id}&confirm=1'>Slett</a>&nbsp;]&nbsp;</span>";
+        echo "<span>[&nbsp;<a class='danger' href='delete.php?item={$team->id}'>Slett</a>&nbsp;]&nbsp;</span>";
         echo "<span>[&nbsp;<a class='info' href='update.php?item={$team->id}'>Endre</a>&nbsp;]</span>";
         echo "</td>";
         echo '</tr>';
diff --git a/public/race/configure/reset.php b/public/race/configure/reset.php
index 3cfdd12..0fe7849 100644
--- a/public/race/configure/reset.php
+++ b/public/race/configure/reset.php
@@ -1,6 +1,6 @@
 <?php $app = require '../../../app/inc.php';
 /**
- * Remove times from timetable and update teamtable with new times
+ * Resets team counters and removes all time records
  */
 
 use App\Teamtable\Team;
@@ -8,6 +8,16 @@ use App\Teamtable\TeamMapper;
 use App\Timetable\Time;
 use App\Timetable\TimeMapper;
 
+$confirm = filter_input(INPUT_GET, 'confirm', FILTER_VALIDATE_BOOLEAN);
+
+if (!$confirm)
+{
+    $app->view('template/header', ['title' => 'Nullstill runder']);
+    $app->view('pages/race/configure/reset');
+    $app->view('template/footer');
+    die();
+}
+
 $teamMapper = new TeamMapper($app->database->conn);
 $timeMapper = new TimeMapper($app->database->conn);
 
@@ -27,4 +37,7 @@ $times = $timeMapper->getAll();
 foreach ($times as $key => $time)
 {
     $timeMapper->delete($time->id);
-}
\ No newline at end of file
+}
+
+$app->session->flash("Runder er nullstilt", "success");
+$app->redirect("index.php");
\ No newline at end of file
diff --git a/public/race/configure/teams/delete.php b/public/race/configure/teams/delete.php
index f89ddcb..67230d0 100644
--- a/public/race/configure/teams/delete.php
+++ b/public/race/configure/teams/delete.php
@@ -23,7 +23,7 @@ if (!$team)
 }
 
 // show confirmation page
-if ($confirm)
+if (!$confirm)
 {
     $app->view('template/header', ['title' => 'Bekreft sletting']);
     $app->view('pages/race/configure/teams/delete', ['team' => $team]);