diff --git a/app/Console/Commands/Grapper/TxOdds/Odds/_Dc.php b/app/Console/Commands/Grapper/TxOdds/Odds/_Dc.php
index f5753d30..a06cd536 100644
--- a/app/Console/Commands/Grapper/TxOdds/Odds/_Dc.php
+++ b/app/Console/Commands/Grapper/TxOdds/Odds/_Dc.php
@@ -20,9 +20,9 @@ class _Dc
         foreach ($offer as $value) {
             $odds['dc1x'] = (float) $value->o1;
             $odds['dc12'] = (float) $value->o2;
-            $odds['dc2x'] = (float) $value->o3;
+            $odds['dcx2'] = (float) $value->o3;
         }
-        $odds['margin'] = (float) Margin::calculate([$odds['dc1x'], $odds['dc12'], $odds['dc2x']], 1);
+        $odds['margin'] = (float) Margin::calculate([$odds['dc1x'], $odds['dc12'], $odds['dcx2']], 1);
 
         OddsDc::updateOrCreate([
             'event_id' => Nuh::$id,
diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php
index 6c6204f6..016472ea 100644
--- a/app/Filament/Resources/Events/Tables/EventsTable.php
+++ b/app/Filament/Resources/Events/Tables/EventsTable.php
@@ -4,6 +4,9 @@ namespace App\Filament\Resources\Events\Tables;
 
 use App\Filament\Tables\Columns\Column3way;
 use App\Filament\Tables\Columns\ColumnDc;
+use App\Filament\Tables\Columns\ColumnDnb;
+use App\Filament\Tables\Columns\ColumnGgng;
+use App\Filament\Tables\Columns\ColumnTotal;
 use App\Filament\Tables\Columns\MatchIds;
 use App\Models\BettypeUser;
 use App\Models\Country;
@@ -46,7 +49,7 @@ class EventsTable
                     ->size(IconSize::ExtraLarge)
                     ->icon(fn ($record) => $record->sport->icon)
                     ->tooltip(fn ($record) => $record->id),
-                MatchIds::make('match_ids'),
+                // MatchIds::make('match_ids'),
                 TextColumn::make('id')->hidden()->searchable(),
                 TextColumn::make('betsapi_id')->hidden()->searchable(),
                 TextColumn::make('betradar_id')->hidden()->searchable(),
@@ -69,8 +72,12 @@ class EventsTable
                     ->alignRight(),
                 TextColumn::make('away.name')
                     ->searchable(),
-                Column3way::make('odds3way')->visible(fn () => in_array(1, self::$bettype_settings))->width(280)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => '1x2'])),
-                ColumnDc::make('oddsdc')->visible(fn () => in_array(2, self::$bettype_settings))->width(280)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dc'])),
+                Column3way::make('odds3way')->visible(fn () => in_array(1, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => '1x2'])),
+                ColumnDc::make('oddsdc')->visible(fn () => in_array(2, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dc'])),
+                ColumnDnb::make('oddsdnb')->visible(fn () => in_array(3, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dnb'])),
+                ColumnGgng::make('oddsggng')->visible(fn () => in_array(4, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'gg'])),
+                ColumnGgng::make('oddstq')->visible(fn () => in_array(5, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'tq'])),
+                ColumnTotal::make('oddstotal')->visible(fn () => in_array(6, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'ou'])),
             ])
             ->poll('10s')
             ->defaultSort('starttime', 'ASC')
diff --git a/app/Filament/Tables/Columns/Column3way.php b/app/Filament/Tables/Columns/Column3way.php
index 86224a81..cc6b8e3b 100644
--- a/app/Filament/Tables/Columns/Column3way.php
+++ b/app/Filament/Tables/Columns/Column3way.php
@@ -37,7 +37,7 @@ class Column3way extends Column
         $this->has_odds = count($this->multiline) ? true : false;
     }
 
-    public function getMultilines(): ?array
+    public function getData(): ?array
     {
         return $this->multiline;
     }
