diff --git a/src/Commands/DbConfigCommand.php b/src/Commands/DbConfigCommand.php
index 78db75a..d74bc78 100644
--- a/src/Commands/DbConfigCommand.php
+++ b/src/Commands/DbConfigCommand.php
@@ -8,7 +8,7 @@
 
 class DbConfigCommand extends Command
 {
-    public $signature = 'make:settings {name}';
+    public $signature = 'make:settings {name} {panel?}';
 
     public $description = 'Create a new settings';
 
@@ -44,9 +44,8 @@ public function handle(): void
             $this->files->put($path, $contents);
             $this->info("File : {$path} created");
         } else {
-            $this->info("File : {$path} already exits");
+            $this->warn("File : {$path} already exits");
         }
-
     }
 
     /**
@@ -62,6 +61,11 @@ public function createViewFromStub(string $viewName): void
         // Define the path to the new view file.
         $newViewPath = resource_path('views/' . str_replace('.', '/', $viewName) . '.blade.php');
 
+        if ($this->files->exists($newViewPath)) {
+            $this->warn("File : {$newViewPath} already exists");
+            return;
+        }
+
         // Read the contents of the view stub.
         $viewStubContents = file_get_contents($viewStubPath);
 
@@ -94,6 +98,7 @@ public function getStubVariables(): array
     {
         return [
             'TITLE' => $this->getSingularClassName($this->argument('name')),
+            'PANEL' => $this->argument('panel') ? ucfirst($this->argument('panel')) . '\\' : '',
             'CLASS_NAME' => $this->getSingularClassName($this->argument('name')),
             'SETTING_NAME' => str($this->argument('name'))->lower()->slug(),
         ];
@@ -123,11 +128,15 @@ public function getStubContents(string $stub, array $stubVariables = []): string
     }
 
     /**
-     * Get the full path of generate class
+     * Get the full path of the generated class.
      */
     public function getSourceFilePath(): string
     {
-        return base_path('App\\Filament\\Pages') . '\\' . $this->getSingularClassName($this->argument('name')) . 'SettingsPage.php';
+        $panel = $this->argument('panel');
+        $panelPrefix = $panel ? ucfirst($panel) . '\\' : '';
+
+        $path = base_path('app\\Filament\\' . $panelPrefix . 'Pages') . '\\' . $this->getSingularClassName($this->argument('name')) . 'SettingsPage.php';
+        return str_replace('\\', '/', $path);
     }
 
     /**
@@ -143,6 +152,7 @@ public function getSingularClassName($name): string
      */
     protected function makeDirectory(string $path): string
     {
+
         if (! $this->files->isDirectory($path)) {
             $this->files->makeDirectory($path, 0777, true, true);
         }
diff --git a/stubs/page.stub b/stubs/page.stub
index 440b683..47ca940 100644
--- a/stubs/page.stub
+++ b/stubs/page.stub
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Pages;
+namespace App\Filament\$PANEL$Pages;
 
 use Filament\Forms\Form;
 use Postare\DbConfig\AbstractPageSettings;