diff --git a/resources/views/livewire/navbar-delete-team.blade.php b/resources/views/livewire/navbar-delete-team.blade.php
index 52d908dc7..1ade3378a 100644
--- a/resources/views/livewire/navbar-delete-team.blade.php
+++ b/resources/views/livewire/navbar-delete-team.blade.php
@@ -2,5 +2,5 @@
     <x-modal-confirmation buttonFullWidth title="Confirm Team Deletion?" buttonTitle="Delete Team" isErrorButton
         submitAction="delete" :actions="['The current Team will be permanently deleted.']" confirmationText="{{ $team }}"
         confirmationLabel="Please confirm the execution of the actions by entering the Team Name below"
-        shortConfirmationLabel="Team Name" step3ButtonText="Confirm" />
+        shortConfirmationLabel="Team Name" />
 </div>
diff --git a/resources/views/livewire/project/database/backup-executions.blade.php b/resources/views/livewire/project/database/backup-executions.blade.php
index da884280b..0878f5b82 100644
--- a/resources/views/livewire/project/database/backup-executions.blade.php
+++ b/resources/views/livewire/project/database/backup-executions.blade.php
@@ -8,7 +8,8 @@
             @forelse($executions as $execution)
                 <div wire:key="{{ data_get($execution, 'id') }}" @class([
                     'flex flex-col border-l-2 transition-colors p-4 bg-white dark:bg-coolgray-100 text-black dark:text-white',
-                    'border-blue-500/50 border-dashed' => data_get($execution, 'status') === 'running',
+                    'border-blue-500/50 border-dashed' =>
+                        data_get($execution, 'status') === 'running',
                     'border-error' => data_get($execution, 'status') === 'failed',
                     'border-success' => data_get($execution, 'status') === 'success',
                 ])>
@@ -20,16 +21,19 @@
                     <div class="flex items-center gap-2 mb-2">
                         <span @class([
                             'px-3 py-1 rounded-md text-xs font-medium tracking-wide shadow-xs',
-                            'bg-blue-100/80 text-blue-700 dark:bg-blue-500/20 dark:text-blue-300 dark:shadow-blue-900/5' => data_get($execution, 'status') === 'running',
-                            'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-200 dark:shadow-red-900/5' => data_get($execution, 'status') === 'failed',
-                            'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200 dark:shadow-green-900/5' => data_get($execution, 'status') === 'success',
+                            'bg-blue-100/80 text-blue-700 dark:bg-blue-500/20 dark:text-blue-300 dark:shadow-blue-900/5' =>
+                                data_get($execution, 'status') === 'running',
+                            'bg-red-100 text-red-800 dark:bg-red-900/30 dark:text-red-200 dark:shadow-red-900/5' =>
+                                data_get($execution, 'status') === 'failed',
+                            'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200 dark:shadow-green-900/5' =>
+                                data_get($execution, 'status') === 'success',
                         ])>
                             @php
