diff --git a/app/Filament/Resources/CertificateResource.php b/app/Filament/Resources/CertificateResource.php
index 88d8b28..105cb10 100644
--- a/app/Filament/Resources/CertificateResource.php
+++ b/app/Filament/Resources/CertificateResource.php
@@ -19,6 +19,8 @@ class CertificateResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-collection';
 
+    protected static ?string $navigationGroup = 'Site management';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -64,14 +66,14 @@ class CertificateResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -79,5 +81,5 @@ class CertificateResource extends Resource
             'create' => Pages\CreateCertificate::route('/create'),
             'edit' => Pages\EditCertificate::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/CronjobResource.php b/app/Filament/Resources/CronjobResource.php
index 0513409..f39c824 100644
--- a/app/Filament/Resources/CronjobResource.php
+++ b/app/Filament/Resources/CronjobResource.php
@@ -19,6 +19,8 @@ class CronjobResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-collection';
 
+    protected static ?string $navigationGroup = 'Site management';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -64,14 +66,14 @@ class CronjobResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -79,5 +81,5 @@ class CronjobResource extends Resource
             'create' => Pages\CreateCronjob::route('/create'),
             'edit' => Pages\EditCronjob::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/DatabaseResource.php b/app/Filament/Resources/DatabaseResource.php
index 0bb02ec..193ff5b 100644
--- a/app/Filament/Resources/DatabaseResource.php
+++ b/app/Filament/Resources/DatabaseResource.php
@@ -19,6 +19,8 @@ class DatabaseResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-collection';
 
+    protected static ?string $navigationGroup = 'Site management';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -57,14 +59,14 @@ class DatabaseResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -72,5 +74,5 @@ class DatabaseResource extends Resource
             'create' => Pages\CreateDatabase::route('/create'),
             'edit' => Pages\EditDatabase::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/ProviderPlanResource.php b/app/Filament/Resources/ProviderPlanResource.php
index a9d065e..3fe84b4 100644
--- a/app/Filament/Resources/ProviderPlanResource.php
+++ b/app/Filament/Resources/ProviderPlanResource.php
@@ -19,6 +19,8 @@ class ProviderPlanResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-collection';
 
+    protected static ?string $navigationGroup = 'Providers';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -53,14 +55,14 @@ class ProviderPlanResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -68,5 +70,5 @@ class ProviderPlanResource extends Resource
             'create' => Pages\CreateProviderPlan::route('/create'),
             'edit' => Pages\EditProviderPlan::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/ProviderRegionResource.php b/app/Filament/Resources/ProviderRegionResource.php
index 7870231..f8b2076 100644
--- a/app/Filament/Resources/ProviderRegionResource.php
+++ b/app/Filament/Resources/ProviderRegionResource.php
@@ -19,6 +19,8 @@ class ProviderRegionResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-collection';
 
+    protected static ?string $navigationGroup = 'Providers';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -53,14 +55,14 @@ class ProviderRegionResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -68,5 +70,5 @@ class ProviderRegionResource extends Resource
             'create' => Pages\CreateProviderRegion::route('/create'),
             'edit' => Pages\EditProviderRegion::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/ProviderResource.php b/app/Filament/Resources/ProviderResource.php
index 17c9df8..36b0831 100644
--- a/app/Filament/Resources/ProviderResource.php
+++ b/app/Filament/Resources/ProviderResource.php
@@ -19,6 +19,8 @@ class ProviderResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-collection';
 
+    protected static ?string $navigationGroup = 'Providers';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -57,14 +59,14 @@ class ProviderResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -72,5 +74,5 @@ class ProviderResource extends Resource
             'create' => Pages\CreateProvider::route('/create'),
             'edit' => Pages\EditProvider::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/RedirectResource.php b/app/Filament/Resources/RedirectResource.php
index 4359bcc..f80074f 100644
--- a/app/Filament/Resources/RedirectResource.php
+++ b/app/Filament/Resources/RedirectResource.php
@@ -19,6 +19,8 @@ class RedirectResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-collection';
 
+    protected static ?string $navigationGroup = 'Site management';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -63,14 +65,14 @@ class RedirectResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -78,5 +80,5 @@ class RedirectResource extends Resource
             'create' => Pages\CreateRedirect::route('/create'),
             'edit' => Pages\EditRedirect::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/ServerResource.php b/app/Filament/Resources/ServerResource.php
