diff --git a/elixir/apps/web/lib/web/components/table_components.ex b/elixir/apps/web/lib/web/components/table_components.ex
index 6683ce40d..627ebc0b7 100644
--- a/elixir/apps/web/lib/web/components/table_components.ex
+++ b/elixir/apps/web/lib/web/components/table_components.ex
@@ -289,7 +289,7 @@ defmodule Web.TableComponents do
         scope="row"
         class={[
           "text-right px-6 py-4 font-medium text-neutral-900 whitespace-nowrap",
-          "bg-neutral-50",
+          "bg-neutral-50 w-1/5",
           @label_class
         ]}
       >
diff --git a/elixir/apps/web/lib/web/live/actors/edit.ex b/elixir/apps/web/lib/web/live/actors/edit.ex
index 322ee97cf..84ddce68d 100644
--- a/elixir/apps/web/lib/web/live/actors/edit.ex
+++ b/elixir/apps/web/lib/web/live/actors/edit.ex
@@ -17,7 +17,7 @@ defmodule Web.Actors.Edit do
           actor: actor,
           groups: groups,
           form: to_form(changeset),
-          page_title: "Edit actor #{actor.name}"
+          page_title: "Edit #{actor.name}"
         )
 
       {:ok, socket}
diff --git a/elixir/apps/web/lib/web/live/actors/new.ex b/elixir/apps/web/lib/web/live/actors/new.ex
index 9857bfacb..ab58b7464 100644
--- a/elixir/apps/web/lib/web/live/actors/new.ex
+++ b/elixir/apps/web/lib/web/live/actors/new.ex
@@ -4,8 +4,10 @@ defmodule Web.Actors.New do
 
   def mount(_params, _session, socket) do
     socket =
-      socket
-      |> assign(:form, %{})
+      assign(socket,
+        form: %{},
+        page_title: "New Actor"
+      )
 
     {:ok, socket}
   end
diff --git a/elixir/apps/web/lib/web/live/actors/service_accounts/new.ex b/elixir/apps/web/lib/web/live/actors/service_accounts/new.ex
index fbb458bae..f096acff2 100644
--- a/elixir/apps/web/lib/web/live/actors/service_accounts/new.ex
+++ b/elixir/apps/web/lib/web/live/actors/service_accounts/new.ex
@@ -12,7 +12,8 @@ defmodule Web.Actors.ServiceAccounts.New do
       socket =
         assign(socket,
           groups: groups,
-          form: to_form(changeset)
+          form: to_form(changeset),
+          page_title: "New Service Account"
         )
 
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/actors/service_accounts/new_identity.ex b/elixir/apps/web/lib/web/live/actors/service_accounts/new_identity.ex
index 525900158..503b039ab 100644
--- a/elixir/apps/web/lib/web/live/actors/service_accounts/new_identity.ex
+++ b/elixir/apps/web/lib/web/live/actors/service_accounts/new_identity.ex
@@ -12,7 +12,8 @@ defmodule Web.Actors.ServiceAccounts.NewIdentity do
         assign(socket,
           actor: actor,
           encoded_token: nil,
-          form: to_form(changeset)
+          form: to_form(changeset),
+          page_title: "New Service Account Token"
         )
 
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/actors/show.ex b/elixir/apps/web/lib/web/live/actors/show.ex
index 7a0d0e791..75917a98f 100644
--- a/elixir/apps/web/lib/web/live/actors/show.ex
+++ b/elixir/apps/web/lib/web/live/actors/show.ex
@@ -29,7 +29,7 @@ defmodule Web.Actors.Show do
          actor: actor,
          flows: flows,
          tokens: tokens,
-         page_title: actor.name,
+         page_title: "Actor #{actor.name}",
          flow_activities_enabled?: Domain.Config.flow_activities_enabled?()
        )}
     else
@@ -59,7 +59,7 @@ defmodule Web.Actors.Show do
       </:action>
       <:content flash={@flash}>
         <.vertical_table id="actor">
-          <.vertical_table_row label_class="w-1/5">
+          <.vertical_table_row>
             <:label>Name</:label>
             <:value><%= @actor.name %>
               <.actor_status actor={@actor} /></:value>