-                                $statusText = match(data_get($execution, 'status')) {
+                                $statusText = match (data_get($execution, 'status')) {
                                     'success' => 'Success',
                                     'running' => 'In Progress',
                                     'failed' => 'Failed',
-                                    default => ucfirst(data_get($execution, 'status'))
+                                    default => ucfirst(data_get($execution, 'status')),
                                 };
                             @endphp
                             {{ $statusText }}
@@ -37,9 +41,11 @@
                     </div>
                     <div class="text-gray-600 dark:text-gray-400 text-sm">
                         Started: {{ formatDateInServerTimezone(data_get($execution, 'created_at'), $this->server()) }}
-                        @if(data_get($execution, 'status') !== 'running')
-                            <br>Ended: {{ formatDateInServerTimezone(data_get($execution, 'finished_at'), $this->server()) }}
-                            <br>Duration: {{ calculateDuration(data_get($execution, 'created_at'), data_get($execution, 'finished_at')) }}
+                        @if (data_get($execution, 'status') !== 'running')
+                            <br>Ended:
+                            {{ formatDateInServerTimezone(data_get($execution, 'finished_at'), $this->server()) }}
+                            <br>Duration:
+                            {{ calculateDuration(data_get($execution, 'created_at'), data_get($execution, 'finished_at')) }}
                             <br>Finished {{ \Carbon\Carbon::parse(data_get($execution, 'finished_at'))->diffForHumans() }}
                         @endif
                     </div>
@@ -60,36 +66,60 @@
                         </div>
                         <span @class([
                             'px-2 py-1 rounded-sm text-xs font-medium',
-                            'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200' => !data_get($execution, 'local_storage_deleted', false),
-                            'bg-gray-100 text-gray-600 dark:bg-gray-800/50 dark:text-gray-400' => data_get($execution, 'local_storage_deleted', false),
+                            'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200' => !data_get(
+                                $execution,
+                                'local_storage_deleted',
+                                false),
+                            'bg-gray-100 text-gray-600 dark:bg-gray-800/50 dark:text-gray-400' => data_get(
+                                $execution,
+                                'local_storage_deleted',
+                                false),
                         ])>
                             <span class="flex items-center gap-1">
-                                @if(!data_get($execution, 'local_storage_deleted', false))
-                                    <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                        <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd"></path>
+                                @if (!data_get($execution, 'local_storage_deleted', false))
+                                    <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20"
+                                        xmlns="http://www.w3.org/2000/svg">
+                                        <path fill-rule="evenodd"
+                                            d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
+                                            clip-rule="evenodd"></path>
                                     </svg>
                                 @else
-                                    <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                        <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"></path>
+                                    <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20"
+                                        xmlns="http://www.w3.org/2000/svg">
+                                        <path fill-rule="evenodd"
+                                            d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
+                                            clip-rule="evenodd"></path>
                                     </svg>
                                 @endif
                                 Local Storage
                             </span>
                         </span>
-                        @if($backup->save_s3)
+                        @if ($backup->save_s3)
                             <span @class([
                                 'px-2 py-1 rounded-sm text-xs font-medium',
-                                'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200' => !data_get($execution, 's3_storage_deleted', false),
-                                'bg-gray-100 text-gray-600 dark:bg-gray-800/50 dark:text-gray-400' => data_get($execution, 's3_storage_deleted', false),
+                                'bg-green-100 text-green-800 dark:bg-green-900/30 dark:text-green-200' => !data_get(
+                                    $execution,
+                                    's3_storage_deleted',
+                                    false),
+                                'bg-gray-100 text-gray-600 dark:bg-gray-800/50 dark:text-gray-400' => data_get(
+                                    $execution,
+                                    's3_storage_deleted',
+                                    false),
                             ])>
                                 <span class="flex items-center gap-1">
-                                    @if(!data_get($execution, 's3_storage_deleted', false))
-                                        <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                            <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z" clip-rule="evenodd"></path>
+                                    @if (!data_get($execution, 's3_storage_deleted', false))
+                                        <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20"
+                                            xmlns="http://www.w3.org/2000/svg">
+                                            <path fill-rule="evenodd"
+                                                d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
+                                                clip-rule="evenodd"></path>
                                         </svg>
                                     @else
-                                        <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                                            <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"></path>
+                                        <svg class="w-3 h-3" fill="currentColor" viewBox="0 0 20 20"
+                                            xmlns="http://www.w3.org/2000/svg">
+                                            <path fill-rule="evenodd"
+                                                d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z"
+                                                clip-rule="evenodd"></path>
                                         </svg>
                                     @endif
                                     S3 Storage
@@ -108,11 +138,10 @@
                                 x-on:click="download_file('{{ data_get($execution, 'id') }}')">Download</x-forms.button>
                         @endif
                         <x-modal-confirmation title="Confirm Backup Deletion?" buttonTitle="Delete" isErrorButton
-                            submitAction="deleteBackup({{ data_get($execution, 'id') }})"
-                            :checkboxes="$checkboxes"
+                            submitAction="deleteBackup({{ data_get($execution, 'id') }})" :checkboxes="$checkboxes"
                             :actions="['This backup will be permanently deleted from local storage.']" confirmationText="{{ data_get($execution, 'filename') }}"
                             confirmationLabel="Please confirm the execution of the actions by entering the Backup Filename below"
-                            shortConfirmationLabel="Backup Filename" step3ButtonText="Confirm" />
+                            shortConfirmationLabel="Backup Filename" 1 />
                     </div>
                 </div>
             @empty
diff --git a/resources/views/livewire/project/service/database.blade.php b/resources/views/livewire/project/service/database.blade.php
index 829674eca..b066a22b1 100644
--- a/resources/views/livewire/project/service/database.blade.php
+++ b/resources/views/livewire/project/service/database.blade.php
@@ -11,11 +11,11 @@
                 buttonTitle="Convert to Application" submitAction="convertToApplication" :actions="['The selected resource will be converted to an application.']"
                 confirmationText="{{ Str::headline($database->name) }}"
                 confirmationLabel="Please confirm the execution of the actions by entering the Service Database Name below"
-                shortConfirmationLabel="Service Database Name" step3ButtonText="Confirm" />
+                shortConfirmationLabel="Service Database Name" />
             <x-modal-confirmation title="Confirm Service Database Deletion?" buttonTitle="Delete" isErrorButton
                 submitAction="delete" :actions="['The selected service database container will be stopped and permanently deleted.']" confirmationText="{{ Str::headline($database->name) }}"
                 confirmationLabel="Please confirm the execution of the actions by entering the Service Database Name below"
-                shortConfirmationLabel="Service Database Name" step3ButtonText="Confirm" />
+                shortConfirmationLabel="Service Database Name" />
         </div>
         <div class="flex flex-col gap-2">
             <div class="flex gap-2">
diff --git a/resources/views/livewire/project/service/file-storage.blade.php b/resources/views/livewire/project/service/file-storage.blade.php
index c0508882b..0637c9e86 100644
--- a/resources/views/livewire/project/service/file-storage.blade.php
+++ b/resources/views/livewire/project/service/file-storage.blade.php
@@ -21,7 +21,7 @@
                     ]"
                     confirmationText="{{ $fs_path }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                    shortConfirmationLabel="Filepath" step3ButtonText="Confirm" />
