diff --git a/app/Livewire/Project/Database/BackupEdit.php b/app/Livewire/Project/Database/BackupEdit.php
index 012c6bb24..0d363e983 100644
--- a/app/Livewire/Project/Database/BackupEdit.php
+++ b/app/Livewire/Project/Database/BackupEdit.php
@@ -210,7 +210,7 @@ class BackupEdit extends Component
         return view('livewire.project.database.backup-edit', [
             'checkboxes' => [
                 ['id' => 'delete_associated_backups_locally', 'label' => __('database.delete_backups_locally')],
-                ['id' => 'delete_associated_backups_s3', 'label' => 'All backups associated with this backup job for this database will be permanently deleted from the selected S3 Storage.'],
+                ['id' => 'delete_associated_backups_s3', 'label' => 'All backups will be permanently deleted (associated with this backup job) from the selected S3 Storage.'],
                 // ['id' => 'delete_associated_backups_sftp', 'label' => 'All backups associated with this backup job from this database will be permanently deleted from the selected SFTP Storage.']
             ],
         ]);
diff --git a/resources/views/livewire/project/database/backup-edit.blade.php b/resources/views/livewire/project/database/backup-edit.blade.php
index f1f604a7d..603983864 100644
--- a/resources/views/livewire/project/database/backup-edit.blade.php
+++ b/resources/views/livewire/project/database/backup-edit.blade.php
@@ -5,13 +5,17 @@
             Save
         </x-forms.button>
         @if (str($status)->startsWith('running'))
-        <livewire:project.database.backup-now :backup="$backup" />
+            <livewire:project.database.backup-now :backup="$backup" />
         @endif
         @if ($backup->database_id !== 0)
-        <x-modal-confirmation title="Confirm Backup Schedule Deletion?" buttonTitle="Delete Backups and Schedule" isErrorButton submitAction="delete" :checkboxes="$checkboxes" :actions="[
+            <x-modal-confirmation title="Confirm Backup Schedule Deletion?" buttonTitle="Delete Backups and Schedule"
+                isErrorButton submitAction="delete" :checkboxes="$checkboxes" :actions="[
                     'The selected backup schedule will be deleted.',
                     'Scheduled backups for this database will be stopped (if this is the only backup schedule for this database).',
-                ]" confirmationText="{{ $backup->database->name }}" confirmationLabel="Please confirm the execution of the actions by entering the Database Name of the scheduled backups below" shortConfirmationLabel="Database Name" />
+                ]"
+                confirmationText="{{ $backup->database->name }}"
+                confirmationLabel="Please confirm the execution of the actions by entering the Database Name of the scheduled backups below"
+                shortConfirmationLabel="Database Name" />
         @endif
     </div>
     <div class="w-48 pb-2">
@@ -19,87 +23,96 @@
         <x-forms.checkbox instantSave label="S3 Enabled" id="saveS3" />
     </div>
     @if ($backup->save_s3)
-    <div class="pb-6">
-        <x-forms.select id="s3StorageId" label="S3 Storage" required>
-            <option value="default">Select a S3 storage</option>
-            @foreach ($s3s as $s3)
-            <option value="{{ $s3->id }}">{{ $s3->name }}</option>
-            @endforeach
-        </x-forms.select>
-    </div>
+        <div class="pb-6">
+            <x-forms.select id="s3StorageId" label="S3 Storage" required>
+                <option value="default">Select a S3 storage</option>
+                @foreach ($s3s as $s3)
+                    <option value="{{ $s3->id }}">{{ $s3->name }}</option>
+                @endforeach
+            </x-forms.select>
+        </div>
     @endif
     <div class="flex flex-col gap-2">
         <h3>Settings</h3>
         <div class="flex gap-2 flex-col ">
             @if ($backup->database_type === 'App\Models\StandalonePostgresql' && $backup->database_id !== 0)