diff --git a/elixir/apps/web/lib/web/live/actors/users/new.ex b/elixir/apps/web/lib/web/live/actors/users/new.ex
index f7a9be6f7..d14142209 100644
--- a/elixir/apps/web/lib/web/live/actors/users/new.ex
+++ b/elixir/apps/web/lib/web/live/actors/users/new.ex
@@ -10,7 +10,8 @@ defmodule Web.Actors.Users.New do
       socket =
         assign(socket,
           groups: groups,
-          form: to_form(changeset)
+          form: to_form(changeset),
+          page_title: "New User"
         )
 
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/actors/users/new_identity.ex b/elixir/apps/web/lib/web/live/actors/users/new_identity.ex
index f1a278313..71aac662a 100644
--- a/elixir/apps/web/lib/web/live/actors/users/new_identity.ex
+++ b/elixir/apps/web/lib/web/live/actors/users/new_identity.ex
@@ -24,7 +24,8 @@ defmodule Web.Actors.Users.NewIdentity do
           actor: actor,
           providers: providers,
           provider: provider,
-          form: to_form(changeset)
+          form: to_form(changeset),
+          page_title: "New User Identity"
         )
 
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/clients/edit.ex b/elixir/apps/web/lib/web/live/clients/edit.ex
index 336b81d9c..adc3fd42c 100644
--- a/elixir/apps/web/lib/web/live/clients/edit.ex
+++ b/elixir/apps/web/lib/web/live/clients/edit.ex
@@ -6,7 +6,14 @@ defmodule Web.Clients.Edit do
     with {:ok, client} <- Clients.fetch_client_by_id(id, socket.assigns.subject),
          nil <- client.deleted_at do
       changeset = Clients.change_client(client)
-      socket = assign(socket, client: client, form: to_form(changeset))
+
+      socket =
+        assign(socket,
+          client: client,
+          form: to_form(changeset),
+          page_title: "Edit Client #{client.name}"
+        )
+
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
     else
       _other -> raise Web.LiveErrors.NotFoundError
@@ -27,7 +34,7 @@ defmodule Web.Clients.Edit do
 
     <.section>
       <:title>
-        Editing client: <code>Engineering</code>
+        Editing client: <code><%= @client.name %></code>
       </:title>
       <:content>
         <div class="max-w-2xl px-4 py-8 mx-auto lg:py-16">
diff --git a/elixir/apps/web/lib/web/live/clients/index.ex b/elixir/apps/web/lib/web/live/clients/index.ex
index 3ee7f08ac..2048fe69c 100644
--- a/elixir/apps/web/lib/web/live/clients/index.ex
+++ b/elixir/apps/web/lib/web/live/clients/index.ex
@@ -5,7 +5,14 @@ defmodule Web.Clients.Index do
   def mount(_params, _session, socket) do
     with {:ok, clients} <- Clients.list_clients(socket.assigns.subject, preload: :actor) do
       :ok = Clients.subscribe_for_clients_presence_in_account(socket.assigns.subject.account)
-      {:ok, assign(socket, clients: clients)}
+
+      socket =
+        assign(socket,
+          clients: clients,
+          page_title: "Clients"
+        )
+
+      {:ok, socket}
     else
       {:error, _reason} -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/clients/show.ex b/elixir/apps/web/lib/web/live/clients/show.ex
index 842f7cc1d..da91e4501 100644
--- a/elixir/apps/web/lib/web/live/clients/show.ex
+++ b/elixir/apps/web/lib/web/live/clients/show.ex
@@ -16,7 +16,8 @@ defmodule Web.Clients.Show do
           socket,
           client: client,
           flows: flows,
-          flow_activities_enabled?: Config.flow_activities_enabled?()
+          flow_activities_enabled?: Config.flow_activities_enabled?(),
+          page_title: "Client #{client.name}"
         )
 
       {:ok, socket}
diff --git a/elixir/apps/web/lib/web/live/flows/show.ex b/elixir/apps/web/lib/web/live/flows/show.ex
index d5e0a45aa..2821e708f 100644
--- a/elixir/apps/web/lib/web/live/flows/show.ex
+++ b/elixir/apps/web/lib/web/live/flows/show.ex
@@ -13,7 +13,8 @@ defmodule Web.Flows.Show do
                resource: []
              ]
            ) do
-      {:ok, assign(socket, flow: flow)}
+      socket = assign(socket, flow: flow, page_title: "Flow #{flow.id}")
+      {:ok, socket}
     else
       {:error, _reason} -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/gateways/show.ex b/elixir/apps/web/lib/web/live/gateways/show.ex
index 1c18e805f..362161b78 100644
--- a/elixir/apps/web/lib/web/live/gateways/show.ex
+++ b/elixir/apps/web/lib/web/live/gateways/show.ex
@@ -10,7 +10,8 @@ defmodule Web.Gateways.Show do
       socket =
         assign(
           socket,
-          gateway: gateway
+          gateway: gateway,
+          page_title: "Gateway #{gateway.name}"
         )
 
       {:ok, socket}
