diff --git a/src/app/Filament/Resources/PermissionResource.php b/src/app/Filament/Resources/PermissionResource.php
new file mode 100644
index 0000000..046da5c
--- /dev/null
+++ b/src/app/Filament/Resources/PermissionResource.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Filament\Resources;
+
+use App\Filament\Resources\PermissionResource\Pages;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Spatie\Permission\Models\Permission;
+
+class PermissionResource extends Resource
+{
+    protected static ?string $model = Permission::class;
+
+    protected static ?string $navigationIcon = 'heroicon-o-key';
+
+    protected static ?string $navigationGroup = 'User Management';
+
+    protected static ?int $navigationSort = 3;
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Section::make('Permission Details')
+                    ->schema([
+                        Forms\Components\TextInput::make('name')
+                            ->required()
+                            ->unique(ignoreRecord: true)
+                            ->maxLength(255)
+                            ->helperText('Use format: resource.action (e.g., users.create, posts.edit)'),
+                        Forms\Components\Select::make('guard_name')
+                            ->options([
+                                'web' => 'Web',
+                                'api' => 'API',
+                            ])
+                            ->default('web')
+                            ->required(),
+                    ])->columns(2),
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('name')
+                    ->badge()
+                    ->color('info')
+                    ->searchable()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('guard_name')
+                    ->badge()
+                    ->color('gray'),
+                Tables\Columns\TextColumn::make('roles_count')
+                    ->counts('roles')
+                    ->label('Roles')
+                    ->badge()
+                    ->color('success'),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListPermissions::route('/'),
+            'create' => Pages\CreatePermission::route('/create'),
+            'edit' => Pages\EditPermission::route('/{record}/edit'),
+        ];
+    }
+}
diff --git a/src/app/Filament/Resources/PermissionResource/Pages/CreatePermission.php b/src/app/Filament/Resources/PermissionResource/Pages/CreatePermission.php
new file mode 100644
index 0000000..4db7945
--- /dev/null
+++ b/src/app/Filament/Resources/PermissionResource/Pages/CreatePermission.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Resources\PermissionResource\Pages;
+
+use App\Filament\Resources\PermissionResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreatePermission extends CreateRecord
+{
+    protected static string $resource = PermissionResource::class;
+}
diff --git a/src/app/Filament/Resources/PermissionResource/Pages/EditPermission.php b/src/app/Filament/Resources/PermissionResource/Pages/EditPermission.php
new file mode 100644
index 0000000..ca7b9b3
--- /dev/null
+++ b/src/app/Filament/Resources/PermissionResource/Pages/EditPermission.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\PermissionResource\Pages;
+
+use App\Filament\Resources\PermissionResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditPermission extends EditRecord
+{
+    protected static string $resource = PermissionResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\DeleteAction::make(),
+        ];
+    }
+}
diff --git a/src/app/Filament/Resources/PermissionResource/Pages/ListPermissions.php b/src/app/Filament/Resources/PermissionResource/Pages/ListPermissions.php
new file mode 100644
index 0000000..d4e4b4d
--- /dev/null
+++ b/src/app/Filament/Resources/PermissionResource/Pages/ListPermissions.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\PermissionResource\Pages;
+
+use App\Filament\Resources\PermissionResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListPermissions extends ListRecords
+{
+    protected static string $resource = PermissionResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+}
diff --git a/src/app/Filament/Resources/RoleResource.php b/src/app/Filament/Resources/RoleResource.php
new file mode 100644
index 0000000..a3e3121
--- /dev/null
+++ b/src/app/Filament/Resources/RoleResource.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Filament\Resources;
+
+use App\Filament\Resources\RoleResource\Pages;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Spatie\Permission\Models\Role;
+
+class RoleResource extends Resource
+{
+    protected static ?string $model = Role::class;
+
+    protected static ?string $navigationIcon = 'heroicon-o-shield-check';
+
+    protected static ?string $navigationGroup = 'User Management';
+
+    protected static ?int $navigationSort = 2;
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Section::make('Role Details')
+                    ->schema([
+                        Forms\Components\TextInput::make('name')
+                            ->required()
+                            ->unique(ignoreRecord: true)
+                            ->maxLength(255),
+                        Forms\Components\Select::make('guard_name')
+                            ->options([
+                                'web' => 'Web',
+                                'api' => 'API',
+                            ])
+                            ->default('web')
+                            ->required(),
+                    ])->columns(2),
+
+                Forms\Components\Section::make('Permissions')
+                    ->schema([
+                        Forms\Components\CheckboxList::make('permissions')
+                            ->relationship('permissions', 'name')
+                            ->columns(3)
+                            ->helperText('Select permissions for this role'),
+                    ]),
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('name')
+                    ->badge()
+                    ->color(fn (string $state): string => match ($state) {
+                        'admin' => 'danger',
+                        'editor' => 'warning',
+                        default => 'success',
+                    })
+                    ->searchable()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('guard_name')
+                    ->badge()
+                    ->color('gray'),
+                Tables\Columns\TextColumn::make('permissions_count')
+                    ->counts('permissions')
+                    ->label('Permissions')
+                    ->badge()
+                    ->color('info'),
+                Tables\Columns\TextColumn::make('users_count')
+                    ->counts('users')
+                    ->label('Users')
+                    ->badge()
+                    ->color('success'),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make()
+                    ->before(function (Role $record) {
+                        if ($record->name === 'admin') {
+                            throw new \Exception('Cannot delete the admin role.');
+                        }
+                    }),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListRoles::route('/'),
+            'create' => Pages\CreateRole::route('/create'),
+            'edit' => Pages\EditRole::route('/{record}/edit'),
+        ];
+    }
+}
diff --git a/src/app/Filament/Resources/RoleResource/Pages/CreateRole.php b/src/app/Filament/Resources/RoleResource/Pages/CreateRole.php
new file mode 100644
index 0000000..0891e26
--- /dev/null
+++ b/src/app/Filament/Resources/RoleResource/Pages/CreateRole.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Resources\RoleResource\Pages;
+
+use App\Filament\Resources\RoleResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateRole extends CreateRecord
+{
+    protected static string $resource = RoleResource::class;
+}
diff --git a/src/app/Filament/Resources/RoleResource/Pages/EditRole.php b/src/app/Filament/Resources/RoleResource/Pages/EditRole.php
new file mode 100644
index 0000000..be28d10
--- /dev/null
+++ b/src/app/Filament/Resources/RoleResource/Pages/EditRole.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\RoleResource\Pages;
+
+use App\Filament\Resources\RoleResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditRole extends EditRecord
+{
+    protected static string $resource = RoleResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\DeleteAction::make(),
+        ];
+    }
+}
diff --git a/src/app/Filament/Resources/RoleResource/Pages/ListRoles.php b/src/app/Filament/Resources/RoleResource/Pages/ListRoles.php
new file mode 100644
index 0000000..962b401
--- /dev/null
+++ b/src/app/Filament/Resources/RoleResource/Pages/ListRoles.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\RoleResource\Pages;
+
+use App\Filament\Resources\RoleResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListRoles extends ListRecords
+{
+    protected static string $resource = RoleResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+}
diff --git a/src/app/Filament/Resources/UserResource.php b/src/app/Filament/Resources/UserResource.php
index f2f07a7..fa5069a 100644
--- a/src/app/Filament/Resources/UserResource.php
+++ b/src/app/Filament/Resources/UserResource.php
@@ -3,38 +3,65 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\UserResource\Pages;
-use App\Filament\Resources\UserResource\RelationManagers;
 use App\Models\User;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
