diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php
index 88f6ca6d3..1082b48cd 100644
--- a/app/Livewire/Project/Application/Heading.php
+++ b/app/Livewire/Project/Application/Heading.php
@@ -142,7 +142,7 @@ class Heading extends Component
     {
         return view('livewire.project.application.heading', [
             'checkboxes' => [
-                ['id' => 'docker_cleanup', 'label' => 'Cleanup docker build cache and unused images (next deployment could take longer).'],
+                ['id' => 'docker_cleanup', 'label' => __('resource.docker_cleanup')],
             ],
         ]);
     }
diff --git a/app/Livewire/Project/Service/Navbar.php b/app/Livewire/Project/Service/Navbar.php
index 2e3002852..f6caa481e 100644
--- a/app/Livewire/Project/Service/Navbar.php
+++ b/app/Livewire/Project/Service/Navbar.php
@@ -120,7 +120,7 @@ class Navbar extends Component
     {
         return view('livewire.project.service.navbar', [
             'checkboxes' => [
-                ['id' => 'docker_cleanup', 'label' => 'Cleanup docker build cache and unused images (next deployment could take longer).'],
+                ['id' => 'docker_cleanup', 'label' => __('resource.docker_cleanup')],
             ],
         ]);
     }
diff --git a/app/Livewire/Project/Service/ServiceApplicationView.php b/app/Livewire/Project/Service/ServiceApplicationView.php
index f6355b6b5..56b506043 100644
--- a/app/Livewire/Project/Service/ServiceApplicationView.php
+++ b/app/Livewire/Project/Service/ServiceApplicationView.php
@@ -103,8 +103,8 @@ class ServiceApplicationView extends Component
     {
         return view('livewire.project.service.service-application-view', [
             'checkboxes' => [
-                ['id' => 'delete_volumes', 'label' => 'All associated volumes with this resource will be permanently deleted.'],
-                ['id' => 'docker_cleanup', 'label' => 'Docker cleanup will be run on the server which removes builder cache and unused images.'],
+                ['id' => 'delete_volumes', 'label' => __('resource.delete_volumes')],
+                ['id' => 'docker_cleanup', 'label' => __('resource.docker_cleanup')],
                 // ['id' => 'delete_associated_backups_locally', 'label' => 'All backups associated with this Ressource will be permanently deleted from local storage.'],
                 // ['id' => 'delete_associated_backups_s3', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected S3 Storage.'],
                 // ['id' => 'delete_associated_backups_sftp', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected SFTP Storage.']
diff --git a/app/Livewire/Project/Shared/Danger.php b/app/Livewire/Project/Shared/Danger.php
index f437b910e..543e64539 100644
--- a/app/Livewire/Project/Shared/Danger.php
+++ b/app/Livewire/Project/Shared/Danger.php
@@ -126,10 +126,10 @@ class Danger extends Component
     {
         return view('livewire.project.shared.danger', [
             'checkboxes' => [
-                ['id' => 'delete_volumes', 'label' => 'All associated volumes with this resource will be permanently deleted.'],
-                ['id' => 'delete_connected_networks', 'label' => 'All connected networks with this resource will be permanently deleted (except the predefined networks).'],
-                ['id' => 'delete_configurations', 'label' => 'All configuration files will be permanently deleted form the server.'],
-                ['id' => 'docker_cleanup', 'label' => 'Docker cleanup will be run on the server which removes builder cache and unused images.'],
+                ['id' => 'delete_volumes', 'label' => __('resource.delete_volumes')],
+                ['id' => 'delete_connected_networks', 'label' => __('resource.delete_connected_networks')],
+                ['id' => 'delete_configurations', 'label' => __('resource.delete_configurations')],
+                ['id' => 'docker_cleanup', 'label' => __('resource.docker_cleanup')],
                 // ['id' => 'delete_associated_backups_locally', 'label' => 'All backups associated with this Ressource will be permanently deleted from local storage.'],
                 // ['id' => 'delete_associated_backups_s3', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected S3 Storage.'],
                 // ['id' => 'delete_associated_backups_sftp', 'label' => 'All backups associated with this Ressource will be permanently deleted from the selected SFTP Storage.']
diff --git a/lang/en.json b/lang/en.json
index 461a96e9a..e1603c303 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -26,5 +26,11 @@
     "input.code": "One-time code",
     "input.recovery_code": "Recovery code",
     "button.save": "Save",
-    "repository.url": "<span class='text-helper'>Examples</span><br>For Public repositories, use <span class='text-helper'>https://...</span>.<br>For Private repositories, use <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> branch will be selected<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> branch will be selected.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> branch will be selected.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> branch will be selected."
+    "repository.url": "<span class='text-helper'>Examples</span><br>For Public repositories, use <span class='text-helper'>https://...</span>.<br>For Private repositories, use <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> branch will be selected<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> branch will be selected.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> branch will be selected.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> branch will be selected.",
+    "service.stop": "This service will be stopped.",
+    "resource.docker_cleanup": "Run Docker Cleanup (remove unused images and builder cache).",
+    "resource.non_persistent": "All non-persistent data will be deleted.",
+    "resource.delete_volumes": "All volumes associated with this resource will be permanently deleted.",
+    "resource.delete_connected_networks": "All non-predefined networks associated with this resource will be permanently deleted.",
+    "resource.delete_configurations": "All configuration files will be permanently deleted from the server."
 }
diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index 249820e9a..6b46f2fb6 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -11,12 +11,12 @@
     'actions' => [],
     'confirmWithText' => true,
     'confirmationText' => 'Confirm Deletion',
-    'confirmationLabel' => 'Please confirm the execution of the actions by entering the NAME below',
+    'confirmationLabel' => 'Please confirm the execution of the actions by entering the Name below',
     'shortConfirmationLabel' => 'Name',
     'confirmWithPassword' => true,
     'step1ButtonText' => 'Continue',
-    'step2ButtonText' => 'Confirm',
-    'step3ButtonText' => 'Delete Permanently',
+    'step2ButtonText' => 'Continue',
+    'step3ButtonText' => 'Confirm',
     'dispatchEvent' => false,
     'dispatchEventType' => 'success',
     'dispatchEventMessage' => '',
@@ -139,7 +139,7 @@
                 @endif
             @else
                 @if ($buttonFullWidth)
-                    <x-forms.button @click="modalOpen=true" class="flex gap-2 w-full" wire:target>
+                    <x-forms.button @click="modalOpen=true" class="flex w-full gap-2" wire:target>
                         {{ $buttonTitle }}
                     </x-forms.button>
                 @else
@@ -162,27 +162,27 @@
                 x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
                 x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
                 class="relative w-full py-6 border rounded min-w-full lg:min-w-[36rem] max-w-[48rem] bg-neutral-100 border-neutral-400 dark:bg-base px-7 dark:border-coolgray-300">
-                <div class="flex justify-between items-center pb-3">
-                    <h3 class="pr-8 text-2xl font-bold">{{ $title }}</h3>
+                <div class="flex items-center justify-between pb-3">
+                    <h3 class="text-2xl font-bold pr-8">{{ $title }}</h3>
                     <button @click="modalOpen = false; resetModal()"
-                        class="flex absolute top-2 right-2 justify-center items-center w-8 h-8 rounded-full dark:text-white hover:bg-coolgray-300">
+                        class="absolute top-2 right-2 flex items-center justify-center w-8 h-8 rounded-full dark:text-white hover:bg-coolgray-300">
                         <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                             stroke-width="1.5" stroke="currentColor">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                         </svg>
                     </button>
                 </div>
-                <div class="relative pb-8 w-auto">
+                <div class="relative w-auto pb-8">
                     @if (!empty($checkboxes))
                         <!-- Step 1: Select actions -->
                         <div x-show="step === 1">
-                            <div class="flex justify-between items-center mb-4">
-                                <div>Select the actions you want to perform:</div>
+                            <div class="flex justify-between items-center">
+                                <h4>Actions</h4>
                             </div>
                             @foreach ($checkboxes as $index => $checkbox)
-                                <div class="flex justify-between items-center mb-2">
+                                <div class="flex items-center justify-between mb-2">
                                     <label for="{{ $checkbox['id'] }}"
-                                        class="flex-grow pr-4 text-sm leading-5 text-gray-700 dark:text-gray-300">
+                                        class="text-sm leading-5 text-gray-700 dark:text-gray-300 flex-grow pr-4">
                                         {{ $checkbox['label'] }}
                                     </label>
                                     <x-forms.checkbox :id="$checkbox['id']" :wire:model="$checkbox['id']"
@@ -196,7 +196,7 @@
 
                     <!-- Step 2: Confirm deletion -->
                     <div x-show="step === 2">
-                        <div class="p-4 mb-4 text-white border-l-4 border-red-500 bg-error" role="alert">
+                        <div class="bg-error border-l-4 border-red-500 text-white p-4 mb-4" role="alert">
                             <p class="font-bold">Warning</p>
                             <p>This operation is permanent and cannot be undone. Please think again before proceeding!
                             </p>
@@ -205,7 +205,7 @@
                         <ul class="mb-4 space-y-2">
                             @foreach ($actions as $action)
                                 <li class="flex items-center text-red-500">
-                                    <svg class="flex-shrink-0 mr-2 w-5 h-5" fill="none" stroke="currentColor"
+                                    <svg class="w-5 h-5 mr-2 flex-shrink-0" fill="none" stroke="currentColor"
                                         viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
                                             d="M6 18L18 6M6 6l12 12"></path>
@@ -216,7 +216,7 @@
                             @foreach ($checkboxes as $checkbox)
                                 <template x-if="selectedActions.includes('{{ $checkbox['id'] }}')">
                                     <li class="flex items-center text-red-500">
-                                        <svg class="flex-shrink-0 mr-2 w-5 h-5" fill="none" stroke="currentColor"
+                                        <svg class="w-5 h-5 mr-2 flex-shrink-0" fill="none" stroke="currentColor"
                                             viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                                             <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
                                                 d="M6 18L18 6M6 6l12 12"></path>
@@ -228,17 +228,16 @@
                         </ul>
                         @if ($confirmWithText)
                             <div class="mb-4">
-                                <h4 class="mb-2 text-lg font-semibold">Confirm Actions</h4>
-                                <p class="mb-2 text-sm">{{ $confirmationLabel }}</p>
-
+                                <h4 class="text-lg font-semibold mb-2">Confirm Actions</h4>
+                                <p class="text-sm mb-2">{{ $confirmationLabel }}</p>
                                 <div class="relative mb-2">
                                     <input type="text" x-model="confirmationText"
-                                        class="p-2 pr-10 w-full text-black rounded cursor-text input" readonly>
+                                        class="w-full p-2 pr-10 rounded text-black input cursor-text" readonly>
                                     <button @click="copyConfirmationText()"
-                                        class="absolute right-2 top-1/2 text-gray-500 transform -translate-y-1/2 hover:text-gray-700"
+                                        class="absolute right-2 top-1/2 transform -translate-y-1/2 text-gray-500 hover:text-gray-700"
                                         title="Copy confirmation text" x-ref="copyButton">
                                         <template x-if="!copied">
-                                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5" viewBox="0 0 20 20"
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" viewBox="0 0 20 20"
                                                 fill="currentColor">
                                                 <path d="M8 3a1 1 0 011-1h2a1 1 0 110 2H9a1 1 0 01-1-1z" />
                                                 <path
@@ -246,7 +245,7 @@
                                             </svg>
                                         </template>
                                         <template x-if="copied">
-                                            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-green-500"
+                                            <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5 text-green-500"
                                                 viewBox="0 0 20 20" fill="currentColor">
                                                 <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"
@@ -257,18 +256,18 @@
                                 </div>
 
                                 <label for="userConfirmationText"
-                                    class="block mt-4 text-sm font-medium text-gray-700 dark:text-gray-300">
+                                    class="block text-sm font-medium text-gray-700 dark:text-gray-300 mt-4">
                                     {{ $shortConfirmationLabel }}
                                 </label>
                                 <input type="text" x-model="userConfirmationText"
-                                    class="p-2 mt-1 w-full text-black rounded input">
+                                    class="w-full p-2 rounded text-black input mt-1">
                             </div>
                         @endif
                     </div>
 
                     <!-- Step 3: Password confirmation -->
                     <div x-show="step === 3 && confirmWithPassword">
-                        <div class="p-4 mb-4 text-white border-l-4 border-red-500 bg-error" role="alert">
+                        <div class="bg-error border-l-4 border-red-500 text-white p-4 mb-4" role="alert">
                             <p class="font-bold">Final Confirmation</p>
                             <p>Please enter your password to confirm this destructive action.</p>
                         </div>
@@ -277,10 +276,11 @@
                                 class="block text-sm font-medium text-gray-700 dark:text-gray-300">
                                 Your Password
                             </label>
-                            <input type="password" id="password-confirm" x-model="password" class="w-full input">
-                            <p x-show="passwordError" x-text="passwordError" class="mt-1 text-sm text-red-500"></p>
+                            <input type="password" id="password-confirm" x-model="password" class="input w-full"
+                                placeholder="Enter your password">
+                            <p x-show="passwordError" x-text="passwordError" class="text-red-500 text-sm mt-1"></p>
                             @error('password')
-                                <p class="mt-1 text-sm text-red-500">{{ $message }}</p>
+                                <p class="text-red-500 text-sm mt-1">{{ $message }}</p>
                             @enderror
                         </div>
                     </div>
diff --git a/resources/views/livewire/project/service/navbar.blade.php b/resources/views/livewire/project/service/navbar.blade.php
index da41618ef..79541fd49 100644
--- a/resources/views/livewire/project/service/navbar.blade.php
+++ b/resources/views/livewire/project/service/navbar.blade.php
@@ -22,73 +22,60 @@
         </nav>
         <div class="flex flex-wrap order-first gap-2 items-center sm:order-last">
             @if (str($service->status())->contains('running'))
-            <button @click="$wire.dispatch('restartEvent')" class="gap-2 button">
-                <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                    <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
-                        <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                        <path d="M20 4v5h-5" />
-                    </g>
-                </svg>
-                Pull Latest Images & Restart
-            </button>
-            <x-modal-confirmation 
-            title="Confirm Service Stopping?"
-            buttonTitle="Stop"
-            submitAction="stop"
-            :checkboxes="$checkboxes"
-            :actions="['This service will be stopped.', 'If the service is currently in use data could be lost.', 'All non-persistent data of this service (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the service again).']"
-            :confirmWithText="false"
-            :confirmWithPassword="false"
-            step1ButtonText="Continue Stopping Service"
-            step2ButtonText="Stop Service"
-            :dispatchEvent="true"
-            dispatchEventType="stopEvent"
-            >
-                <x-slot:button-title>
-                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                        <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                        </path>
-                        <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                        </path>
+                <button @click="$wire.dispatch('restartEvent')" class="gap-2 button">
+                    <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                            stroke-width="2">
+                            <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                            <path d="M20 4v5h-5" />
+                        </g>
                     </svg>
-                    Stop
-                </x-slot:button-title>
-            </x-modal-confirmation>
+                    Pull Latest Images & Restart
+                </button>
+                <x-modal-confirmation title="Confirm Service Stopping?" buttonTitle="Stop" submitAction="stop"
+                    :checkboxes="$checkboxes" :actions="[__('service.stop'), __('resource.non_persistent')]" :confirmWithText="false" :confirmWithPassword="false" step1ButtonText="Continue"
+                    step2ButtonText="Stop Service" :dispatchEvent="true" dispatchEventType="stopEvent">
+                    <x-slot:button-title>
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                            stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                            <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                            </path>
+                            <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                            </path>
+                        </svg>
+                        Stop
+                    </x-slot:button-title>
+                </x-modal-confirmation>
             @elseif (str($service->status())->contains('degraded'))
-            <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
-                <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                    <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
-                        <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                        <path d="M20 4v5h-5" />
-                    </g>
-                </svg>
-                Restart Degraded Services
-            </button>
-            <x-modal-confirmation 
-            title="Confirm Service Stopping?"
-            buttonTitle="Stop"
-            submitAction="stop"
-            :checkboxes="$checkboxes"
-            :actions="['This service will be stopped.', 'If the service is currently in use data could be lost.', 'All non-persistent data of this service (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the service again).']"
-            :confirmWithText="false"
-            :confirmWithPassword="false"
-            step1ButtonText="Continue Stopping Service"
-            step2ButtonText="Stop Service"
-            :dispatchEvent="true"
-            dispatchEventType="stopEvent"
-            >
-                <x-slot:button-title>
-                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                        <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                        </path>
-                        <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                        </path>
+                <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
+                    <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                            stroke-width="2">
+                            <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                            <path d="M20 4v5h-5" />
+                        </g>
                     </svg>
-                    Stop
-                </x-slot:button-title>
-            </x-modal-confirmation>
+                    Restart Degraded Services
+                </button>
+                <x-modal-confirmation title="Confirm Service Stopping?" buttonTitle="Stop" submitAction="stop"
+                    :checkboxes="$checkboxes" :actions="[__('service.stop'), __('resource.non_persistent')]" :confirmWithText="false" :confirmWithPassword="false"
+                    step1ButtonText="Continue" step2ButtonText="Stop Service" :dispatchEvent="true"
+                    dispatchEventType="stopEvent">
+                    <x-slot:button-title>
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                            stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                            <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                            </path>
+                            <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                            </path>
+                        </svg>
+                        Stop
+                    </x-slot:button-title>
+                </x-modal-confirmation>
             @elseif (str($service->status())->contains('exited'))
                 <button wire:click='stop(true)' class="gap-2 button">
                     <svg class="w-5 h-5" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
@@ -108,59 +95,54 @@
                     Deploy
                 </button>
             @else
-            <x-modal-confirmation 
-            title="Confirm Service Stopping?"
-            buttonTitle="Stop"
-            submitAction="stop"
-            :checkboxes="$checkboxes"
-            :actions="['This service will be stopped.', 'If the service is currently in use data could be lost.', 'All non-persistent data of this service (containers, networks, unused images) will be deleted (don\'t worry, no data is lost and you can start the service again).']"
-            :confirmWithText="false"
-            :confirmWithPassword="false"
-            step1ButtonText="Continue Stopping Service"
-            step2ButtonText="Stop Service"
-            :dispatchEvent="true"
-            dispatchEventType="stopEvent"
-            >
-                <x-slot:button-title>
-                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                        <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                        </path>
-                        <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
-                        </path>
+                <x-modal-confirmation title="Confirm Service Stopping?" buttonTitle="Stop" submitAction="stop"
+                    :checkboxes="$checkboxes" :actions="[__('service.stop'), __('resource.non_persistent')]" :confirmWithText="false" :confirmWithPassword="false"
+                    step1ButtonText="Continue" step2ButtonText="Stop Service" :dispatchEvent="true"
+                    dispatchEventType="stopEvent">
+                    <x-slot:button-title>
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                            stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
+                            <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                            <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                            </path>
+                            <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z">
+                            </path>
+                        </svg>
+                        Stop
+                    </x-slot:button-title>
+                </x-modal-confirmation>
+                <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24"
+                        stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                        stroke-linejoin="round">
+                        <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                        <path d="M7 4v16l13 -8z" />
                     </svg>
-                    Stop
-                </x-slot:button-title>  
-            </x-modal-confirmation>
-            <button @click="$wire.dispatch('startEvent')" class="gap-2 button">
-                <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                    <path d="M7 4v16l13 -8z" />
-                </svg>
-                Deploy
-            </button>
+                    Deploy
+                </button>
             @endif
         </div>
     </div>
     @script
-    <script>
-        $wire.$on('stopEvent', () => {
-            $wire.$dispatch('info', 'Stopping service.');
-            $wire.$call('stop');
-        });
-        $wire.$on('startEvent', () => {
-            window.dispatchEvent(new CustomEvent('startservice'));
-            $wire.$call('start');
-        });
-        $wire.$on('restartEvent', () => {
-            $wire.$dispatch('info', 'Pulling new images.');
-            $wire.$call('restart');
-        });
-        $wire.on('imagePulled', () => {
-            window.dispatchEvent(new CustomEvent('startservice'));
-            $wire.$dispatch('info', 'Restarting service.');
-        });
-    </script>
+        <script>
+            $wire.$on('stopEvent', () => {
+                $wire.$dispatch('info', 'Stopping service.');
+                $wire.$call('stop');
+            });
+            $wire.$on('startEvent', () => {
+                window.dispatchEvent(new CustomEvent('startservice'));
+                $wire.$call('start');
+            });
+            $wire.$on('restartEvent', () => {
+                $wire.$dispatch('info', 'Pulling new images.');
+                $wire.$call('restart');
+            });
+            $wire.on('imagePulled', () => {
+                window.dispatchEvent(new CustomEvent('startservice'));
+                $wire.$dispatch('info', 'Restarting service.');
+            });
+        </script>
     @endscript
 
 </div>
diff --git a/resources/views/livewire/project/shared/danger.blade.php b/resources/views/livewire/project/shared/danger.blade.php
index cc9ce86ff..9d6d902f1 100644
--- a/resources/views/livewire/project/shared/danger.blade.php
+++ b/resources/views/livewire/project/shared/danger.blade.php
@@ -6,6 +6,6 @@
     </div>
     <x-modal-confirmation title="Confirm Resource Deletion?" buttonTitle="Delete" isErrorButton submitAction="delete"
         buttonTitle="Delete" :checkboxes="$checkboxes" :actions="['All containers of this resource will be stopped and permanently deleted.']" confirmationText="{{ $resourceName }}"
-        confirmationLabel="Please confirm the execution of the actions by entering the name of the resource below."
-        shortConfirmationLabel="Resource Name" step3ButtonText="Permanently Delete" />
+        confirmationLabel="Please confirm the execution of the actions by entering the NAME of the resource below"
+        shortConfirmationLabel="Resource Name" step3ButtonText="Delete Permanently" />
 </div>