diff --git a/elixir/apps/web/lib/web/live/groups/edit.ex b/elixir/apps/web/lib/web/live/groups/edit.ex
index d0d3f4c32..9b04a3e6d 100644
--- a/elixir/apps/web/lib/web/live/groups/edit.ex
+++ b/elixir/apps/web/lib/web/live/groups/edit.ex
@@ -8,7 +8,10 @@ defmodule Web.Groups.Edit do
          nil <- group.deleted_at,
          false <- Actors.group_synced?(group) do
       changeset = Actors.change_group(group)
-      socket = assign(socket, group: group, form: to_form(changeset))
+
+      socket =
+        assign(socket, group: group, form: to_form(changeset), page_title: "Edit #{group.name}")
+
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
     else
       _other -> raise Web.LiveErrors.NotFoundError
diff --git a/elixir/apps/web/lib/web/live/groups/edit_actors.ex b/elixir/apps/web/lib/web/live/groups/edit_actors.ex
index 93f771fc3..8cedc3d9c 100644
--- a/elixir/apps/web/lib/web/live/groups/edit_actors.ex
+++ b/elixir/apps/web/lib/web/live/groups/edit_actors.ex
@@ -18,7 +18,8 @@ defmodule Web.Groups.EditActors do
          current_member_ids: current_member_ids,
          actors: actors,
          added_ids: [],
-         removed_ids: []
+         removed_ids: [],
+         page_title: "Edit Actors in #{group.name}"
        )}
     else
       _other -> raise Web.LiveErrors.NotFoundError
diff --git a/elixir/apps/web/lib/web/live/groups/new.ex b/elixir/apps/web/lib/web/live/groups/new.ex
index c5ab6e630..11f52fce4 100644
--- a/elixir/apps/web/lib/web/live/groups/new.ex
+++ b/elixir/apps/web/lib/web/live/groups/new.ex
@@ -5,7 +5,7 @@ defmodule Web.Groups.New do
   def mount(_params, _session, socket) do
     changeset = Actors.new_group()
 
-    {:ok, assign(socket, form: to_form(changeset)),
+    {:ok, assign(socket, form: to_form(changeset), page_title: "New Group"),
      temporary_assigns: [form: %Phoenix.HTML.Form{}]}
   end
 
diff --git a/elixir/apps/web/lib/web/live/groups/show.ex b/elixir/apps/web/lib/web/live/groups/show.ex
index b52ad2bbc..90a7d7928 100644
--- a/elixir/apps/web/lib/web/live/groups/show.ex
+++ b/elixir/apps/web/lib/web/live/groups/show.ex
@@ -13,7 +13,8 @@ defmodule Web.Groups.Show do
                created_by_identity: [:actor]
              ]
            ) do
-      {:ok, assign(socket, group: group)}
+      socket = assign(socket, group: group, page_title: "Group #{group.name}")
+      {:ok, socket}
     else
       {:error, _reason} -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/policies/edit.ex b/elixir/apps/web/lib/web/live/policies/edit.ex
index 6bc164534..d141648bb 100644
--- a/elixir/apps/web/lib/web/live/policies/edit.ex
+++ b/elixir/apps/web/lib/web/live/policies/edit.ex
@@ -10,7 +10,14 @@ defmodule Web.Policies.Edit do
            ),
          nil <- policy.deleted_at do
       form = to_form(Policies.Policy.Changeset.update(policy, %{}))
-      socket = assign(socket, policy: policy, page_title: "Edit Policy", form: form)
+
+      socket =
+        assign(socket,
+          policy: policy,
+          form: form,
+          page_title: "Edit #{policy.id}"
+        )
+
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
     else
       _other -> raise Web.LiveErrors.NotFoundError
@@ -25,7 +32,7 @@ defmodule Web.Policies.Edit do
         <.policy_name policy={@policy} />
       </.breadcrumb>
       <.breadcrumb path={~p"/#{@account}/policies/#{@policy}/edit"}>
-        <%= @page_title %>
+        Edit
       </.breadcrumb>
     </.breadcrumbs>
 
diff --git a/elixir/apps/web/lib/web/live/policies/new.ex b/elixir/apps/web/lib/web/live/policies/new.ex
index e913ab30b..1d031a122 100644
--- a/elixir/apps/web/lib/web/live/policies/new.ex
+++ b/elixir/apps/web/lib/web/live/policies/new.ex
@@ -14,7 +14,7 @@ defmodule Web.Policies.New do
           actor_groups: actor_groups,
           params: Map.take(params, ["site_id"]),
           resource_id: params["resource_id"],