+use Illuminate\Support\Facades\Hash;
+use Spatie\Permission\Models\Role;
 
 class UserResource extends Resource
 {
     protected static ?string $model = User::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-users';
+
+    protected static ?string $navigationGroup = 'User Management';
+
+    protected static ?int $navigationSort = 1;
 
     public static function form(Form $form): Form
     {
         return $form
             ->schema([
-                Forms\Components\TextInput::make('name')
-                    ->required()
-                    ->maxLength(255),
-                Forms\Components\TextInput::make('email')
-                    ->email()
-                    ->required()
-                    ->maxLength(255),
-                Forms\Components\DateTimePicker::make('email_verified_at'),
-                Forms\Components\TextInput::make('password')
-                    ->password()
-                    ->required()
-                    ->maxLength(255),
+                Forms\Components\Section::make('User Information')
+                    ->schema([
+                        Forms\Components\TextInput::make('name')
+                            ->required()
+                            ->maxLength(255),
+                        Forms\Components\TextInput::make('email')
+                            ->email()
+                            ->required()
+                            ->unique(ignoreRecord: true)
+                            ->maxLength(255),
+                        Forms\Components\DateTimePicker::make('email_verified_at')
+                            ->label('Email Verified At'),
+                    ])->columns(2),
+
+                Forms\Components\Section::make('Password')
+                    ->schema([
+                        Forms\Components\TextInput::make('password')
+                            ->password()
+                            ->dehydrateStateUsing(fn ($state) => Hash::make($state))
+                            ->dehydrated(fn ($state) => filled($state))
+                            ->required(fn (string $context): bool => $context === 'create')
+                            ->maxLength(255)
+                            ->confirmed(),
+                        Forms\Components\TextInput::make('password_confirmation')
+                            ->password()
+                            ->maxLength(255)
+                            ->dehydrated(false),
+                    ])->columns(2),
+
+                Forms\Components\Section::make('Roles')
+                    ->schema([
+                        Forms\Components\CheckboxList::make('roles')
+                            ->relationship('roles', 'name')
+                            ->columns(3)
+                            ->helperText('Assign roles to this user'),
+                    ]),
             ]);
     }
 
@@ -43,26 +70,34 @@ public static function table(Table $table): Table
         return $table
             ->columns([
                 Tables\Columns\TextColumn::make('name')
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('email')
-                    ->searchable(),
-                Tables\Columns\TextColumn::make('email_verified_at')
-                    ->dateTime()
+                    ->searchable()
                     ->sortable(),
+                Tables\Columns\TextColumn::make('email')
+                    ->searchable()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('roles.name')
+                    ->badge()
+                    ->color('success')
+                    ->separator(','),
+                Tables\Columns\IconColumn::make('email_verified_at')
+                    ->label('Verified')
+                    ->boolean()
+                    ->trueIcon('heroicon-o-check-circle')
+                    ->falseIcon('heroicon-o-x-circle'),
                 Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
-                Tables\Columns\TextColumn::make('updated_at')
-                    ->dateTime()
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true),
             ])
             ->filters([
-                //
+                Tables\Filters\SelectFilter::make('roles')
+                    ->relationship('roles', 'name')
+                    ->multiple()
+                    ->preload(),
             ])
             ->actions([
                 Tables\Actions\EditAction::make(),
+                Tables\Actions\DeleteAction::make(),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([