diff --git a/resources/views/livewire/sessions/scenarios.blade.php b/resources/views/livewire/sessions/scenarios.blade.php
index 51ffa6e..e6d8914 100644
--- a/resources/views/livewire/sessions/scenarios.blade.php
+++ b/resources/views/livewire/sessions/scenarios.blade.php
@@ -13,7 +13,7 @@
     private const SORTABLE = [
         'scenario', 'level', 'ok', 'outcome',
         'wall', 'turns', 'commands', 'submissions', 'rejected',
-        't_first_sub', 't_pass', 'gen_tokens',
+        't_first_sub', 't_pass', 'gen_tokens', 'gen_tps',
     ];
 
     public ?int $sessionId = null;
@@ -78,11 +78,16 @@ public function results()
         $column = in_array($this->sortBy, self::SORTABLE, true) ? $this->sortBy : 'scenario';
         $direction = $this->sortDirection === 'asc' ? 'asc' : 'desc';
 
-        return DB::table('scenario_runs')
-            ->whereIn('benchmark_run_id', $runIds)
-            ->orderBy($column, $direction)
-            ->orderBy('id')
-            ->get();
+        $query = DB::table('scenario_runs')
+            ->whereIn('benchmark_run_id', $runIds);
+
+        if ($column === 'gen_tps') {
+            $query->orderByRaw('gen_tokens / nullif(wall, 0) ' . $direction);
+        } else {
+            $query->orderBy($column, $direction);
+        }
+
+        return $query->orderBy('id')->get();
     }
 };
 ?>
@@ -120,6 +125,7 @@ public function results()
             <flux:table.column sortable :sorted="$sortBy === 't_first_sub'" :direction="$sortDirection" wire:click="sort('t_first_sub')" class="text-center">{{ __('t first sub') }}</flux:table.column>
             <flux:table.column sortable :sorted="$sortBy === 't_pass'" :direction="$sortDirection" wire:click="sort('t_pass')" class="text-center">{{ __('t pass') }}</flux:table.column>
             <flux:table.column sortable :sorted="$sortBy === 'gen_tokens'" :direction="$sortDirection" wire:click="sort('gen_tokens')" class="text-center">{{ __('Gen tokens') }}</flux:table.column>
+            <flux:table.column sortable :sorted="$sortBy === 'gen_tps'" :direction="$sortDirection" wire:click="sort('gen_tps')" class="text-center">{{ __('Gen tok/s') }}</flux:table.column>
         </flux:table.columns>
 
         <flux:table.rows>
@@ -145,6 +151,7 @@ public function results()
                     <flux:table.cell class="text-center font-mono text-sm">{{ number_format($result->t_first_sub, 1) }}</flux:table.cell>
                     <flux:table.cell class="text-center font-mono text-sm">{{ $result->t_pass !== null ? number_format($result->t_pass, 1) : '—' }}</flux:table.cell>
                     <flux:table.cell class="text-center font-mono text-sm">{{ number_format($result->gen_tokens) }}</flux:table.cell>
+                    <flux:table.cell class="text-center font-mono text-sm">{{ $result->wall > 0 && $result->gen_tokens > 0 ? number_format($result->gen_tokens / $result->wall, 1) : '—' }}</flux:table.cell>
                 </flux:table.row>
             @endforeach
         </flux:table.rows>
diff --git a/resources/views/livewire/summary/index.blade.php b/resources/views/livewire/summary/index.blade.php
index a7c1403..1efd034 100644
--- a/resources/views/livewire/summary/index.blade.php
+++ b/resources/views/livewire/summary/index.blade.php
@@ -190,7 +190,7 @@ class="w-64"
                         <span class="text-[10px] font-semibold uppercase tracking-wider text-zinc-400">{{ __('Benchmark') }}</span>
                         <span class="text-[10px] font-semibold uppercase tracking-wider text-zinc-400">{{ __('Thinking') }}</span>
                         <span class="text-[10px] font-semibold uppercase tracking-wider text-zinc-400">{{ __('Result') }}</span>
-                        <span class="text-[10px] font-semibold uppercase tracking-wider text-zinc-400">{{ __('Speed (tok/s)') }} <span class="font-normal normal-case">avg · wtd</span></span>
+                        <span class="text-[10px] font-semibold uppercase tracking-wider text-zinc-400">{{ __('Speed (tok/s)') }} <span class="font-normal normal-case">{{ __('weighted average') }}</span></span>
                         <span class="text-[10px] font-semibold uppercase tracking-wider text-zinc-400">{{ __('Tokens') }}</span>
                         <span></span>
                     </div>
@@ -214,12 +214,10 @@ class="flex flex-wrap items-center gap-x-4 gap-y-1 px-4 py-2.5 hover:bg-zinc-50
                                     <flux:badge size="xs" color="{{ $row->failed > 0 ? 'rose' : 'zinc' }}">✘ {{ $row->failed }}</flux:badge>
                                 </span>
                                 <span>
-                                    @if ($row->avg_user_tps !== null)
-                                        <span class="font-mono text-sm">{{ number_format($row->avg_user_tps, 1) }} <span class="text-xs text-zinc-400">avg</span></span>
-                                        <span class="font-mono text-sm">{{ number_format($row->weighted_user_tps, 1) }} <span class="text-xs text-zinc-400">wtd</span></span>
+                                    @if ($row->weighted_user_tps !== null)
+                                        <span class="font-mono text-sm">{{ number_format($row->weighted_user_tps, 1) }}</span>
                                     @elseif ($row->gen_tps !== null)
-                                        <span class="font-mono text-sm">{{ number_format($row->gen_tps, 1) }} <span class="text-xs text-zinc-400">gen</span></span>
-                                        <span class="font-mono text-sm text-zinc-400">—</span>
+                                        <span class="font-mono text-sm">{{ number_format($row->gen_tps, 1) }} <span class="text-xs text-zinc-400">{{ __('gen') }}</span></span>
                                     @endif
                                 </span>
                                 <span class="font-mono text-sm">{{ number_format($row->total_tokens) }}</span>