-          page_title: "Add Policy",
+          page_title: "New Policy",
           form: form
         )
 
@@ -28,11 +28,11 @@ defmodule Web.Policies.New do
     ~H"""
     <.breadcrumbs account={@account}>
       <.breadcrumb path={~p"/#{@account}/policies"}>Policies</.breadcrumb>
-      <.breadcrumb path={~p"/#{@account}/policies/new"}><%= @page_title %></.breadcrumb>
+      <.breadcrumb path={~p"/#{@account}/policies/new"}>Add Policy</.breadcrumb>
     </.breadcrumbs>
     <.section>
       <:title>
-        <%= @page_title %>
+        Add Policy
       </:title>
       <:content>
         <div class="max-w-2xl px-4 py-8 mx-auto lg:py-16">
diff --git a/elixir/apps/web/lib/web/live/policies/show.ex b/elixir/apps/web/lib/web/live/policies/show.ex
index ebb34885d..17aae2ea8 100644
--- a/elixir/apps/web/lib/web/live/policies/show.ex
+++ b/elixir/apps/web/lib/web/live/policies/show.ex
@@ -16,7 +16,7 @@ defmodule Web.Policies.Show do
         assign(socket,
           policy: policy,
           flows: flows,
-          page_title: "Policy",
+          page_title: "Policy #{policy.id}",
           flow_activities_enabled?: Config.flow_activities_enabled?()
         )
 
@@ -37,7 +37,7 @@ defmodule Web.Policies.Show do
 
     <.section>
       <:title>
-        <%= @page_title %>: <code><%= @policy.id %></code>
+        Policy: <code><%= @policy.id %></code>
         <span :if={not is_nil(@policy.disabled_at)} class="text-primary-600">(disabled)</span>
         <span :if={not is_nil(@policy.deleted_at)} class="text-red-600">(deleted)</span>
       </:title>
diff --git a/elixir/apps/web/lib/web/live/relay_groups/edit.ex b/elixir/apps/web/lib/web/live/relay_groups/edit.ex
index dc4185bcf..ea571a3d0 100644
--- a/elixir/apps/web/lib/web/live/relay_groups/edit.ex
+++ b/elixir/apps/web/lib/web/live/relay_groups/edit.ex
@@ -7,7 +7,10 @@ defmodule Web.RelayGroups.Edit do
          {:ok, group} <- Relays.fetch_group_by_id(id, socket.assigns.subject),
          nil <- group.deleted_at do
       changeset = Relays.change_group(group)
-      socket = assign(socket, group: group, form: to_form(changeset))
+
+      socket =
+        assign(socket, group: group, form: to_form(changeset), page_title: "Edit #{group.name}")
+
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
     else
       _other -> raise Web.LiveErrors.NotFoundError
diff --git a/elixir/apps/web/lib/web/live/relay_groups/index.ex b/elixir/apps/web/lib/web/live/relay_groups/index.ex
index 1f01388e3..cbe2b74cd 100644
--- a/elixir/apps/web/lib/web/live/relay_groups/index.ex
+++ b/elixir/apps/web/lib/web/live/relay_groups/index.ex
@@ -8,7 +8,14 @@ defmodule Web.RelayGroups.Index do
     with true <- Domain.Config.self_hosted_relays_enabled?(),
          {:ok, groups} <- Relays.list_groups(subject, preload: [:relays]) do
       :ok = Relays.subscribe_for_relays_presence_in_account(socket.assigns.account)
-      {:ok, assign(socket, groups: groups)}
+
+      socket =
+        assign(socket,
+          groups: groups,
+          page_title: "Relays"
+        )
+
+      {:ok, socket}
     else
       _other -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/relay_groups/new.ex b/elixir/apps/web/lib/web/live/relay_groups/new.ex
index 8c8886275..1c4486908 100644
--- a/elixir/apps/web/lib/web/live/relay_groups/new.ex
+++ b/elixir/apps/web/lib/web/live/relay_groups/new.ex
@@ -6,7 +6,7 @@ defmodule Web.RelayGroups.New do
     with true <- Domain.Config.self_hosted_relays_enabled?() do
       changeset = Relays.new_group()
 
-      {:ok, assign(socket, form: to_form(changeset)),
+      {:ok, assign(socket, form: to_form(changeset, page_title: "New Relay Group")),
        temporary_assigns: [form: %Phoenix.HTML.Form{}]}
     else
       _other -> raise Web.LiveErrors.NotFoundError
@@ -21,7 +21,7 @@ defmodule Web.RelayGroups.New do
     </.breadcrumbs>
     <.section>
       <:title>
-        Add a new Relay Instance Group
+        Add Relay Instance Group
       </:title>
       <:content>
         <div class="py-8 px-4 mx-auto max-w-2xl lg:py-16">
diff --git a/elixir/apps/web/lib/web/live/relay_groups/new_token.ex b/elixir/apps/web/lib/web/live/relay_groups/new_token.ex
index 342c20918..c3e57cb47 100644
--- a/elixir/apps/web/lib/web/live/relay_groups/new_token.ex
+++ b/elixir/apps/web/lib/web/live/relay_groups/new_token.ex
@@ -23,7 +23,8 @@ defmodule Web.RelayGroups.NewToken do
          group: group,
          env: env,
          connected?: false,
-         selected_tab: "systemd-instructions"
+         selected_tab: "systemd-instructions",
+         page_title: "New Relay"
        )}
     else
       _other -> raise Web.LiveErrors.NotFoundError
@@ -42,7 +43,7 @@ defmodule Web.RelayGroups.NewToken do
 
     <.section>
       <:title>
-        Deploy a new Relay
+        Deploy Relay
       </:title>
       <:content>
         <div class="py-8 px-4 mx-auto max-w-2xl lg:py-16">
diff --git a/elixir/apps/web/lib/web/live/relay_groups/show.ex b/elixir/apps/web/lib/web/live/relay_groups/show.ex
index 31826b8ba..c722dfbfc 100644
--- a/elixir/apps/web/lib/web/live/relay_groups/show.ex
+++ b/elixir/apps/web/lib/web/live/relay_groups/show.ex
@@ -12,7 +12,8 @@ defmodule Web.RelayGroups.Show do
              ]
            ) do
       :ok = Relays.subscribe_for_relays_presence_in_group(group)
-      {:ok, assign(socket, group: group)}
+      socket = assign(socket, group: group, page_title: "Relay Group #{group.name}")
+      {:ok, socket}
     else
       _other -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/relays/show.ex b/elixir/apps/web/lib/web/live/relays/show.ex
index 0cafd2a23..f8fa7cf54 100644
--- a/elixir/apps/web/lib/web/live/relays/show.ex
+++ b/elixir/apps/web/lib/web/live/relays/show.ex
@@ -7,7 +7,8 @@ defmodule Web.Relays.Show do
          {:ok, relay} <-
            Relays.fetch_relay_by_id(id, socket.assigns.subject, preload: :group) do
       :ok = Relays.subscribe_for_relays_presence_in_group(relay.group)
-      {:ok, assign(socket, relay: relay)}
+      socket = assign(socket, relay: relay, page_title: "Relay #{relay.name}")
+      {:ok, socket}
     else
       _other -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/resources/edit.ex b/elixir/apps/web/lib/web/live/resources/edit.ex
index 87e33b842..d7fc165d5 100644
--- a/elixir/apps/web/lib/web/live/resources/edit.ex
+++ b/elixir/apps/web/lib/web/live/resources/edit.ex
@@ -17,7 +17,8 @@ defmodule Web.Resources.Edit do
           gateway_groups: gateway_groups,
           form: form,
           params: Map.take(params, ["site_id"]),
-          traffic_filters_enabled?: Config.traffic_filters_enabled?()
+          traffic_filters_enabled?: Config.traffic_filters_enabled?(),
+          page_title: "Edit #{resource.name}"
         )
 
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/resources/index.ex b/elixir/apps/web/lib/web/live/resources/index.ex
index c37403f88..33f0e139c 100644
--- a/elixir/apps/web/lib/web/live/resources/index.ex
+++ b/elixir/apps/web/lib/web/live/resources/index.ex
@@ -9,11 +9,14 @@ defmodule Web.Resources.Index do
            ),
          {:ok, resource_actor_groups_peek} <-
            Resources.peek_resource_actor_groups(resources, 3, socket.assigns.subject) do
-      {:ok,
-       assign(socket,
-         resources: resources,
-         resource_actor_groups_peek: resource_actor_groups_peek
-       )}
+      socket =
+        assign(socket,
+          resources: resources,
+          resource_actor_groups_peek: resource_actor_groups_peek,
+          page_title: "Resources"
+        )
+
+      {:ok, socket}
     else
       {:error, _reason} -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/resources/new.ex b/elixir/apps/web/lib/web/live/resources/new.ex
index 0f3700b8d..263c4e277 100644
--- a/elixir/apps/web/lib/web/live/resources/new.ex
+++ b/elixir/apps/web/lib/web/live/resources/new.ex
@@ -14,7 +14,8 @@ defmodule Web.Resources.New do
           name_changed?: false,
           form: to_form(changeset),
           params: Map.take(params, ["site_id"]),
-          traffic_filters_enabled?: Config.traffic_filters_enabled?()
+          traffic_filters_enabled?: Config.traffic_filters_enabled?(),
+          page_title: "New Resource"
         )
 
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/resources/show.ex b/elixir/apps/web/lib/web/live/resources/show.ex
index fcc9d5098..fb197403e 100644
--- a/elixir/apps/web/lib/web/live/resources/show.ex
+++ b/elixir/apps/web/lib/web/live/resources/show.ex
@@ -21,7 +21,8 @@ defmodule Web.Resources.Show do
           actor_groups_peek: Map.fetch!(actor_groups_peek, resource.id),
           flows: flows,
           params: Map.take(params, ["site_id"]),
-          traffic_filters_enabled?: Config.traffic_filters_enabled?()
+          traffic_filters_enabled?: Config.traffic_filters_enabled?(),
+          page_title: "Resource #{resource.name}"
         )
 
       {:ok, socket}
diff --git a/elixir/apps/web/lib/web/live/settings/account.ex b/elixir/apps/web/lib/web/live/settings/account.ex
index 644b37cef..41470c49a 100644
--- a/elixir/apps/web/lib/web/live/settings/account.ex
+++ b/elixir/apps/web/lib/web/live/settings/account.ex
@@ -1,6 +1,10 @@
 defmodule Web.Settings.Account do
   use Web, :live_view
 
+  def mount(_params, _session, socket) do
+    {:ok, assign(socket, page_title: "Account")}
+  end
+
   def render(assigns) do
     ~H"""
     <.breadcrumbs account={@account}>
