diff --git a/app/Console/Commands/Grapper/Betsapi/Fixtures.php b/app/Console/Commands/Grapper/Betsapi/Fixtures.php
index a6d838b9..0f375f24 100644
--- a/app/Console/Commands/Grapper/Betsapi/Fixtures.php
+++ b/app/Console/Commands/Grapper/Betsapi/Fixtures.php
@@ -62,13 +62,13 @@ class Fixtures
                                     'starttime' => Carbon::createFromTimestamp((string) $row['time'])->toDateTimeString(),
                                     'home' => $row['home']['name'] ?? '',
                                     'home_id' => (int) $row['home']['id'],
-                                    'home_cc' => $row['home']['cc'] ?? '',
+                                    'home_cc' => strtoupper($row['home']['cc']) ?? '',
                                     'away' => $row['away']['name'] ?? '',
                                     'away_id' => (int) $row['away']['id'],
-                                    'away_cc' => $row['away']['cc'] ?? '',
+                                    'away_cc' => strtoupper($row['away']['cc']) ?? '',
                                     'group' => $row['league']['name'] ?? '',
                                     'group_id' => (int) $row['league']['id'] ?? 0,
-                                    'group_cc' => $row['league']['cc'] ?? '',
+                                    'group_cc' => strtoupper($row['league']['cc']) ?? '',
                                 ];
 
                                 Mapper::updateOrCreate(['event_id' => (int) $row['id']], $event);
diff --git a/app/Filament/Tables/Columns/MapperLeftColumn.php b/app/Filament/Tables/Columns/MapperLeftColumn.php
new file mode 100644
index 00000000..3104698c
--- /dev/null
+++ b/app/Filament/Tables/Columns/MapperLeftColumn.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use Filament\Tables\Columns\Column;
+
+class MapperLeftColumn extends Column
+{
+    protected string $view = 'filament.tables.columns.mapper-left-column';
+}
diff --git a/app/Filament/Tables/Columns/MapperRightColumn.php b/app/Filament/Tables/Columns/MapperRightColumn.php
new file mode 100644
index 00000000..e633ae43
--- /dev/null
+++ b/app/Filament/Tables/Columns/MapperRightColumn.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use Filament\Tables\Columns\Column;
+
+class MapperRightColumn extends Column
+{
+    protected string $view = 'filament.tables.columns.mapper-right-column';
+}
diff --git a/app/Livewire/MapperLeft.php b/app/Livewire/MapperLeft.php
index b59cd08d..d153a238 100644
--- a/app/Livewire/MapperLeft.php
+++ b/app/Livewire/MapperLeft.php
@@ -2,6 +2,7 @@
 
 namespace App\Livewire;
 
+use App\Filament\Tables\Columns\MapperLeftColumn;
 use App\Models\Event;
 use Filament\Actions\Concerns\InteractsWithActions;
 use Filament\Actions\Contracts\HasActions;
@@ -24,8 +25,14 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
         return $table
             ->query(Event::query())
             ->columns([
-                TextColumn::make('home.name')->alignRight(),
-                TextColumn::make('away.name'),
+                TextColumn::make('country.name')
+                    ->searchable()
+                    ->wrap()
+                    ->color('gray')
+                    ->label('Event')
+                    ->icon(fn ($record) => $record->country->icon)
+                    ->description(fn ($record) => $record->competition_group->name),
+                MapperLeftColumn::make('left')->label('NUH Events'),
             ])
             ->filters([
                 // ...
diff --git a/app/Livewire/MapperRight.php b/app/Livewire/MapperRight.php
index b1082673..16f81743 100644
--- a/app/Livewire/MapperRight.php
+++ b/app/Livewire/MapperRight.php
@@ -2,6 +2,7 @@
 
 namespace App\Livewire;
 
+use App\Filament\Tables\Columns\MapperRightColumn;
 use App\Models\Mapper;
 use Filament\Actions\Concerns\InteractsWithActions;
 use Filament\Actions\Contracts\HasActions;
@@ -24,8 +25,14 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
         return $table
             ->query(Mapper::query())
             ->columns([
-                TextColumn::make('home')->alignRight(),
-                TextColumn::make('away'),
+                MapperRightColumn::make('right'),
+                // TextColumn::make('country_betsapi.name')
+                //     ->searchable()
+                //     ->wrap()
+                //     ->color('gray')
+                //     ->label('Event')
+                //     ->icon(fn ($record) => $record->country_betsapi->icon)
+                //     ->description(fn ($record) => $record->group),
             ])
             ->filters([
                 // ...
diff --git a/app/Models/Mapper.php b/app/Models/Mapper.php
index 6a20fd23..fc664799 100644
--- a/app/Models/Mapper.php
+++ b/app/Models/Mapper.php
@@ -22,4 +22,9 @@ class Mapper extends Model
         'away_id',
         'away_cc',
     ];
+
+    public function country_betsapi()
+    {
+        return $this->belongsTo(Country::class, 'group_cc', 'iso2');
+    }
 }
diff --git a/resources/views/filament/tables/columns/mapper-left-column.blade.php b/resources/views/filament/tables/columns/mapper-left-column.blade.php
new file mode 100644
index 00000000..0235576d
--- /dev/null
+++ b/resources/views/filament/tables/columns/mapper-left-column.blade.php
@@ -0,0 +1,8 @@
+<div x-data="{}" x-sortable.x-on:end="console.log('Dropped!', $event.detail)" class="w-full">
+    <div x-sortable-handle x-sortable-item class="bg-white p-4 cursor-grab flex flex-row flex justify-between">
+        <div class="basis-9/20 text-right">{{ $record->home->name }}</div>
+        <div class="basis-1/20 text-center">-</div>
+        <div class="basis-9/20">{{ $record->away->name }}</div>
+        <div class="basis-1/20"> <x-filament::icon-button icon="heroicon-o-arrows-pointing-out" /></div>
+    </div>
+</div>
diff --git a/resources/views/filament/tables/columns/mapper-right-column.blade.php b/resources/views/filament/tables/columns/mapper-right-column.blade.php
new file mode 100644
index 00000000..124efbe8
--- /dev/null
+++ b/resources/views/filament/tables/columns/mapper-right-column.blade.php
@@ -0,0 +1,12 @@
+<div x-data="{}" x-sortable.x-on:end="console.log('Dropped!', $event.detail)" class="w-full">
+    <div x-sortable-handle x-sortable-item class="bg-white p-2 cursor-grab grid grid-cols-10 grid-rows-2 gap-1">
+        <div class="row-span-2 text-left"> <x-filament::icon-button icon="heroicon-o-arrows-pointing-out"
+                class="my-auto" /></div>
+        <div class="col-span-4 text-right">{{ $record->home }}</div>
+        <div class="text-center">-</div>
+        <div class="col-span-4">{{ $record->away }}</div>
+        <div><x-flag-country-at class="h5 w-5" /></div>
+        <div class="col-span-8">{{ $record->country_betsapi?->name }}
+            {{ $record->group }}</div>
+    </div>
+</div>