-            <div class="w-48">
-                <x-forms.checkbox label="Backup All Databases" id="dumpAll" instantSave />
-            </div>
-            @if (!$backup->dump_all)
-            <x-forms.input label="Databases To Backup" helper="Comma separated list of databases to backup. Empty will include the default one." id="databasesToBackup" />
-            @endif
+                <div class="w-48">
+                    <x-forms.checkbox label="Backup All Databases" id="dumpAll" instantSave />
+                </div>
+                @if (!$backup->dump_all)
+                    <x-forms.input label="Databases To Backup"
+                        helper="Comma separated list of databases to backup. Empty will include the default one."
+                        id="databasesToBackup" />
+                @endif
             @elseif($backup->database_type === 'App\Models\StandaloneMongodb')
-            <x-forms.input label="Databases To Include" helper="A list of databases to backup. You can specify which collection(s) per database to exclude from the backup. Empty will include all databases and collections.<br><br>Example:<br><br>database1:collection1,collection2|database2:collection3,collection4<br><br> database1 will include all collections except collection1 and collection2. <br>database2 will include all collections except collection3 and collection4.<br><br>Another Example:<br><br>database1:collection1|database2<br><br> database1 will include all collections except collection1.<br>database2 will include ALL collections." id="databasesToBackup" />
+                <x-forms.input label="Databases To Include"
+                    helper="A list of databases to backup. You can specify which collection(s) per database to exclude from the backup. Empty will include all databases and collections.<br><br>Example:<br><br>database1:collection1,collection2|database2:collection3,collection4<br><br> database1 will include all collections except collection1 and collection2. <br>database2 will include all collections except collection3 and collection4.<br><br>Another Example:<br><br>database1:collection1|database2<br><br> database1 will include all collections except collection1.<br>database2 will include ALL collections."
+                    id="databasesToBackup" />
             @elseif($backup->database_type === 'App\Models\StandaloneMysql')
-            <div class="w-48">
-                <x-forms.checkbox label="Backup All Databases" id="dumpAll" instantSave />
-            </div>
-            @if (!$backup->dump_all)
-            <x-forms.input label="Databases To Backup" helper="Comma separated list of databases to backup. Empty will include the default one." id="databasesToBackup" />
-            @endif
+                <div class="w-48">
+                    <x-forms.checkbox label="Backup All Databases" id="dumpAll" instantSave />
+                </div>
+                @if (!$backup->dump_all)
+                    <x-forms.input label="Databases To Backup"
+                        helper="Comma separated list of databases to backup. Empty will include the default one."
+                        id="databasesToBackup" />
+                @endif
             @elseif($backup->database_type === 'App\Models\StandaloneMariadb')
-            <div class="w-48">
-                <x-forms.checkbox label="Backup All Databases" id="dumpAll" instantSave />
-            </div>
-            @if (!$backup->dump_all)
-            <x-forms.input label="Databases To Backup" helper="Comma separated list of databases to backup. Empty will include the default one." id="databasesToBackup" />
-            @endif
+                <div class="w-48">
+                    <x-forms.checkbox label="Backup All Databases" id="dumpAll" instantSave />
+                </div>
+                @if (!$backup->dump_all)
+                    <x-forms.input label="Databases To Backup"
+                        helper="Comma separated list of databases to backup. Empty will include the default one."
+                        id="databasesToBackup" />
+                @endif
             @endif
         </div>
         <div class="flex gap-2">
             <x-forms.input label="Frequency" id="frequency" />
-            <x-forms.input label="Timezone" id="timezone" disabled helper="The timezone of the server where the backup is scheduled to run (if not set, the instance timezone will be used)" />
+            <x-forms.input label="Timezone" id="timezone" disabled
+                helper="The timezone of the server where the backup is scheduled to run (if not set, the instance timezone will be used)" />
         </div>
 
         <h3 class="mt-6 mb-2 text-lg font-medium">Backup Retention Settings</h3>
         <div class="mb-4">
             <ul class="list-disc pl-6 space-y-2">