diff --git a/elixir/apps/web/lib/web/live/settings/dns.ex b/elixir/apps/web/lib/web/live/settings/dns.ex
index a2720f363..059bd4923 100644
--- a/elixir/apps/web/lib/web/live/settings/dns.ex
+++ b/elixir/apps/web/lib/web/live/settings/dns.ex
@@ -11,7 +11,7 @@ defmodule Web.Settings.DNS do
       |> add_new_server()
       |> to_form()
 
-    socket = assign(socket, config: config, form: form)
+    socket = assign(socket, config: config, form: form, page_title: "DNS")
 
     {:ok, socket}
   end
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/edit.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/edit.ex
index bb5fd8533..57f5e6fbf 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/edit.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/edit.ex
@@ -10,7 +10,8 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.Edit do
       socket =
         assign(socket,
           provider: provider,
-          form: to_form(changeset)
+          form: to_form(changeset),
+          page_title: "Edit #{provider.name}"
         )
 
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/new.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/new.ex
index 48043fb3f..151b35d1b 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/new.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/new.ex
@@ -16,7 +16,8 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.New do
     socket =
       assign(socket,
         id: id,
-        form: to_form(changeset)
+        form: to_form(changeset),
+        page_title: "New Identity Provider"
       )
 
     {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
index 21ac6f25f..125109be3 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/google_workspace/show.ex
@@ -16,7 +16,8 @@ defmodule Web.Settings.IdentityProviders.GoogleWorkspace.Show do
        assign(socket,
          provider: provider,
          identities_count_by_provider_id: identities_count_by_provider_id,
-         groups_count_by_provider_id: groups_count_by_provider_id
+         groups_count_by_provider_id: groups_count_by_provider_id,
+         page_title: "Identity Provider #{provider.name}"
        )}
     else
       _ -> raise Web.LiveErrors.NotFoundError
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex
index 283459a7c..812cfb2e5 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/index.ex
@@ -16,7 +16,7 @@ defmodule Web.Settings.IdentityProviders.Index do
           identities_count_by_provider_id: identities_count_by_provider_id,
           groups_count_by_provider_id: groups_count_by_provider_id,
           providers: providers,
