diff --git a/src/components/scans/ScansOverview.svelte b/src/components/scans/ScansOverview.svelte
index a082e79a..c8f7b334 100644
--- a/src/components/scans/ScansOverview.svelte
+++ b/src/components/scans/ScansOverview.svelte
@@ -21,6 +21,11 @@
     }
     return id.toString() === searchvalue;
   }
+  function format_laptime(laptime){
+    if(laptime < 60){return laptime.toString}
+    if(laptime < 3600){return `${Math.floor(laptime / 60)}min ${laptime - (Math.floor(laptime / 60)*60)}s`}
+    return `${Math.floor(laptime / 3600)}h ${laptime - (Math.floor(laptime / 3600)*3600)}min ${laptime - (Math.floor(laptime / 3600)*3600) - (Math.floor(laptime / 60)*60)}`
+  }
 </script>
 
 {#if store.state.jwtinfo.userdetails.permissions.includes('SCAN:GET')}
@@ -54,23 +59,18 @@
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                Distance
+                Distance (+Track)
+              </th>
+              <th
+                scope="col"
+                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
+                Laptime
               </th>
               <th
                 scope="col"
                 class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
                 Status
               </th>
-              <th
-                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                Track
-              </th>
-              <th
-                scope="col"
-                class="px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">
-                Station
-              </th>
               <th scope="col" class="relative px-6 py-3">
                 <span class="sr-only">{$_('action')}</span>
               </th>
@@ -110,8 +110,25 @@
                       {#if scan.distance < 1000}
                         {scan.distance}m
                       {:else}{scan.distance / 1000}km{/if}
+                      {#if scan.track}
+                        <a
+                          href="../tracks"
+                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{scan.track.name}
+                        </a>
+                      {/if}
                     </div>
                   </td>
+                  <td class="px-6 py-4 whitespace-nowrap">
+                    {#if scan.laptime}
+                      <div class="text-sm font-medium text-gray-900">
+                        {format_laptime(scan.laptime)}
+                      </div>
+                    {:else}
+                      <div class="text-sm font-medium text-gray-900">
+                        Scan with fixed distance
+                      </div>
+                    {/if}
+                  </td>
                   <td class="px-6 py-4 whitespace-nowrap">
                     <div class="flex items-center">
                       {#if scan.valid}
@@ -123,34 +140,6 @@
                       {/if}
                     </div>
                   </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    {#if scan.track}
-                      <div class="text-sm font-medium text-gray-900">
-                        <a
-                          href="../tracks"
-                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{scan.track.name}
-                        </a>
-                      </div>
-                    {:else}
-                      <div class="text-sm font-medium text-gray-900">
-                        Scan with fixed distance
-                      </div>
-                    {/if}
-                  </td>
-                  <td class="px-6 py-4 whitespace-nowrap">
-                    {#if scan.station}
-                      <div class="text-sm font-medium text-gray-900">
-                        <a
-                          href="../scanstations/{scan.station.id}"
-                          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{scan.station.description || '#' + scan.station.id}
-                        </a>
-                      </div>
-                    {:else}
-                      <div class="text-sm font-medium text-gray-900">
-                        Scan with fixed distance
-                      </div>
-                    {/if}
-                  </td>
 
                   {#if active_deletes[scan.id] === true}
                     <td