diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.php
index 057db8e67..b4a130904 100644
--- a/app/Models/ServiceDatabase.php
+++ b/app/Models/ServiceDatabase.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Symfony\Component\Yaml\Yaml;
 
 class ServiceDatabase extends BaseModel
 {
diff --git a/resources/views/livewire/project/database/postgresql/general.blade.php b/resources/views/livewire/project/database/postgresql/general.blade.php
index 8b184f024..9a1e7bb47 100644
--- a/resources/views/livewire/project/database/postgresql/general.blade.php
+++ b/resources/views/livewire/project/database/postgresql/general.blade.php
@@ -26,27 +26,29 @@
             <x-forms.input label="Image" id="database.image" required
                 helper="For all available images, check here:<br><br><a target='_blank' href='https://hub.docker.com/_/postgres'>https://hub.docker.com/_/postgres</a>" />
         </div>
-        <div class="flex gap-2">
-            @if ($database->started_at)
-                <x-forms.input label="Username" id="database.postgres_username" placeholder="If empty: postgres"
-                    readonly helper="You can only modify it before the initial start." />
-                <x-forms.input label="Password" id="database.postgres_password" type="password" required readonly
-                    helper="You can only modify it before the initial start." />
-                <x-forms.input label="Database" id="database.postgres_db"
+
+        @if ($database->started_at)
+            <div class="flex gap-2">
+                <x-forms.input label="Initial Username" id="database.postgres_username" placeholder="If empty: postgres"
+                    readonly helper="You can only change this in the database." />
+                <x-forms.input label="Initial Password" id="database.postgres_password" type="password" required readonly
+                    helper="You can only change this in the database." />
+                <x-forms.input label="Initial Database" id="database.postgres_db"
                     placeholder="If empty, it will be the same as Username." readonly
-                    helper="You can only modify it before the initial start." />
-            @else
-                <x-forms.input label="Username" id="database.postgres_user" placeholder="If empty: postgres"
-                    helper="You can only modify it before the initial start." />
-                <x-forms.input label="Password" id="database.postgres_password" type="password" required
-                    helper="You can only modify it before the initial start." />
+                    helper="You can only change this in the database." />
+            </div>
+        @else
+            <div class="pt-8 text-warning">Please verify these values. You can only modify them before the initial start. After that, you need to modify it in the database.
+            </div>
+            <div class="flex gap-2 pb-8">
+                <x-forms.input label="Username" id="database.postgres_user" placeholder="If empty: postgres" />
+                <x-forms.input label="Password" id="database.postgres_password" type="password" required />
                 <x-forms.input label="Database" id="database.postgres_db"
-                    placeholder="If empty, it will be the same as Username."
-                    helper="You can only modify it before the initial start." />
-            @endif
-        </div>
+                    placeholder="If empty, it will be the same as Username." />
+            </div>
+        @endif
         <div class="flex gap-2">
-            <x-forms.input label="Initial Arguments" id="database.postgres_initdb_args"
+            <x-forms.input label="Initial Database Arguments" id="database.postgres_initdb_args"
                 placeholder="If empty, use default. See in docker docs." />
             <x-forms.input label="Host Auth Method" id="database.postgres_host_auth_method"
                 placeholder="If empty, use default. See in docker docs." />
@@ -55,11 +57,12 @@
             <h3 class="py-2">Network</h3>
             <div class="flex items-end gap-2">
                 <x-forms.input placeholder="3000:5432" id="database.ports_mappings" label="Ports Mappings"
-                helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold text-warning'>Example</span>3000:5432,3002:5433" />
-                <x-forms.input placeholder="5432" disabled="{{$database->is_public}}" id="database.public_port" label="Public Port" />
-                    <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
-                </div>
-                <x-forms.input label="Postgres URL" readonly wire:model="db_url" />
+                    helper="A comma separated list of ports you would like to map to the host system.<br><span class='inline-block font-bold text-warning'>Example</span>3000:5432,3002:5433" />
+                <x-forms.input placeholder="5432" disabled="{{ $database->is_public }}" id="database.public_port"
+                    label="Public Port" />
+                <x-forms.checkbox instantSave id="database.is_public" label="Accessible over the internet" />
+            </div>
+            <x-forms.input label="Postgres URL" readonly wire:model="db_url" />
         </div>
     </form>
     <div class="pb-16">
diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php
index dfa0d7d95..c5f16c727 100644
--- a/resources/views/livewire/project/service/index.blade.php
+++ b/resources/views/livewire/project/service/index.blade.php
@@ -106,8 +106,7 @@
                     <h2>Storages</h2>
                 </div>
                 <div class="pb-4">Persistent storage to preserve data between deployments.</div>
-                <span class="text-warning">Please modify storage layout in your <a class="underline"
-                        href="{{ Str::of(url()->current())->beforeLast('/') }}">Docker Compose</a> file.</span>
+                <span class="text-warning">Please modify storage layout in your Docker Compose file.</span>
                 @foreach ($applications as $application)
                     <livewire:project.service.storage wire:key="application-{{ $application->id }}"
                         :resource="$application" />
diff --git a/resources/views/livewire/project/service/show.blade.php b/resources/views/livewire/project/service/show.blade.php
index 07f206c80..0ac516660 100644
--- a/resources/views/livewire/project/service/show.blade.php
+++ b/resources/views/livewire/project/service/show.blade.php
@@ -28,8 +28,7 @@
                         <h2>Storages</h2>
                     </div>
                     <div class="pb-4">Persistent storage to preserve data between deployments.</div>
-                    <span class="text-warning">Please modify storage layout in your <a class="underline"
-                            href="{{ Str::of(url()->current())->beforeLast('/') }}">Docker Compose</a> file.</span>
+                    <span class="text-warning">Please modify storage layout in your Docker Compose file.</span>
                     <livewire:project.service.storage wire:key="application-{{ $serviceApplication->id }}"
                         :resource="$serviceApplication" />
                 </div>
@@ -43,8 +42,7 @@
                         <h2>Storages</h2>
                     </div>
                     <div class="pb-4">Persistent storage to preserve data between deployments.</div>
-                    <span class="text-warning">Please modify storage layout in your <a class="underline"
-                            href="{{ Str::of(url()->current())->beforeLast('/') }}">Docker Compose</a> file.</span>
+                    <span class="text-warning">Please modify storage layout in your Docker Compose file.</span>
                     <livewire:project.service.storage wire:key="application-{{ $serviceDatabase->id }}"
                         :resource="$serviceDatabase" />
                 </div>