-          page_title: "Identity Providers Settings"
+          page_title: "Identity Providers"
         )
 
       {:ok, socket}
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/new.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/new.ex
index b0da49e7e..bddb80936 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/new.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/new.ex
@@ -4,7 +4,7 @@ defmodule Web.Settings.IdentityProviders.New do
 
   def mount(_params, _session, socket) do
     {:ok, adapters} = Auth.list_provider_adapters()
-    socket = assign(socket, form: %{}, adapters: adapters)
+    socket = assign(socket, form: %{}, adapters: adapters, page_title: "New Identity Provider")
     {:ok, socket}
   end
 
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/edit.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/edit.ex
index 4bc5e55b1..8ebf4a150 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/edit.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/edit.ex
@@ -10,7 +10,8 @@ defmodule Web.Settings.IdentityProviders.OpenIDConnect.Edit do
       socket =
         assign(socket,
           provider: provider,
-          form: to_form(changeset)
+          form: to_form(changeset),
+          page_title: "Edit #{provider.name}"
         )
 
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/new.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/new.ex
index 41d65968c..ebd9c4adc 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/new.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/new.ex
@@ -16,7 +16,8 @@ defmodule Web.Settings.IdentityProviders.OpenIDConnect.New do
     socket =
       assign(socket,
         id: id,
-        form: to_form(changeset)
+        form: to_form(changeset),
+        page_title: "New Identity Provider"
       )
 
     {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex
index b00510efb..8e85580ef 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/openid_connect/show.ex
@@ -8,7 +8,13 @@ defmodule Web.Settings.IdentityProviders.OpenIDConnect.Show do
            Auth.fetch_provider_by_id(provider_id, socket.assigns.subject,
              preload: [created_by_identity: [:actor]]
            ) do
-      {:ok, assign(socket, provider: provider)}
+      socket =
+        assign(socket,
+          provider: provider,
+          page_title: "Identity Provider #{provider.name}"
+        )
+
+      {:ok, socket}
     else
       _ -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex b/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex
index ed4ff1e6a..bee1ec6ed 100644
--- a/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex
+++ b/elixir/apps/web/lib/web/live/settings/identity_providers/system/show.ex
@@ -8,7 +8,10 @@ defmodule Web.Settings.IdentityProviders.System.Show do
            Auth.fetch_provider_by_id(provider_id, socket.assigns.subject,
              preload: [created_by_identity: [:actor]]
            ) do
-      {:ok, assign(socket, provider: provider)}
+      socket =
+        assign(socket, provider: provider, page_title: "Identity Provider #{provider.name}")
+
+      {:ok, socket}
     else
       _ -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/sign_in.ex b/elixir/apps/web/lib/web/live/sign_in.ex
index e5f444c66..dbe0b7b1c 100644
--- a/elixir/apps/web/lib/web/live/sign_in.ex
+++ b/elixir/apps/web/lib/web/live/sign_in.ex
@@ -19,7 +19,7 @@ defmodule Web.SignIn do
           params: params,
           account: account,
           providers_by_adapter: providers_by_adapter,
-          page_title: "Sign in"
+          page_title: "Sign In"
         )
 
       {:ok, socket}