-                <li>Setting a value to 0 means unlimited retention</li>
-                <li>The retention rules work independently - whichever limit is reached first will trigger cleanup</li>
+                <li>Setting a value to 0 means unlimited retention.</li>
+                <li>The retention rules work independently - whichever limit is reached first will trigger cleanup.</li>
             </ul>
         </div>
 
         <div class="flex gap-6 flex-col">
             <div>
                 <h4 class="mb-3 font-medium">Local Backup Retention</h4>
-                <div class="flex gap-4">
-                    <x-forms.input label="Number of backups to keep" id="databaseBackupRetentionAmountLocally" type="number" min="0" helper="Keeps only the specified number of most recent backups on the server. Set to 0 for unlimited backups." />
-                    <x-forms.input label="Days to keep backups" id="databaseBackupRetentionDaysLocally" type="number" min="0" helper="Automatically removes backups older than the specified number of days. Set to 0 for no time limit." />
-                    <x-forms.input 
-                        label="Maximum storage (GB)" 
-                        id="databaseBackupRetentionMaxStorageLocally" 
-                        type="number" 
-                        min="0" 
-                        step="0.0000001"
+                <div class="flex gap-2">
+                    <x-forms.input label="Number of backups to keep" id="databaseBackupRetentionAmountLocally"
+                        type="number" min="0"
+                        helper="Keeps only the specified number of most recent backups on the server. Set to 0 for unlimited backups." />
+                    <x-forms.input label="Days to keep backups" id="databaseBackupRetentionDaysLocally" type="number"
+                        min="0"
+                        helper="Automatically removes backups older than the specified number of days. Set to 0 for no time limit." />
+                    <x-forms.input label="Maximum storage (GB)" id="databaseBackupRetentionMaxStorageLocally"
+                        type="number" min="0" step="0.0000001"
                         helper="When total size of all backups in the current backup job exceeds this limit in GB, the oldest backups will be removed. Decimal values are supported (e.g. 0.001 for 1MB). Set to 0 for unlimited storage." />
                 </div>
             </div>
 
             @if ($backup->save_s3)
-            <div>
-                <h4 class="mb-3 font-medium">S3 Storage Retention</h4>
-                <div class="flex gap-4">
-                    <x-forms.input label="Number of backups to keep" id="databaseBackupRetentionAmountS3" type="number" min="0" helper="Keeps only the specified number of most recent backups on S3 storage. Set to 0 for unlimited backups." />
-                    <x-forms.input label="Days to keep backups" id="databaseBackupRetentionDaysS3" type="number" min="0" helper="Automatically removes S3 backups older than the specified number of days. Set to 0 for no time limit." />
-                    <x-forms.input 
-                        label="Maximum storage (GB)" 
-                        id="databaseBackupRetentionMaxStorageS3" 
-                        type="number" 
-                        min="0" 
-                        step="0.0000001"
-                        helper="When total size of all backups in the current backup job exceeds this limit in GB, the oldest backups will be removed. Decimal values are supported (e.g. 0.5 for 500MB). Set to 0 for unlimited storage." />
+                <div>
+                    <h4 class="mb-3 font-medium">S3 Storage Retention</h4>
+                    <div class="flex gap-2">
+                        <x-forms.input label="Number of backups to keep" id="databaseBackupRetentionAmountS3"
+                            type="number" min="0"
+                            helper="Keeps only the specified number of most recent backups on S3 storage. Set to 0 for unlimited backups." />
+                        <x-forms.input label="Days to keep backups" id="databaseBackupRetentionDaysS3" type="number"
+                            min="0"
+                            helper="Automatically removes S3 backups older than the specified number of days. Set to 0 for no time limit." />
+                        <x-forms.input label="Maximum storage (GB)" id="databaseBackupRetentionMaxStorageS3"
+                            type="number" min="0" step="0.0000001"
+                            helper="When total size of all backups in the current backup job exceeds this limit in GB, the oldest backups will be removed. Decimal values are supported (e.g. 0.5 for 500MB). Set to 0 for unlimited storage." />
+                    </div>
                 </div>
-            </div>
             @endif
         </div>
     </div>