diff --git a/app/Filament/Tables/Columns/ColumnDc.php b/app/Filament/Tables/Columns/ColumnDc.php
index b898d5d2..cbc21e10 100644
--- a/app/Filament/Tables/Columns/ColumnDc.php
+++ b/app/Filament/Tables/Columns/ColumnDc.php
@@ -37,7 +37,7 @@ class ColumnDc extends Column
         $this->has_odds = count($this->multiline) ? true : false;
     }
 
-    public function getMultilines(): ?array
+    public function getData(): ?array
     {
         return $this->multiline;
     }
diff --git a/app/Filament/Tables/Columns/ColumnDnb.php b/app/Filament/Tables/Columns/ColumnDnb.php
new file mode 100644
index 00000000..89c68fa4
--- /dev/null
+++ b/app/Filament/Tables/Columns/ColumnDnb.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use App\Models\OddsDnb;
+use Filament\Tables\Columns\Column;
+
+class ColumnDnb extends Column
+{
+    protected string $view = 'filament.tables.columns.column-dnb';
+
+    protected ?array $multiline;
+
+    protected ?array $fumetto;
+
+    protected ?bool $has_odds;
+
+    public function loadData($record, $multiline_client)
+    {
+
+        $res = OddsDnb::with('bookmaker')->where('event_id', $record->id)->get();
+
+        $this->fumetto = [];
+
+        $this->multiline = [];
+
+        foreach ($res as $item) {
+
+            $this->fumetto[] = $item;
+            foreach ($multiline_client as $slot => $bookmaker) {
+                if ($item->bookmaker_id == $bookmaker->bookmaker_id) {
+                    $this->multiline[$slot] = $item;
+                }
+            }
+        }
+
+        $this->has_odds = count($this->multiline) ? true : false;
+    }
+
+    public function getData(): ?array
+    {
+        return $this->multiline;
+    }
+
+    public function getFumetto()
+    {
+        return $this->fumetto;
+    }
+
+    public function hasodds()
+    {
+        return $this->has_odds;
+    }
+}
diff --git a/app/Filament/Tables/Columns/ColumnGgng.php b/app/Filament/Tables/Columns/ColumnGgng.php
new file mode 100644
index 00000000..932df8a4
--- /dev/null
+++ b/app/Filament/Tables/Columns/ColumnGgng.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use App\Models\OddsGgng;
+use Filament\Tables\Columns\Column;
+
+class ColumnGgng extends Column
+{
+    protected string $view = 'filament.tables.columns.column-ggng';
+
+    protected ?array $multiline;
+
+    protected ?array $fumetto;
+
+    protected ?bool $has_odds;
+
+    public function loadData($record, $multiline_client)
+    {
+
+        $res = OddsGgng::with('bookmaker')->where('event_id', $record->id)->get();
+
+        $this->fumetto = [];
+
+        $this->multiline = [];
+
+        foreach ($res as $item) {
+
+            $this->fumetto[] = $item;
+            foreach ($multiline_client as $slot => $bookmaker) {
+                if ($item->bookmaker_id == $bookmaker->bookmaker_id) {
+                    $this->multiline[$slot] = $item;
+                }
+            }
+        }
+
+        $this->has_odds = count($this->multiline) ? true : false;
+    }
+
+    public function getData(): ?array
+    {
+        return $this->multiline;
+    }
+
+    public function getFumetto()
+    {
+        return $this->fumetto;
+    }
+
+    public function hasodds()
+    {
+        return $this->has_odds;
+    }
+}
diff --git a/app/Filament/Tables/Columns/ColumnTotal.php b/app/Filament/Tables/Columns/ColumnTotal.php
new file mode 100644
index 00000000..c1f0e0fb
--- /dev/null
+++ b/app/Filament/Tables/Columns/ColumnTotal.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use App\Models\OddsTotal;
+use Filament\Tables\Columns\Column;
+
+class ColumnTotal extends Column
+{
+    protected string $view = 'filament.tables.columns.column-total';
+
+    protected ?array $multiline;
+
+    protected ?array $fumetto;
+
+    protected ?bool $has_odds;
+
+    public function loadData($record, $multiline_client)
+    {
+
+        $res = OddsTotal::with('bookmaker')->where('event_id', $record->id)->get();
+
+        $this->fumetto = [];
+
+        $this->multiline = [];
+
+        foreach ($res as $item) {
+
+            $this->fumetto[] = $item;
+            foreach ($multiline_client as $slot => $bookmaker) {
+                if ($item->bookmaker_id == $bookmaker->bookmaker_id) {
+                    $this->multiline[$slot] = $item;
+                }
+            }
+        }
+
+        $this->has_odds = count($this->multiline) ? true : false;
+    }
+
+    public function getData(): ?array
+    {
+        return $this->multiline;
+    }
+
+    public function getFumetto()
+    {
+        return $this->fumetto;
+    }
+
+    public function hasodds()
+    {
+        return $this->has_odds;
+    }
+}
diff --git a/app/Filament/Tables/Columns/ColumnTq.php b/app/Filament/Tables/Columns/ColumnTq.php
new file mode 100644
index 00000000..c1217e9f
--- /dev/null
+++ b/app/Filament/Tables/Columns/ColumnTq.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use App\Models\OddsQualify;
+use Filament\Tables\Columns\Column;
+
+class ColumnTq extends Column
+{
+    protected string $view = 'filament.tables.columns.column-tq';
+
+    protected ?array $multiline;
+
+    protected ?array $fumetto;
+
+    protected ?bool $has_odds;
+
+    public function loadData($record, $multiline_client)
+    {
+
+        $res = OddsQualify::with('bookmaker')->where('event_id', $record->id)->get();
+
+        $this->fumetto = [];
+
+        $this->multiline = [];
+
+        foreach ($res as $item) {
+
+            $this->fumetto[] = $item;
+            foreach ($multiline_client as $slot => $bookmaker) {
+                if ($item->bookmaker_id == $bookmaker->bookmaker_id) {
+                    $this->multiline[$slot] = $item;
+                }
+            }
+        }
+
+        $this->has_odds = count($this->multiline) ? true : false;
+    }
+
+    public function getData(): ?array
+    {
+        return $this->multiline;
+    }
+
+    public function getFumetto()
+    {
+        return $this->fumetto;
+    }
+
+    public function hasodds()
+    {
+        return $this->has_odds;
+    }
+}
diff --git a/app/Models/Odds2way.php b/app/Models/Odds2way.php
index 5ce8e018..182f8e61 100644
--- a/app/Models/Odds2way.php
+++ b/app/Models/Odds2way.php
@@ -34,7 +34,7 @@ class Odds2way extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/app/Models/Odds2wayS1.php b/app/Models/Odds2wayS1.php
index 9ca0d26f..936de28f 100644
--- a/app/Models/Odds2wayS1.php
+++ b/app/Models/Odds2wayS1.php
@@ -34,7 +34,7 @@ class Odds2wayS1 extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/app/Models/OddsDc.php b/app/Models/OddsDc.php
index f9438cb1..12c95df3 100644
--- a/app/Models/OddsDc.php
+++ b/app/Models/OddsDc.php
@@ -18,7 +18,7 @@ class OddsDc extends Model
         'bmoid',
         'dc1x',
         'dc12',
