diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
index 5b7c7de88..697b14646 100644
--- a/app/Livewire/Project/Database/Import.php
+++ b/app/Livewire/Project/Database/Import.php
@@ -11,6 +11,7 @@ use App\Models\StandaloneMongodb;
 use App\Models\StandaloneMysql;
 use App\Models\StandalonePostgresql;
 use App\Models\StandaloneRedis;
+use Illuminate\Support\Facades\Storage;
 
 class Import extends Component
 {
@@ -19,6 +20,7 @@ class Import extends Component
     public $file;
     public $resource;
     public $parameters;
+    public $containers;
     public bool $validated = true;
     public bool $scpInProgress = false;
     public bool $importRunning = false;
@@ -26,7 +28,17 @@ class Import extends Component
     public Server $server;
     public string $container;
     public array $importCommands = [];
+    public string $postgresqlRestoreCommand = 'pg_restore -U $POSTGRES_USER -d $POSTGRES_DB';
+    public string $mysqlRestoreCommand = 'mysql -u $MYSQL_USER -p $MYSQL_PASSWORD $MYSQL_DATABASE';
+    public string $mariadbRestoreCommand = 'mariadb -u $MARIADB_USER -p $MARIADB_PASSWORD $MARIADB_DATABASE';
 
+    public function getListeners()
+    {
+        $userId = auth()->user()->id;
+        return [
+            "echo-private:user.{$userId},DatabaseStatusChanged" => '$refresh',
+        ];
+    }
     public function mount()
     {
         $this->parameters = get_route_parameters();
@@ -59,7 +71,7 @@ class Import extends Component
         $this->resource = $resource;
         $this->server = $this->resource->destination->server;
         $this->container = $this->resource->uuid;
-        if (str(data_get($this,'resource.status'))->startsWith('running')) {
+        if (str(data_get($this, 'resource.status'))->startsWith('running')) {
             $this->containers->push($this->container);
         }
 
@@ -68,14 +80,15 @@ class Import extends Component
             $this->validationMsg = 'The database service has more than one container running. Cannot import.';
         }
 
-        if ($this->resource->getMorphClass() == 'App\Models\StandaloneRedis'
-            || $this->resource->getMorphClass() == 'App\Models\StandaloneMongodb') {
+        if (
+            $this->resource->getMorphClass() == 'App\Models\StandaloneRedis'
+            || $this->resource->getMorphClass() == 'App\Models\StandaloneMongodb'
+        ) {
             $this->validated = false;
             $this->validationMsg = 'This database type is not currently supported.';
         }
-
     }
- 
+
     public function runImport()
     {
         $this->validate([
@@ -87,7 +100,7 @@ class Import extends Component
 
         try {
             $uploadedFilename = $this->file->store('backup-import');
-            $path = \Storage::path($uploadedFilename);
+            $path = Storage::path($uploadedFilename);
             $tmpPath = '/tmp/' . basename($uploadedFilename);
 
             // SCP the backup file to the server.
@@ -98,17 +111,17 @@ class Import extends Component
 
             switch ($this->resource->getMorphClass()) {
                 case 'App\Models\StandaloneMariadb':
-                    $this->importCommands[] = "docker exec {$this->container} sh -c 'mariadb -u\$MARIADB_USER -p\$MARIADB_PASSWORD \$MARIADB_DATABASE < {$tmpPath}'";
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mariadbRestoreCommand} < {$tmpPath}'";
                     $this->importCommands[] = "rm {$tmpPath}";
-                break;
+                    break;
                 case 'App\Models\StandaloneMysql':
-                    $this->importCommands[] = "docker exec {$this->container} sh -c 'mysql -u\$MYSQL_USER -p\$MYSQL_PASSWORD \$MYSQL_DATABASE < {$tmpPath}'";
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->mysqlRestoreCommand} < {$tmpPath}'";
                     $this->importCommands[] = "rm {$tmpPath}";
-                break;
+                    break;
                 case 'App\Models\StandalonePostgresql':
-                    $this->importCommands[] = "docker exec {$this->container} sh -c 'pg_restore -U \$POSTGRES_USER -d \$POSTGRES_DB {$tmpPath}'";
+                    $this->importCommands[] = "docker exec {$this->container} sh -c '{$this->postgresqlRestoreCommand} {$tmpPath}'";
                     $this->importCommands[] = "rm {$tmpPath}";
-                break;
+                    break;
             }
 
             $this->importCommands[] = "docker exec {$this->container} sh -c 'rm {$tmpPath}'";
@@ -122,8 +135,5 @@ class Import extends Component
             $this->validated = false;
             $this->validationMsg = $e->getMessage();
         }
-
     }
-
-
 }
diff --git a/resources/views/livewire/project/database/configuration.blade.php b/resources/views/livewire/project/database/configuration.blade.php
index 14360fbb9..4ed308b40 100644
--- a/resources/views/livewire/project/database/configuration.blade.php
+++ b/resources/views/livewire/project/database/configuration.blade.php
@@ -31,6 +31,11 @@
                 window.location.hash = 'storages'"
                 href="#">Storages
             </a>
+            <a :class="activeTab === 'import' && 'text-white'"
+                @click.prevent="activeTab = 'import';
+            window.location.hash = 'import'" href="#">Import
+                Backup
+            </a>
             <a :class="activeTab === 'webhooks' && 'text-white'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>
@@ -39,11 +44,7 @@
                 window.location.hash = 'resource-limits'"
                 href="#">Resource Limits
             </a>
-            <a :class="activeTab === 'import' && 'text-white'"
-                @click.prevent="activeTab = 'import';
-                window.location.hash = 'import'"
-                href="#">Import
-            </a>
+
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
diff --git a/resources/views/livewire/project/database/import.blade.php b/resources/views/livewire/project/database/import.blade.php
index 64ef28105..a216cf477 100644
--- a/resources/views/livewire/project/database/import.blade.php
+++ b/resources/views/livewire/project/database/import.blade.php
@@ -1,41 +1,60 @@
 <div>
-    <div class="mb-10 rounded alert alert-warning">
-        <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
-            viewBox="0 0 24 24">
+    <h2>Import Backup</h2>
+    <div class="mt-2 mb-4 rounded alert alert-error">
+        <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none" viewBox="0 0 24 24">
             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
                 d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
         </svg>
         <span>This is a destructive action, existing data will be replaced!</span>
     </div>
 
-    @if (!$validated)
-        <div>{{ $validationMsg }}</div>
-    @else
-        @if (!$importRunning)
-        <form disabled wire:submit.prevent="runImport">
-            <div class="flex items-end gap-2"
-                x-data="{ isFinished: false, isUploading: false, progress: 0 }"
-                x-on:livewire-upload-start="isUploading = true; isFinished = false"
-                x-on:livewire-upload-finish="isUploading = false; isFinished = true"
-                x-on:livewire-upload-error="isUploading = false"
-                x-on:livewire-upload-progress="progress = $event.detail.progress"
-            >
-                <input type="file" id="file" wire:model="file">
-                @error('file') <span class="error">{{ $message }}</span> @enderror
-                <x-forms.button type="submit" x-show="isFinished">Import</x-forms.button>
-                <div x-show="isUploading">
-                    <progress max="100" x-bind:value="progress"></progress>
+    @if (str(data_get($resource, 'status'))->startsWith('running'))
+        @if (!$validated)
+            <div>{{ $validationMsg }}</div>
+        @else
+            <form disabled wire:submit.prevent="runImport" x-data="{ isFinished: false, isUploading: false, progress: 0 }">
+                @if ($resource->type() === 'standalone-postgresql')
+                    <x-forms.input class="mb-2" label="Custom Import Command"
+                        wire:model='postgresqlRestoreCommand'></x-forms.input>
+                @elseif ($resource->type() === 'standalone-mysql')
+                    <x-forms.input class="mb-2" label="Custom Import Command"
+                        wire:model='mysqlRestoreCommand'></x-forms.input>
+                @elseif ($resource->type() === 'standalone-mariadb')
+                    <x-forms.input class="mb-2" label="Custom Import Command"
+                        wire:model='mariadbRestoreCommand'></x-forms.input>
+                @endif
+                <div  x-on:livewire-upload-start="isUploading = true; isFinished = false"
+                    x-on:livewire-upload-finish="isUploading = false; isFinished = true"
+                    x-on:livewire-upload-error="isUploading = false"
+                    x-on:livewire-upload-progress="progress = $event.detail.progress">
+                    <label class="block mb-2 text-sm font-medium text-gray-900 dark:text-white" for="file_input">Upload
+                        file</label>
+                    <input wire:model="file"
+                        class="block w-full text-sm rounded cursor-pointer text-whiteborder bg-coolgray-100 border-coolgray-400 focus:outline-none"
+                        aria-describedby="file_input_help" id="file_input" type="file">
+                    <p class="mt-1 text-sm text-neutral-500" id="file_input_help">Max file size: 100MB
+                    </p>
+
+                    @error('file')
+                        <span class="error">{{ $message }}</span>
+                    @enderror
+                    <div x-show="isUploading">
+                        <progress max="100" x-bind:value="progress"
+                            class="progress progress-warning"></progress>
+                    </div>
                 </div>
-            </div>
-        </form>
+                <x-forms.button type="submit" class="w-full mt-4" x-show="isFinished">Import Backup</x-forms.button>
+            </form>
         @endif
-    @endif
 
-    @if ($scpInProgress)
-        <div>Database backup is being copied to server..</div>
-    @endif
+        @if ($scpInProgress)
+            <div>Database backup is being copied to server...</div>
+        @endif
 
-    <div class="container w-full pt-10 mx-auto">
-        <livewire:activity-monitor header="Database import output" />
-    </div>
+        <div class="container w-full pt-4 mx-auto">
+            <livewire:activity-monitor header="Database import output" />
+        </div>
+    @else
+        <div class="text-neutral-500">Database must be running to import a backup.</div>
+    @endif
 </div>
diff --git a/resources/views/livewire/project/shared/scheduled-task/add.blade.php b/resources/views/livewire/project/shared/scheduled-task/add.blade.php
index 133c8cead..7cd74e0bf 100644
--- a/resources/views/livewire/project/shared/scheduled-task/add.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/add.blade.php
@@ -4,7 +4,7 @@
         <x-forms.input placeholder="Run cron" id="name" label="Name" required />
         <x-forms.input placeholder="php artisan schedule:run" id="command" label="Command" required />
         <x-forms.input placeholder="0 0 * * * or daily" id="frequency" label="Frequency" required />
-        <x-forms.input placeholder="php" id="container" label="Container name" />
+        <x-forms.input placeholder="php" id="container" helper="You can leave it empty if your resource only have one container." label="Container name" />
         <x-forms.button onclick="newTask.close()" type="submit">
             Save
         </x-forms.button>
diff --git a/resources/views/livewire/project/shared/scheduled-task/all.blade.php b/resources/views/livewire/project/shared/scheduled-task/all.blade.php
index b860e00b1..32ed50bb1 100644
--- a/resources/views/livewire/project/shared/scheduled-task/all.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/all.blade.php
@@ -8,7 +8,6 @@
     <div class="flex flex-wrap gap-2">
         @forelse($resource->scheduled_tasks as $task)
             <a class="flex flex-col box"
-
                 @if ($resource->type() == 'application')
                 href="{{ route('project.application.scheduled-tasks', [...$parameters, 'task_uuid' => $task->uuid]) }}">
                 @elseif  ($resource->type() == 'service')
@@ -19,7 +18,7 @@
                 <div>Last run: {{ data_get($task->latest_log, 'status', 'No runs yet') }}</div>
             </a>
         @empty
-            <div>No scheduled tasks configured.</div>
+            <div class="text-neutral-500">No scheduled tasks configured.</div>
         @endforelse
     </div>
 </div>