index 4992f0e..b9f348d 100644
--- a/app/Filament/Resources/ServerResource.php
+++ b/app/Filament/Resources/ServerResource.php
@@ -17,7 +17,9 @@ class ServerResource extends Resource
 {
     protected static ?string $model = Server::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-collection';
+    protected static ?string $navigationIcon = 'heroicon-o-server';
+
+    protected static ?string $navigationGroup = 'Server management';
 
     public static function form(Form $form): Form
     {
@@ -81,14 +83,14 @@ class ServerResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -96,5 +98,5 @@ class ServerResource extends Resource
             'create' => Pages\CreateServer::route('/create'),
             'edit' => Pages\EditServer::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/SiteResource.php b/app/Filament/Resources/SiteResource.php
index 53a6bef..3e8b35b 100644
--- a/app/Filament/Resources/SiteResource.php
+++ b/app/Filament/Resources/SiteResource.php
@@ -17,7 +17,9 @@ class SiteResource extends Resource
 {
     protected static ?string $model = Site::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-collection';
+    protected static ?string $navigationIcon = 'heroicon-o-globe';
+
+    protected static ?string $navigationGroup = 'Site management';
 
     public static function form(Form $form): Form
     {
@@ -66,14 +68,14 @@ class SiteResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -81,5 +83,5 @@ class SiteResource extends Resource
             'create' => Pages\CreateSite::route('/create'),
             'edit' => Pages\EditSite::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/SiteSystemUserResource.php b/app/Filament/Resources/SiteSystemUserResource.php
index baa65d3..d7badae 100644
--- a/app/Filament/Resources/SiteSystemUserResource.php
+++ b/app/Filament/Resources/SiteSystemUserResource.php
@@ -19,6 +19,8 @@ class SiteSystemUserResource extends Resource
 
     protected static ?string $navigationIcon = 'heroicon-o-collection';
 
+    protected static ?string $navigationGroup = 'Site management';
+
     public static function form(Form $form): Form
     {
         return $form
@@ -50,14 +52,14 @@ class SiteSystemUserResource extends Resource
                 Tables\Actions\DeleteBulkAction::make(),
             ]);
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -65,5 +67,5 @@ class SiteSystemUserResource extends Resource
             'create' => Pages\CreateSiteSystemUser::route('/create'),
             'edit' => Pages\EditSiteSystemUser::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php
index 284d2a8..36d15f3 100644
--- a/app/Filament/Resources/UserResource.php
+++ b/app/Filament/Resources/UserResource.php
@@ -17,7 +17,7 @@ class UserResource extends Resource
 {
     protected static ?string $model = User::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-collection';
+    protected static ?string $navigationIcon = 'heroicon-o-users';
 
     public static function form(Form $form): Form
     {
@@ -81,32 +81,13 @@ class UserResource extends Resource
     {
         return $table
             ->columns([
-                Tables\Columns\TextColumn::make('package_id'),
-                Tables\Columns\TextColumn::make('user_name'),
-                Tables\Columns\TextColumn::make('name'),
-                Tables\Columns\TextColumn::make('company'),
-                Tables\Columns\TextColumn::make('address'),
-                Tables\Columns\TextColumn::make('city'),
-                Tables\Columns\TextColumn::make('zip'),
-                Tables\Columns\TextColumn::make('country'),
-                Tables\Columns\TextColumn::make('notes'),
-                Tables\Columns\TextColumn::make('billing_details'),
-                Tables\Columns\TextColumn::make('email'),
-                Tables\Columns\TextColumn::make('email_verified_at')
-                    ->dateTime(),
-                Tables\Columns\TextColumn::make('role'),
-                Tables\Columns\TextColumn::make('theme'),
-                Tables\Columns\TextColumn::make('language'),
-                Tables\Columns\TextColumn::make('blocked'),
-                Tables\Columns\BooleanColumn::make('keyboard_shortcuts'),
+                Tables\Columns\TextColumn::make('user_name')->searchable(),
+                Tables\Columns\TextColumn::make('name')->searchable(),
+                Tables\Columns\TextColumn::make('email')->searchable(),
+                Tables\Columns\TextColumn::make('servers_count')->label('Servers')->counts('servers')->sortable(),
+                Tables\Columns\TextColumn::make('sites_count')->label('Sites')->counts('sites')->sortable(),
                 Tables\Columns\TextColumn::make('created_at')
-                    ->dateTime(),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime(),
-                Tables\Columns\TextColumn::make('stripe_id'),
-                Tables\Columns\TextColumn::make('card_brand'),
-                Tables\Columns\TextColumn::make('card_last_four'),
-                Tables\Columns\TextColumn::make('trial_ends_at')
+                    ->sortable()
                     ->dateTime(),
             ])
             ->filters([
@@ -117,16 +98,17 @@ class UserResource extends Resource
             ])
             ->bulkActions([
                 Tables\Actions\DeleteBulkAction::make(),
-            ]);
+            ])
+            ->defaultSort('created_at', 'desc');
     }
-    
+
     public static function getRelations(): array
     {
         return [
             //
         ];
     }
-    
+
     public static function getPages(): array
     {
         return [
@@ -134,5 +116,5 @@ class UserResource extends Resource
             'create' => Pages\CreateUser::route('/create'),
             'edit' => Pages\EditUser::route('/{record}/edit'),
         ];
-    }    
+    }
 }
diff --git a/package.json b/package.json
index 9d560eb..4531a3a 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
     "name": "ploi-core",
     "private": true,
     "scripts": {
+        "watch": "npm run development",
         "dev": "npm run development",
         "development": "vite",
         "prod": "npm run production",