diff --git a/app/Filament/Admin/Resources/Settings/Pages/ListSettings.php b/app/Filament/Admin/Resources/Settings/Pages/ListSettings.php
index f72d940..ba5671a 100644
--- a/app/Filament/Admin/Resources/Settings/Pages/ListSettings.php
+++ b/app/Filament/Admin/Resources/Settings/Pages/ListSettings.php
@@ -3,27 +3,19 @@
 namespace App\Filament\Admin\Resources\Settings\Pages;
 
 use App\Filament\Admin\Resources\Settings\SettingResource;
-use App\Filament\Admin\Resources\Settings\Tables\SettingsTable;
+use App\Models\Setting;
 use Filament\Actions\CreateAction;
-use Filament\Forms\Concerns\InteractsWithForms;
-use Filament\Forms\Contracts\HasForms;
+use Filament\Schemas\Components\Tabs;
+use Filament\Schemas\Components\Tabs\Tab;
+
 use Filament\Resources\Pages\ListRecords;
-use Filament\Support\Icons\Heroicon;
 use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Database\Eloquent\Builder;
 
-class ListSettings extends ListRecords implements HasForms
+class ListSettings extends ListRecords
 {
-    use InteractsWithForms;
-
     protected static string $resource = SettingResource::class;
 
-    public ?string $activeGroup = null;
-
-    public function getView(): string
-    {
-        return 'filament.admin.resources.settings.pages.list-settings';
-    }
-
     public function getTitle(): string
     {
         return __('settings.title');
@@ -42,41 +34,34 @@ class ListSettings extends ListRecords implements HasForms
         ];
     }
 
-    public function mount(): void
+    public function getTabs(): array
     {
-        parent::mount();
-        
-        // Query string'den activeGroup' 별 al, yoksa tüm ayarları göster (null)
-        $this->activeGroup = request()->query('group', null);
-    }
+        $tabs = [];
 
-    public function getGroups(): \Illuminate\Support\Collection
-    {
-        return \App\Models\Setting::whereNull('deleted_at')
+        // "Tüm Ayarlar" tab'ı ekle
+        $allCount = Setting::query()->count();
+        $tabs['all'] = Tab::make(__('settings.all_settings'))
+            ->icon($this->getGroupIcon(null))
+            ->badge($allCount);
+
+        // Her grup için tab oluştur
+        $groups = Setting::query()
             ->select('group')
             ->distinct()
             ->orderBy('group')
-            ->pluck('group')
-            ->mapWithKeys(function ($group) {
-                return [$group => __("settings.group_{$group}")];
-            });
-    }
+            ->pluck('group');
 
-    public function setActiveGroup(?string $group): void
-    {
-        $this->activeGroup = $group;
-    }
-
-    protected function getTableQuery(): \Illuminate\Database\Eloquent\Builder
-    {
-        $query = parent::getTableQuery();
-        
-        // Eğer bir grup seçildiyse filtrele
-        if ($this->activeGroup) {
-            $query->where('group', $this->activeGroup);
+        foreach ($groups as $group) {
+            $count = Setting::where('group', $group)->count();
+            $label = __("settings.group_{$group}");
+            
+            $tabs[$group] = Tab::make($label)
+                ->icon($this->getGroupIcon($group))
+                ->badge($count)
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('group', $group));
         }
-        
-        return $query;
+
+        return $tabs;
     }
 
     protected function getGroupIcon(?string $group): string
@@ -104,15 +89,4 @@ class ListSettings extends ListRecords implements HasForms
             default => 'heroicon-o-squares-2x2',
         };
     }
-
-    protected function getGroupCount(?string $group): int
-    {
-        if (!$group) {
-            return \App\Models\Setting::whereNull('deleted_at')->count();
-        }
-
-        return \App\Models\Setting::where('group', $group)
-            ->whereNull('deleted_at')
-            ->count();
-    }
 }