-        'dc2x',
+        'dcx2',
         'margin',
         'flag',
         'nuh_check',
@@ -35,7 +35,7 @@ class OddsDc extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/app/Models/OddsDnb.php b/app/Models/OddsDnb.php
index 89d7f0a0..512f0955 100644
--- a/app/Models/OddsDnb.php
+++ b/app/Models/OddsDnb.php
@@ -34,7 +34,7 @@ class OddsDnb extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/app/Models/OddsGgng.php b/app/Models/OddsGgng.php
index f697ef7e..4bad6c04 100644
--- a/app/Models/OddsGgng.php
+++ b/app/Models/OddsGgng.php
@@ -34,7 +34,7 @@ class OddsGgng extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/app/Models/OddsHandicap.php b/app/Models/OddsHandicap.php
index 8d739b20..191dbe8b 100644
--- a/app/Models/OddsHandicap.php
+++ b/app/Models/OddsHandicap.php
@@ -35,7 +35,7 @@ class OddsHandicap extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/app/Models/OddsHandicapQ1.php b/app/Models/OddsHandicapQ1.php
index aff3bd41..481ceb24 100644
--- a/app/Models/OddsHandicapQ1.php
+++ b/app/Models/OddsHandicapQ1.php
@@ -35,7 +35,7 @@ class OddsHandicapQ1 extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/app/Models/OddsQualify.php b/app/Models/OddsQualify.php
index 92c7a3fd..756aaff7 100644
--- a/app/Models/OddsQualify.php
+++ b/app/Models/OddsQualify.php
@@ -34,7 +34,7 @@ class OddsQualify extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/app/Models/OddsTotalQ1.php b/app/Models/OddsTotalQ1.php
index 37432bb2..53a1ad22 100644
--- a/app/Models/OddsTotalQ1.php
+++ b/app/Models/OddsTotalQ1.php
@@ -35,7 +35,7 @@ class OddsTotalQ1 extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()
diff --git a/database/migrations/2024_11_08_053430_create_odds_dc_table.php b/database/migrations/2024_11_08_053430_create_odds_dc_table.php
index 74139019..22d12eb4 100644
--- a/database/migrations/2024_11_08_053430_create_odds_dc_table.php
+++ b/database/migrations/2024_11_08_053430_create_odds_dc_table.php
@@ -21,7 +21,7 @@ return new class extends Migration
             $table->bigInteger('offer_id')->default(0);
             $table->decimal('dc1x', 7, 3)->default(0);
             $table->decimal('dc12', 7, 3)->default(0);