diff --git a/elixir/apps/web/lib/web/live/sign_in/email.ex b/elixir/apps/web/lib/web/live/sign_in/email.ex
index b1b12d9d3..065b2b6f8 100644
--- a/elixir/apps/web/lib/web/live/sign_in/email.ex
+++ b/elixir/apps/web/lib/web/live/sign_in/email.ex
@@ -21,7 +21,8 @@ defmodule Web.SignIn.Email do
         account_id_or_slug: account_id_or_slug,
         provider_id: provider_id,
         resent: params["resent"],
-        params: params
+        params: params,
+        page_title: "Sign In"
       )
 
     {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/sign_up.ex b/elixir/apps/web/lib/web/live/sign_up.ex
index 3830d59b4..43a5de23f 100644
--- a/elixir/apps/web/lib/web/live/sign_up.ex
+++ b/elixir/apps/web/lib/web/live/sign_up.ex
@@ -53,7 +53,8 @@ defmodule Web.SignUp do
         real_ip: real_ip,
         sign_up_enabled?: Config.sign_up_enabled?(),
         account_name_changed?: false,
-        actor_name_changed?: false
+        actor_name_changed?: false,
+        page_title: "Sign Up"
       )
 
     {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
diff --git a/elixir/apps/web/lib/web/live/sites/edit.ex b/elixir/apps/web/lib/web/live/sites/edit.ex
index f542ea8cd..e437346e6 100644
--- a/elixir/apps/web/lib/web/live/sites/edit.ex
+++ b/elixir/apps/web/lib/web/live/sites/edit.ex
@@ -7,7 +7,10 @@ defmodule Web.Sites.Edit do
     with {:ok, group} <- Gateways.fetch_group_by_id(id, socket.assigns.subject),
          nil <- group.deleted_at do
       changeset = Gateways.change_group(group)
-      socket = assign(socket, group: group, form: to_form(changeset))
+
+      socket =
+        assign(socket, group: group, form: to_form(changeset), page_title: "Edit #{group.name}")
+
       {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
     else
       _other -> raise Web.LiveErrors.NotFoundError
diff --git a/elixir/apps/web/lib/web/live/sites/gateways/index.ex b/elixir/apps/web/lib/web/live/sites/gateways/index.ex
index 7fd63453f..7a2e880d8 100644
--- a/elixir/apps/web/lib/web/live/sites/gateways/index.ex
+++ b/elixir/apps/web/lib/web/live/sites/gateways/index.ex
@@ -14,7 +14,8 @@ defmodule Web.Sites.Gateways.Index do
            ) do
       gateways = Enum.sort_by(gateways, & &1.online?, :desc)
       :ok = Gateways.subscribe_for_gateways_presence_in_group(group)
-      {:ok, assign(socket, group: group, gateways: gateways)}
+      socket = assign(socket, group: group, gateways: gateways, page_title: "Site Gateways")
+      {:ok, socket}
     else
       {:error, _reason} -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/sites/index.ex b/elixir/apps/web/lib/web/live/sites/index.ex
index a357fc9d5..f998ad83e 100644
--- a/elixir/apps/web/lib/web/live/sites/index.ex
+++ b/elixir/apps/web/lib/web/live/sites/index.ex
@@ -8,7 +8,14 @@ defmodule Web.Sites.Index do
     with {:ok, groups} <-
            Gateways.list_groups(subject, preload: [:gateways, connections: [:resource]]) do
       :ok = Gateways.subscribe_for_gateways_presence_in_account(socket.assigns.account)
-      {:ok, assign(socket, groups: groups)}
+
+      socket =
+        assign(socket,
+          groups: groups,
+          page_title: "Sites"
+        )
+
+      {:ok, socket}
     else
       {:error, _reason} -> raise Web.LiveErrors.NotFoundError
     end
diff --git a/elixir/apps/web/lib/web/live/sites/new.ex b/elixir/apps/web/lib/web/live/sites/new.ex
index ff8fad29b..e77f03cef 100644
--- a/elixir/apps/web/lib/web/live/sites/new.ex
+++ b/elixir/apps/web/lib/web/live/sites/new.ex
@@ -6,8 +6,8 @@ defmodule Web.Sites.New do
   def mount(_params, _session, socket) do
     changeset = Gateways.new_group()
 
-    {:ok, assign(socket, form: to_form(changeset)),
-     temporary_assigns: [form: %Phoenix.HTML.Form{}]}
+    socket = assign(socket, form: to_form(changeset), page_title: "New Site")
+    {:ok, socket, temporary_assigns: [form: %Phoenix.HTML.Form{}]}
   end
 
   def render(assigns) do
diff --git a/elixir/apps/web/lib/web/live/sites/new_token.ex b/elixir/apps/web/lib/web/live/sites/new_token.ex
index e6604d7d2..019f0adae 100644
--- a/elixir/apps/web/lib/web/live/sites/new_token.ex
+++ b/elixir/apps/web/lib/web/live/sites/new_token.ex
@@ -22,7 +22,8 @@ defmodule Web.Sites.NewToken do
          group: group,
          env: env,
          connected?: false,
-         selected_tab: "systemd-instructions"
+         selected_tab: "systemd-instructions",
+         page_title: "New Site Gateway"
        )}
     else
       {:error, _reason} -> raise Web.LiveErrors.NotFoundError
diff --git a/elixir/apps/web/lib/web/live/sites/show.ex b/elixir/apps/web/lib/web/live/sites/show.ex
index 6e9e8db6b..2846352b9 100644
--- a/elixir/apps/web/lib/web/live/sites/show.ex
+++ b/elixir/apps/web/lib/web/live/sites/show.ex
@@ -27,7 +27,8 @@ defmodule Web.Sites.Show do
        assign(socket,
          group: group,
          gateways: gateways,
-         resource_actor_groups_peek: resource_actor_groups_peek
+         resource_actor_groups_peek: resource_actor_groups_peek,
+         page_title: "Site #{group.name}"
        )}
     else
       {:error, _reason} -> raise Web.LiveErrors.NotFoundError