diff --git a/resources/views/filament/admin/resources/settings/pages/list-settings.blade.php b/resources/views/filament/admin/resources/settings/pages/list-settings.blade.php
deleted file mode 100644
index 2c73fd1..0000000
--- a/resources/views/filament/admin/resources/settings/pages/list-settings.blade.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<!-- CUSTOM SETTINGS VIEW LOADED -->
-<x-filament-panels::page>
-    <div class="grid grid-cols-12 gap-6">
-        <!-- Left Sidebar - Vertical Tabs -->
-        <div class="col-span-12 lg:col-span-3">
-            <div class="fi-section rounded-xl bg-white dark:bg-gray-800 shadow-sm ring-1 ring-gray-950/5 dark:ring-white/10">
-                <div class="p-4">
-                    <h3 class="text-sm font-semibold text-gray-950 dark:text-white mb-4">
-                        {{ __('settings.tabs_title') }}
-                    </h3>
-                    
-                    <nav class="space-y-1" aria-label="Settings Groups">
-                        <!-- Tüm Ayarlar -->
-                        <a
-                            href="{{ request()->url() }}"
-                            wire:navigate
-                            @class([
-                                'group flex items-center gap-3 px-3 py-2.5 rounded-lg w-full text-left transition-all',
-                                'bg-primary-50 dark:bg-primary-900/20 text-primary-600 dark:text-primary-400 font-medium ring-1 ring-primary-500/20' => $activeGroup === null,
-                                'text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700/50' => $activeGroup !== null,
-                            ])
-                        >
-                            <x-filament::icon 
-                                :icon="$this->getGroupIcon(null)" 
-                                @class([
-                                    'h-5 w-5 transition-colors shrink-0',
-                                    'text-primary-600 dark:text-primary-400' => $activeGroup === null,
-                                    'text-gray-400 dark:text-gray-500 group-hover:text-gray-600' => $activeGroup !== null,
-                                ])
-                            />
-                            <span class="flex-1 text-sm font-medium">{{ __('settings.all_settings') }}</span>
-                            <span @class([
-                                'px-2 py-0.5 text-xs rounded-full font-medium min-w-[1.5rem] text-center',
-                                'bg-primary-100 dark:bg-primary-800 text-primary-700 dark:text-primary-300' => $activeGroup === null,
-                                'bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-400' => $activeGroup !== null,
-                            ])>
-                                {{ $this->getGroupCount(null) }}
-                            </span>
-                        </a>
-
-                        <!-- Divider -->
-                        <div class="my-2 border-t border-gray-200 dark:border-gray-700"></div>
-
-                        <!-- Gruplar -->
-                        @foreach($this->getGroups() as $groupKey => $groupLabel)
-                                    <a
-                                href="{{ request()->url() }}?group={{ $groupKey }}"
-                                wire:navigate
-                                @class([
-                                    'group flex items-center gap-3 px-3 py-2.5 rounded-lg w-full text-left transition-all',
-                                    'bg-primary-50 dark:bg-primary-900/20 text-primary-600 dark:text-primary-400 font-medium ring-1 ring-primary-500/20' => $activeGroup === $groupKey,
-                                    'text-gray-700 dark:text-gray-300 hover:bg-gray-50 dark:hover:bg-gray-700/50' => $activeGroup !== $groupKey,
-                                ])
-                            >
-                                <x-filament::icon 
-                                    :icon="$this->getGroupIcon($groupKey)" 
-                                    @class([
-                                        'h-5 w-5 transition-colors shrink-0',
-                                        'text-primary-600 dark:text-primary-400' => $activeGroup === $groupKey,
-                                        'text-gray-400 dark:text-gray-500 group-hover:text-gray-600' => $activeGroup !== $groupKey,
-                                    ])
-                                />
-                                <span class="flex-1 text-sm font-medium">{{ $groupLabel }}</span>
-                                <span @class([
-                                    'px-2 py-0.5 text-xs rounded-full font-medium min-w-[1.5rem] text-center',
-                                    'bg-primary-100 dark:bg-primary-800 text-primary-700 dark:text-primary-300' => $activeGroup === $groupKey,
-                                    'bg-gray-100 dark:bg-gray-700 text-gray-600 dark:text-gray-400' => $activeGroup !== $groupKey,
-                                ])>
-                                    {{ $this->getGroupCount($groupKey) }}
-                                </span>
-                            </a>
-                        @endforeach
-                    </nav>
-                </div>
-            </div>
-        </div>
-
-        <!-- Right Content Area - Settings Table -->
-        <div class="col-span-12 lg:col-span-9">
-            <!-- Active Group Header -->
-            @if($activeGroup)
-                <div class="mb-4 flex items-center gap-3">
-                    <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-primary-50 dark:bg-primary-900/20">
-                        <x-filament::icon 
-                            :icon="$this->getGroupIcon($activeGroup)" 
-                            class="h-5 w-5 text-primary-600 dark:text-primary-400"
-                        />
-                    </div>
-                    <div>
-                        <h2 class="text-lg font-semibold text-gray-900 dark:text-white">
-                            {{ $this->getGroups()->get($activeGroup) }}
-                        </h2>
-                        <p class="text-sm text-gray-600 dark:text-gray-400">
-                            {{ $this->getGroupCount($activeGroup) }} {{ __('settings.settings_count') }}
-                        </p>
-                    </div>
-                </div>
-            @else
-                <div class="mb-4 flex items-center gap-3">
-                    <div class="flex items-center justify-center w-10 h-10 rounded-lg bg-primary-50 dark:bg-primary-900/20">
-                        <x-filament::icon 
-                            :icon="$this->getGroupIcon(null)" 
-                            class="h-5 w-5 text-primary-600 dark:text-primary-400"
-                        />
-                    </div>
-                    <div>
-                        <h2 class="text-lg font-semibold text-gray-900 dark:text-white">
-                            {{ __('settings.all_settings') }}
-                        </h2>
-                        <p class="text-sm text-gray-600 dark:text-gray-400">
-                            {{ $this->getGroupCount(null) }} {{ __('settings.settings_count') }}
-                        </p>
-                    </div>
-                </div>
-            @endif
-
-            <!-- Table -->
-            {{ $this->table }}
-        </div>
-    </div>
-</x-filament-panels::page>
-