-            $table->decimal('dc2x', 7, 3)->default(0);
+            $table->decimal('dcx2', 7, 3)->default(0);
             $table->decimal('margin', 5, 1)->default(0);
             $table->boolean('flag')->default(0);
             $table->boolean('nuh_check')->default(0);
diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css
index 1fae0056..affb0bff 100644
--- a/resources/css/filament/admin/theme.css
+++ b/resources/css/filament/admin/theme.css
@@ -19,6 +19,10 @@ button[wire\:click="resetTableFiltersForm"] {
     justify-content: space-between;
 }
 
+.fi-ta-header-cell-oddstotal,
+.fi-ta-header-cell-oddstq,
+.fi-ta-header-cell-oddsggng,
+.fi-ta-header-cell-oddsdnb,
 .fi-ta-header-cell-odds3way,
 .fi-ta-header-cell-oddsdc,
 .fi-ta-header-cell-id {
diff --git a/resources/views/filament/tables/columns/column-dc.blade.php b/resources/views/filament/tables/columns/column-dc.blade.php
index db77c200..1857d9d5 100644
--- a/resources/views/filament/tables/columns/column-dc.blade.php
+++ b/resources/views/filament/tables/columns/column-dc.blade.php
@@ -2,12 +2,13 @@
     $loadData($record, $record->multiline_client);
 @endphp
 
-@include('filament.tables.columns.multiline.fumetto')
+@include('filament.tables.columns.multiline.fumetto_dc')
 
-<div {{ $getExtraAttributeBag() }}
-    class="max-w-80 grid grid-cols-5 grid-rows-4 text-xs gap-0 justify-between text-right">
+<div {{ $getExtraAttributeBag() }} class="max-w-80 grid grid-cols-5 grid-rows-4 text-xs gap-0 justify-between text-right"
+    style="width: 225px;">
 
-    @foreach ($getMultilines() as $item)
+
+    @foreach ($getData() as $item)
         @include('filament.tables.columns.multiline.bkm', [
             'bookmaker_id' => $item->bookmaker_id,
             'icon' => $item->bookmaker->icon ?? '',
@@ -17,7 +18,7 @@
 
         @include('filament.tables.columns.multiline.odds', ['odd' => $item->dc12, 'decimal' => 2])
 
-        @include('filament.tables.columns.multiline.odds', ['odd' => $item->dc2x, 'decimal' => 2])
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->dcx2, 'decimal' => 2])
 
         @include('filament.tables.columns.multiline.odds', ['odd' => $item->margin, 'decimal' => 1])
     @endforeach
diff --git a/resources/views/filament/tables/columns/column-dnb.blade.php b/resources/views/filament/tables/columns/column-dnb.blade.php
new file mode 100644
index 00000000..39950318
--- /dev/null
+++ b/resources/views/filament/tables/columns/column-dnb.blade.php
@@ -0,0 +1,23 @@
+@php
+    $loadData($record, $record->multiline_client);
+@endphp
+
+@include('filament.tables.columns.multiline.fumetto_dnb')
+
+<div {{ $getExtraAttributeBag() }} class="max-w-80 grid grid-cols-4 grid-rows-4 text-xs gap-0 justify-between text-right"
+    style="width: 190px;">
+
+
+    @foreach ($getData() as $item)
+        @include('filament.tables.columns.multiline.bkm', [
+            'bookmaker_id' => $item->bookmaker_id,
+            'icon' => $item->bookmaker->icon ?? '',
+        ])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->dnb1, 'decimal' => 2])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->dnb2, 'decimal' => 2])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->margin, 'decimal' => 1])
+    @endforeach
+</div>
diff --git a/resources/views/filament/tables/columns/column-ggng.blade.php b/resources/views/filament/tables/columns/column-ggng.blade.php
new file mode 100644
index 00000000..456fc487
--- /dev/null
+++ b/resources/views/filament/tables/columns/column-ggng.blade.php
@@ -0,0 +1,23 @@
+@php
+    $loadData($record, $record->multiline_client);
+@endphp
+
+@include('filament.tables.columns.multiline.fumetto_dnb')
+
+<div {{ $getExtraAttributeBag() }} class="max-w-80 grid grid-cols-4 grid-rows-4 text-xs gap-0 justify-between text-right"
+    style="width: 190px;">
+
+
+    @foreach ($getData() as $item)
+        @include('filament.tables.columns.multiline.bkm', [
+            'bookmaker_id' => $item->bookmaker_id,
+            'icon' => $item->bookmaker->icon ?? '',
+        ])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->gg, 'decimal' => 2])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->ng, 'decimal' => 2])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->margin, 'decimal' => 1])
+    @endforeach
+</div>
diff --git a/resources/views/filament/tables/columns/column-total.blade.php b/resources/views/filament/tables/columns/column-total.blade.php
new file mode 100644
index 00000000..973cfb38
--- /dev/null
+++ b/resources/views/filament/tables/columns/column-total.blade.php
@@ -0,0 +1,25 @@
+@php
+    $loadData($record, $record->multiline_client);
+@endphp
+
+@include('filament.tables.columns.multiline.fumetto_dc')
+
+<div {{ $getExtraAttributeBag() }} class="max-w-80 grid grid-cols-5 grid-rows-4 text-xs gap-0 justify-between text-right"
+    style="width: 225px;">
+
+
+    @foreach ($getData() as $item)
+        @include('filament.tables.columns.multiline.bkm', [
+            'bookmaker_id' => $item->bookmaker_id,
+            'icon' => $item->bookmaker->icon ?? '',
+        ])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->over, 'decimal' => 2])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->under, 'decimal' => 2])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->total, 'decimal' => 1])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->margin, 'decimal' => 1])
+    @endforeach
+</div>
diff --git a/resources/views/filament/tables/columns/column-tq.blade.php b/resources/views/filament/tables/columns/column-tq.blade.php
new file mode 100644
index 00000000..d1a7b766
--- /dev/null
+++ b/resources/views/filament/tables/columns/column-tq.blade.php
@@ -0,0 +1,23 @@
+@php
+    $loadData($record, $record->multiline_client);
+@endphp
+
+@include('filament.tables.columns.multiline.fumetto_dnb')
+
+<div {{ $getExtraAttributeBag() }} class="max-w-80 grid grid-cols-4 grid-rows-4 text-xs gap-0 justify-between text-right"
+    style="width: 190px;">
+
+
+    @foreach ($getData() as $item)
+        @include('filament.tables.columns.multiline.bkm', [
+            'bookmaker_id' => $item->bookmaker_id,
+            'icon' => $item->bookmaker->icon ?? '',
+        ])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->htq, 'decimal' => 2])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->atq, 'decimal' => 2])
+
+        @include('filament.tables.columns.multiline.odds', ['odd' => $item->margin, 'decimal' => 1])
+    @endforeach
+</div>
diff --git a/resources/views/filament/tables/columns/column_3way.blade.php b/resources/views/filament/tables/columns/column_3way.blade.php
index 1df0ec9e..c675d04d 100644
--- a/resources/views/filament/tables/columns/column_3way.blade.php
+++ b/resources/views/filament/tables/columns/column_3way.blade.php
@@ -2,12 +2,12 @@
     $loadData($record, $record->multiline_client);
 @endphp
 