+                    shortConfirmationLabel="Filepath" />
             @else
                 @if (!$fileStorage->is_binary)
                     <x-modal-confirmation :ignoreWire="false" title="Confirm File Conversion to Directory?"
@@ -37,7 +37,7 @@
                     isErrorButton submitAction="delete" :checkboxes="$fileDeletionCheckboxes" :actions="['The selected file will be permanently deleted from the container.']"
                     confirmationText="{{ $fs_path }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Filepath below"
-                    shortConfirmationLabel="Filepath" step3ButtonText="Confirm" />
+                    shortConfirmationLabel="Filepath" />
             @endif
         </div>
         @if (!$fileStorage->is_directory)
diff --git a/resources/views/livewire/project/service/service-application-view.blade.php b/resources/views/livewire/project/service/service-application-view.blade.php
index f77396d93..4685741a7 100644
--- a/resources/views/livewire/project/service/service-application-view.blade.php
+++ b/resources/views/livewire/project/service/service-application-view.blade.php
@@ -11,11 +11,11 @@
                 buttonTitle="Convert to Database" submitAction="convertToDatabase" :actions="['The selected resource will be converted to a service database.']"
                 confirmationText="{{ Str::headline($application->name) }}"
                 confirmationLabel="Please confirm the execution of the actions by entering the Service Application Name below"
-                shortConfirmationLabel="Service Application Name" step3ButtonText="Confirm" />
+                shortConfirmationLabel="Service Application Name" />
             <x-modal-confirmation title="Confirm Service Application Deletion?" buttonTitle="Delete" isErrorButton
                 submitAction="delete" :actions="['The selected service application container will be stopped and permanently deleted.']" confirmationText="{{ Str::headline($application->name) }}"
                 confirmationLabel="Please confirm the execution of the actions by entering the Service Application Name below"
-                shortConfirmationLabel="Service Application Name" step3ButtonText="Confirm" />
+                shortConfirmationLabel="Service Application Name" />
         </div>
         <div class="flex flex-col gap-2">
             <div class="flex gap-2">
diff --git a/resources/views/livewire/project/shared/danger.blade.php b/resources/views/livewire/project/shared/danger.blade.php
index 97478a758..372360fc6 100644
--- a/resources/views/livewire/project/shared/danger.blade.php
+++ b/resources/views/livewire/project/shared/danger.blade.php
@@ -7,5 +7,5 @@
     <x-modal-confirmation title="Confirm Resource Deletion?" buttonTitle="Delete" isErrorButton submitAction="delete"
         buttonTitle="Delete" :checkboxes="$checkboxes" :actions="['Permanently delete all containers of this resource.']" confirmationText="{{ $resourceName }}"
         confirmationLabel="Please confirm the execution of the actions by entering the Resource Name below"
-        shortConfirmationLabel="Resource Name" step3ButtonText="Confirm" />
+        shortConfirmationLabel="Resource Name" />
 </div>
diff --git a/resources/views/livewire/project/shared/destination.blade.php b/resources/views/livewire/project/shared/destination.blade.php
index d0a8c93d6..245449557 100644
--- a/resources/views/livewire/project/shared/destination.blade.php
+++ b/resources/views/livewire/project/shared/destination.blade.php
@@ -70,7 +70,7 @@
                                 'This will stop the all running applications on this server and remove it as a deployment destination.',
                             ]" confirmationText="{{ data_get($destination, 'server.name') }}"
                             confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
-                            shortConfirmationLabel="Server Name" step3ButtonText="Confirm" />
+                            shortConfirmationLabel="Server Name" />
                     </div>
                 </div>
             @endforeach
