diff --git a/lib/decentralised_book_index_web/live/dbi_server_live/show.ex b/lib/decentralised_book_index_web/live/dbi_server_live/show.ex
index 39c161f..403b64c 100644
--- a/lib/decentralised_book_index_web/live/dbi_server_live/show.ex
+++ b/lib/decentralised_book_index_web/live/dbi_server_live/show.ex
@@ -16,13 +16,17 @@ defmodule DecentralisedBookIndexWeb.DbiServerLive.Show do
       </:actions>
     </.header>
 
-    <.list>
-      <:item title="Id">{@dbi_server.id}</:item>
 
-      <:item title="Name">{@dbi_server.name}</:item>
-
-      <:item title="Url">{@dbi_server.url}</:item>
-    </.list>
+    <div>
+      <dl>
+        <dt class="mb-2 font-semibold leading-none text-gray-900 dark:text-white">Url</dt>
+        <dd class="mb-4 font-light text-gray-500 sm:mb-5 dark:text-gray-400">{@dbi_server.url}</dd>
+      </dl>
+      <dl>
+        <dt class="mb-2 font-semibold leading-none text-gray-900 dark:text-white">Sync on?</dt>
+        <dd class="mb-4 font-light text-gray-500 sm:mb-5 dark:text-gray-400">{@dbi_server.sync_on?}</dd>
+      </dl>
+    </div>
 
     <.back navigate={~p"/servers"}>Back to servers</.back>
     """
@@ -40,7 +44,7 @@ defmodule DecentralisedBookIndexWeb.DbiServerLive.Show do
      |> assign(:page_title, page_title(socket.assigns.live_action))
      |> assign(
        :dbi_server,
-       Ash.get!(DecentralisedBookIndex.Metadata.DBIServer, id, actor: socket.assigns.current_user)
+       Ash.get!(DecentralisedBookIndex.Metadata.DBIServer, id, load: [:dbi_server], actor: socket.assigns.current_user)
      )}
   end
 
diff --git a/lib/decentralised_book_index_web/live/user_live/show.ex b/lib/decentralised_book_index_web/live/user_live/show.ex
index f32686a..410c9a2 100644
--- a/lib/decentralised_book_index_web/live/user_live/show.ex
+++ b/lib/decentralised_book_index_web/live/user_live/show.ex
@@ -16,10 +16,16 @@ defmodule DecentralisedBookIndexWeb.UserLive.Show do
       </:actions>
     </.header>
 
-    <.list>
-      <:item title="Email">{@user.email}</:item>
-      <:item title="Role">{@user.role}</:item>
-    </.list>
+    <div>
+      <dl>
+        <dt class="mb-2 font-semibold leading-none text-gray-900 dark:text-white">Email</dt>
+        <dd class="mb-4 font-light text-gray-500 sm:mb-5 dark:text-gray-400">{@user.email}</dd>
+      </dl>
+      <dl>
+        <dt class="mb-2 font-semibold leading-none text-gray-900 dark:text-white">Role</dt>
+        <dd class="mb-4 font-light text-gray-500 sm:mb-5 dark:text-gray-400">{@user.role}</dd>
+      </dl>
+    </div>
 
     <.back navigate={~p"/users"}>Back to users</.back>
     """