-@include('filament.tables.columns.multiline.fumetto')
+@include('filament.tables.columns.multiline.fumetto_1x2')
 
-<div {{ $getExtraAttributeBag() }}
-    class="max-w-80 grid grid-cols-5 grid-rows-4 text-xs gap-0 justify-between text-right">
+<div {{ $getExtraAttributeBag() }} class="grid grid-cols-5 grid-rows-4 text-xs gap-0 justify-between text-right"
+    style="width: 225px;">
 
-    @foreach ($getMultilines() as $item)
+    @foreach ($getData() as $item)
         @include('filament.tables.columns.multiline.bkm', [
             'bookmaker_id' => $item->bookmaker_id,
             'icon' => $item->bookmaker->icon ?? '',
diff --git a/resources/views/filament/tables/columns/multiline/fumetto.total.blade.php b/resources/views/filament/tables/columns/multiline/fumetto.total.blade.php
new file mode 100644
index 00000000..09fa02d4
--- /dev/null
+++ b/resources/views/filament/tables/columns/multiline/fumetto.total.blade.php
@@ -0,0 +1,43 @@
+@if ($hasodds())
+    <div x-data="{ message: 'loading..' }" class="mx-3 my-auto">
+        <template x-ref="template">
+            <div class="grid grid-cols-5 grid-rows-5 gap-1 m-5">
+
+                @foreach ($getFumetto() as $item)
+                    @include('filament.tables.columns.multiline.bkm', [
+                        'bookmaker_id' => $item->bookmaker_id,
+                        'icon' => $item->bookmaker->icon ?? '',
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->over,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->under,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->total,
+                        'decimal' => 1,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->margin,
+                        'decimal' => 1,
+                    ])
+                @endforeach
+            </div>
+        </template>
+
+        <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
+            x-tooltip.html="{
+        content: () => $refs.template.innerHTML,
+        allowHTML: true,
+        theme: $store.theme,
+        appendTo: $root
+    }" />
+    </div>
+@endif
diff --git a/resources/views/filament/tables/columns/multiline/fumetto.blade.php b/resources/views/filament/tables/columns/multiline/fumetto_1x2.blade.php
similarity index 100%
rename from resources/views/filament/tables/columns/multiline/fumetto.blade.php
rename to resources/views/filament/tables/columns/multiline/fumetto_1x2.blade.php
diff --git a/resources/views/filament/tables/columns/multiline/fumetto_dc.blade.php b/resources/views/filament/tables/columns/multiline/fumetto_dc.blade.php
new file mode 100644
index 00000000..b1c039da
--- /dev/null
+++ b/resources/views/filament/tables/columns/multiline/fumetto_dc.blade.php
@@ -0,0 +1,43 @@
+@if ($hasodds())
+    <div x-data="{ message: 'loading..' }" class="mx-3 my-auto">
+        <template x-ref="template">
+            <div class="grid grid-cols-5 grid-rows-5 gap-1 m-5">
+
+                @foreach ($getFumetto() as $item)
+                    @include('filament.tables.columns.multiline.bkm', [
+                        'bookmaker_id' => $item->bookmaker_id,
+                        'icon' => $item->bookmaker->icon ?? '',
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->dcx1,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->dc12,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->dcx2,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->margin,
+                        'decimal' => 1,
+                    ])
+                @endforeach
+            </div>
+        </template>
+
+        <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
+            x-tooltip.html="{
+        content: () => $refs.template.innerHTML,
+        allowHTML: true,
+        theme: $store.theme,
+        appendTo: $root
+    }" />
+    </div>
+@endif
diff --git a/resources/views/filament/tables/columns/multiline/fumetto_dnb.blade.php b/resources/views/filament/tables/columns/multiline/fumetto_dnb.blade.php
new file mode 100644
index 00000000..991da4bd
--- /dev/null
+++ b/resources/views/filament/tables/columns/multiline/fumetto_dnb.blade.php
@@ -0,0 +1,38 @@
+@if ($hasodds())
+    <div x-data="{ message: 'loading..' }" class="mx-3 my-auto">
+        <template x-ref="template">
+            <div class="grid grid-cols-4 grid-rows-5 gap-1 m-5">
+
+                @foreach ($getFumetto() as $item)
+                    @include('filament.tables.columns.multiline.bkm', [
+                        'bookmaker_id' => $item->bookmaker_id,
+                        'icon' => $item->bookmaker->icon ?? '',
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->dnb1,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->dnb2,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->margin,
+                        'decimal' => 1,
+                    ])
+                @endforeach
+            </div>
+        </template>
+
+        <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
+            x-tooltip.html="{
+        content: () => $refs.template.innerHTML,
+        allowHTML: true,
+        theme: $store.theme,
+        appendTo: $root
+    }" />
+    </div>
+@endif
diff --git a/resources/views/filament/tables/columns/multiline/fumetto_ggng.blade.php b/resources/views/filament/tables/columns/multiline/fumetto_ggng.blade.php
new file mode 100644
index 00000000..da59d82e
--- /dev/null
+++ b/resources/views/filament/tables/columns/multiline/fumetto_ggng.blade.php
@@ -0,0 +1,38 @@
+@if ($hasodds())
+    <div x-data="{ message: 'loading..' }" class="mx-3 my-auto">
+        <template x-ref="template">
+            <div class="grid grid-cols-4 grid-rows-5 gap-1 m-5">
+
+                @foreach ($getFumetto() as $item)
+                    @include('filament.tables.columns.multiline.bkm', [
+                        'bookmaker_id' => $item->bookmaker_id,
+                        'icon' => $item->bookmaker->icon ?? '',
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->gg,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->ng,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->margin,
+                        'decimal' => 1,
+                    ])
+                @endforeach
+            </div>
+        </template>
+
+        <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
+            x-tooltip.html="{
+        content: () => $refs.template.innerHTML,
+        allowHTML: true,
+        theme: $store.theme,
+        appendTo: $root
+    }" />
+    </div>
+@endif
diff --git a/resources/views/filament/tables/columns/multiline/fumetto_tq.blade.php b/resources/views/filament/tables/columns/multiline/fumetto_tq.blade.php
new file mode 100644
index 00000000..27632469
--- /dev/null
+++ b/resources/views/filament/tables/columns/multiline/fumetto_tq.blade.php
@@ -0,0 +1,38 @@
+@if ($hasodds())
+    <div x-data="{ message: 'loading..' }" class="mx-3 my-auto">
+        <template x-ref="template">
+            <div class="grid grid-cols-4 grid-rows-5 gap-1 m-5">
+
+                @foreach ($getFumetto() as $item)
+                    @include('filament.tables.columns.multiline.bkm', [
+                        'bookmaker_id' => $item->bookmaker_id,
+                        'icon' => $item->bookmaker->icon ?? '',
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->htq,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->atq,
+                        'decimal' => 2,
+                    ])
+
+                    @include('filament.tables.columns.multiline.odds', [
+                        'odd' => $item->margin,
+                        'decimal' => 1,
+                    ])
+                @endforeach
+            </div>
+        </template>
+
+        <x-filament::icon-button icon="heroicon-o-chat-bubble-left-ellipsis" color="gray"
+            x-tooltip.html="{
+        content: () => $refs.template.innerHTML,
+        allowHTML: true,
+        theme: $store.theme,
+        appendTo: $root
+    }" />
+    </div>
+@endif
diff --git a/resources/views/filament/tables/columns/multiline/labels.blade.php b/resources/views/filament/tables/columns/multiline/labels.blade.php
index d4c71ab0..f4324a40 100644
--- a/resources/views/filament/tables/columns/multiline/labels.blade.php
+++ b/resources/views/filament/tables/columns/multiline/labels.blade.php
@@ -1,6 +1,6 @@
 @switch($menu)
     @case('1x2')