diff --git a/resources/views/livewire/project/shared/storages/show.blade.php b/resources/views/livewire/project/shared/storages/show.blade.php
index 0756eaf9b..4ad5636ec 100644
--- a/resources/views/livewire/project/shared/storages/show.blade.php
+++ b/resources/views/livewire/project/shared/storages/show.blade.php
@@ -60,7 +60,7 @@
                         'If the persistent storage/volume is actvily used by a resource data will be lost.',
                     ]" confirmationText="{{ $storage->name }}"
                     confirmationLabel="Please confirm the execution of the actions by entering the Storage Name below"
-                    shortConfirmationLabel="Storage Name" step3ButtonText="Confirm" />
+                    shortConfirmationLabel="Storage Name" />
             </div>
         @endif
     </form>
diff --git a/resources/views/livewire/server/cloudflare-tunnel.blade.php b/resources/views/livewire/server/cloudflare-tunnel.blade.php
index aa2f9a1da..05ba47204 100644
--- a/resources/views/livewire/server/cloudflare-tunnel.blade.php
+++ b/resources/views/livewire/server/cloudflare-tunnel.blade.php
@@ -42,7 +42,7 @@
                                     ]"
                                     confirmationText="DISABLE CLOUDFLARE TUNNEL"
                                     confirmationLabel="Please type the confirmation text to disable Cloudflare Tunnel."
-                                    shortConfirmationLabel="Confirmation text" step3ButtonText="Confirm" />
+                                    shortConfirmationLabel="Confirmation text" />
                             @else
                                 <x-modal-confirmation title="Disable Cloudflare Tunnel?"
                                     buttonTitle="Disable Cloudflare Tunnel" isErrorButton
@@ -54,7 +54,7 @@
                                     ]"
                                     confirmationText="DISABLE CLOUDFLARE TUNNEL"
                                     confirmationLabel="Please type the confirmation text to disable Cloudflare Tunnel."
-                                    shortConfirmationLabel="Confirmation text" step3ButtonText="Confirm" />
+                                    shortConfirmationLabel="Confirmation text" />
                             @endif
 
                         </div>
@@ -118,7 +118,7 @@
                         'If you missed something, the connection will not work.',
                     ]" confirmationText="I manually configured Cloudflare Tunnel"
                     confirmationLabel="Please type the confirmation text to confirm that you manually configured Cloudflare Tunnel."
-                    shortConfirmationLabel="Confirmation text" step3ButtonText="Confirm" />
+                    shortConfirmationLabel="Confirmation text" />
             </div>
             @endif
         </div>
diff --git a/resources/views/livewire/server/delete.blade.php b/resources/views/livewire/server/delete.blade.php
index 3efde3a19..c61775ee8 100644
--- a/resources/views/livewire/server/delete.blade.php
+++ b/resources/views/livewire/server/delete.blade.php
@@ -18,12 +18,12 @@
                     <x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete"
                         submitAction="delete" :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
-                        shortConfirmationLabel="Server Name" step3ButtonText="Confirm" />
+                        shortConfirmationLabel="Server Name" />
                 @else
                     <x-modal-confirmation title="Confirm Server Deletion?" isErrorButton buttonTitle="Delete"
                         submitAction="delete" :actions="['This server will be permanently deleted.']" confirmationText="{{ $server->name }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
-                        shortConfirmationLabel="Server Name" step3ButtonText="Confirm" />
+                        shortConfirmationLabel="Server Name" />
                 @endif
             @endif
         </div>
diff --git a/resources/views/livewire/settings/advanced.blade.php b/resources/views/livewire/settings/advanced.blade.php
index bc52b1d6a..6f7e5c867 100644
--- a/resources/views/livewire/settings/advanced.blade.php
+++ b/resources/views/livewire/settings/advanced.blade.php
@@ -64,7 +64,7 @@
                             ]"
                             confirmationText="DISABLE TWO STEP CONFIRMATION"
                             confirmationLabel="Please type the confirmation text to disable two step confirmation."
-                            shortConfirmationLabel="Confirmation text" step3ButtonText="Confirm" />
+                            shortConfirmationLabel="Confirmation text" />
                     </div>
                     <div class="w-full px-4 py-2 mb-4 text-white rounded-xs border-l-4 border-red-500 bg-error">
                         <p class="font-bold">Warning!</p>
diff --git a/resources/views/livewire/team/admin-view.blade.php b/resources/views/livewire/team/admin-view.blade.php
index ebe8e2368..6bcb43cf8 100644
--- a/resources/views/livewire/team/admin-view.blade.php
+++ b/resources/views/livewire/team/admin-view.blade.php
@@ -27,7 +27,7 @@
                         ]"
                         confirmationText="{{ $user->name }}"
                         confirmationLabel="Please confirm the execution of the actions by entering the User Name below"
-                        shortConfirmationLabel="User Name" step3ButtonText="Confirm" />
+                        shortConfirmationLabel="User Name" />
                 </div>
             </div>
         @empty