diff --git a/lib/decentralised_book_index_web/components/core_components.ex b/lib/decentralised_book_index_web/components/core_components.ex
index 7af1941..0ab1b40 100644
--- a/lib/decentralised_book_index_web/components/core_components.ex
+++ b/lib/decentralised_book_index_web/components/core_components.ex
@@ -66,7 +66,7 @@ defmodule DecentralisedBookIndexWeb.CoreComponents do
               phx-window-keydown={JS.exec("data-cancel", to: "##{@id}")}
               phx-key="escape"
               phx-click-away={JS.exec("data-cancel", to: "##{@id}")}
-              class="shadow-zinc-700/10 ring-zinc-700/10 relative hidden rounded-2xl bg-white p-14 shadow-lg ring-1 transition"
+              class="shadow-zinc-700/10 ring-zinc-700/10 relative hidden rounded-2xl bg-white p-14 shadow-lg ring-1 transition dark:bg-gray-900"
             >
               <div class="absolute top-6 right-5">
                 <button
@@ -75,7 +75,7 @@ defmodule DecentralisedBookIndexWeb.CoreComponents do
                   class="-m-3 flex-none p-3 opacity-20 hover:opacity-40"
                   aria-label={gettext("close")}
                 >
-                  <.icon name="hero-x-mark-solid" class="h-5 w-5" />
+                  <.icon name="hero-x-mark-solid" class="h-5 w-5 dark:text-white" />
                 </button>
               </div>
               <div id={"#{@id}-content"}>
diff --git a/lib/decentralised_book_index_web/live/dbi_server_live/form_component.ex b/lib/decentralised_book_index_web/live/dbi_server_live/form_component.ex
index 3d194eb..62465f6 100644
--- a/lib/decentralised_book_index_web/live/dbi_server_live/form_component.ex
+++ b/lib/decentralised_book_index_web/live/dbi_server_live/form_component.ex
@@ -7,7 +7,6 @@ defmodule DecentralisedBookIndexWeb.DbiServerLive.FormComponent do
     <div>
       <.header>
         {@title}
-        <:subtitle>Use this form to manage servers records in your database.</:subtitle>
       </.header>
 
       <.simple_form
@@ -24,7 +23,9 @@ defmodule DecentralisedBookIndexWeb.DbiServerLive.FormComponent do
         />
 
         <:actions>
-          <.button phx-disable-with="Saving...">Save server</.button>
+          <.save_button phx-disable-with="Saving...">
+            Save
+          </.save_button>
         </:actions>
       </.simple_form>
     </div>
diff --git a/lib/decentralised_book_index_web/live/publisher_live/form_component.ex b/lib/decentralised_book_index_web/live/publisher_live/form_component.ex
index a283cce..00d1890 100644
--- a/lib/decentralised_book_index_web/live/publisher_live/form_component.ex
+++ b/lib/decentralised_book_index_web/live/publisher_live/form_component.ex
@@ -7,7 +7,6 @@ defmodule DecentralisedBookIndexWeb.PublisherLive.FormComponent do
     <div>
       <.header>
         {@title}
-        <:subtitle>Use this form to manage publisher records in your database.</:subtitle>
       </.header>
 
       <.simple_form
@@ -24,7 +23,9 @@ defmodule DecentralisedBookIndexWeb.PublisherLive.FormComponent do
         <% end %>
 
         <:actions>
-          <.button phx-disable-with="Saving...">Save Publisher</.button>
+          <.save_button phx-disable-with="Saving...">
+            Save
+          </.save_button>
         </:actions>
       </.simple_form>
     </div>