-        <div class="grid grid-cols-6 grid-rows-1 text-xs gap-0 justify-between text-center">
+        <div class="grid grid-cols-6 justify-items-stretch text-center text-xs">
             <div></div>
             <div></div>
             <div>1</div>
@@ -11,38 +11,39 @@
     @break
 
     @case('hc')
-        <div class="grid grid-cols-5 grid-rows-1 text-xs gap-0 justify-between text-center">
+    @case('tq')
+        <div class="grid grid-cols-5 justify-items-stretch text-center text-xs">
             <div></div>
             <div></div>
-            <div>Home</div>
-            <div>Away</div>
+            <div>H</div>
+            <div>A</div>
             <div>M</div>
         </div>
     @break
 
     @case('dc')
-        <div class="grid grid-cols-6 grid-rows-1 text-xs gap-0 justify-between text-center">
+        <div class="grid grid-cols-6 justify-items-stretch text-center text-xs">
             <div></div>
             <div></div>
             <div>1X</div>
             <div>12</div>
-            <div>2X</div>
+            <div>X2</div>
             <div>M</div>
         </div>
     @break
 
     @case('dnb')
-        <div class="grid grid-cols-5 grid-rows-1 text-xs gap-0 justify-between text-center">
+        <div class="grid grid-cols-5 justify-items-stretch text-center text-xs">
             <div></div>
             <div></div>
