diff --git a/app/Filament/Clusters/StaticData/Resources/CompetitionGroups/CompetitionGroupResource.php b/app/Filament/Clusters/StaticData/Resources/CompetitionGroups/CompetitionGroupResource.php
index 65681706..99103c9f 100644
--- a/app/Filament/Clusters/StaticData/Resources/CompetitionGroups/CompetitionGroupResource.php
+++ b/app/Filament/Clusters/StaticData/Resources/CompetitionGroups/CompetitionGroupResource.php
@@ -24,11 +24,11 @@ class CompetitionGroupResource extends Resource
 
     protected static string|UnitEnum|null $navigationGroup = 'TxOdds';
 
-    protected static ?string $modelLabel = 'Groups';
+    protected static ?string $modelLabel = 'Leagues';
 
     protected static ?int $navigationSort = 11;
 
-    protected static ?string $navigationLabel = 'Groups';
+    protected static ?string $navigationLabel = 'Leagues';
 
     public static function form(Schema $schema): Schema
     {
diff --git a/app/Filament/Clusters/StaticData/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php b/app/Filament/Clusters/StaticData/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php
index 86c9e2d2..25f0ab08 100644
--- a/app/Filament/Clusters/StaticData/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php
+++ b/app/Filament/Clusters/StaticData/Resources/CompetitionGroups/Tables/CompetitionGroupsTable.php
@@ -39,13 +39,15 @@ class CompetitionGroupsTable
                     ->icon(fn ($record) => $record->sport->icon)
                     ->tooltip(fn ($record) => $record->id)
                     ->visibleFrom('lg'),
+                TextColumn::make('id')->copyable()->alignCenter()->tooltip('Click to copy'),
+                TextColumn::make('name')
+                    ->color('primary')
+                    ->searchable(),
                 TextColumn::make('country.name')
                     ->wrap()
                     ->color('gray')
                     ->label('Country')
                     ->icon(fn ($record) => $record->country->icon),
-                TextColumn::make('name')
-                    ->searchable(),
                 SelectColumn::make('level')
                     ->width(30)
                     ->options([
diff --git a/app/Filament/Clusters/StaticData/Resources/Countries/CountryResource.php b/app/Filament/Clusters/StaticData/Resources/Countries/CountryResource.php
index 9d93edce..27555271 100644
--- a/app/Filament/Clusters/StaticData/Resources/Countries/CountryResource.php
+++ b/app/Filament/Clusters/StaticData/Resources/Countries/CountryResource.php
@@ -56,18 +56,17 @@ class CountryResource extends Resource
             ->recordAction(null)
             ->recordTitleAttribute('name')
             ->columns([
-                TextColumn::make('id')->searchable(),
+                TextColumn::make('id')->searchable()
+                    ->alignCenter()->tooltip('Click to copy'),
+                TextColumn::make('name')
+                    ->searchable()
+                    ->color('primary')
+                    ->copyable(),
                 IconColumn::make('icon')
                     ->sortable()
                     ->icon(function ($state): string {
                         return $state;
                     })->label('Flags')->size(IconSize::TwoExtraLarge),
-                TextColumn::make('name')
-                    ->searchable()
-                    ->copyable()
-                    ->copyMessage('Name copied')
-                    ->copyMessageDuration(1500),
-                // TextColumn::make('iso2'),
                 TextColumn::make('iso3'),
                 TextColumn::make('cc'),
                 TextColumn::make('numeric'),
diff --git a/app/Filament/Clusters/StaticData/Resources/Elements/Tables/ElementsTable.php b/app/Filament/Clusters/StaticData/Resources/Elements/Tables/ElementsTable.php
index 1bf8ea09..0f76b1be 100644
--- a/app/Filament/Clusters/StaticData/Resources/Elements/Tables/ElementsTable.php
+++ b/app/Filament/Clusters/StaticData/Resources/Elements/Tables/ElementsTable.php
@@ -38,7 +38,6 @@ class ElementsTable
                 IconColumn::make('sport.icon')
                     ->label('')
                     ->grow(false)
-                    ->color('primary')
                     ->width(30)
                     ->icon(fn ($record) => $record->sport->icon)
                     ->tooltip(fn ($record) => $record->id)
@@ -47,6 +46,9 @@ class ElementsTable
                     ->tooltip('click to copy')
                     ->alignCenter()
                     ->copyable(),
+                TextColumn::make('name')
+                    ->searchable()
+                    ->color('primary'),
                 TextColumn::make('country.name')
                     ->wrap()
                     ->color('gray')
@@ -60,7 +62,6 @@ class ElementsTable
                 ImageColumn::make('betsapi_image_id')
                     ->label('Logo')
                     ->defaultImageUrl(fn ($state) => url('https://assets.b365api.com/images/team/m/'.$state.'.png')),
-                TextColumn::make('name')->searchable(),
             ])->filters([
                 SelectFilter::make('sport_id')
                     ->label('Sport')