-            <div>DNB 1</div>
-            <div>DNB 2</div>
+            <div>D1</div>
+            <div>D2</div>
             <div>M</div>
         </div>
     @break
 
     @case('gg')
-        <div class="grid grid-cols-5 grid-rows-1 text-xs gap-0 justify-between text-center">
+        <div class="grid grid-cols-5 justify-items-stretch text-center text-xs">
             <div></div>
             <div></div>
             <div>GG</div>
@@ -52,7 +53,7 @@
     @break
 
     @case('ou')
-        <div class="grid grid-cols-6 grid-rows-1 text-xs gap-0 justify-between text-center">
+        <div class="grid grid-cols-6 justify-items-stretch text-center text-xs">
             <div></div>
             <div></div>
             <div>O</div>
diff --git a/resources/views/filament/tables/columns/multiline/odds.blade.php b/resources/views/filament/tables/columns/multiline/odds.blade.php
index ef82f41e..52eb266b 100644
--- a/resources/views/filament/tables/columns/multiline/odds.blade.php
+++ b/resources/views/filament/tables/columns/multiline/odds.blade.php
@@ -1,11 +1,7 @@
-@php
-    use App\Utilities\OddsFormatting;
-@endphp
-
 <div class="h-4  mb-0.5 ml-0.5 border border-white">
     &nbsp;
     @if (isset($odd))
-        {{ OddsFormatting::get($odd, $decimal) }}
+        {{ number_format($odd, $decimal) }}
     @endif
     &nbsp;
 </div>