diff --git a/lib/aprsme/cluster/leader_election.ex b/lib/aprsme/cluster/leader_election.ex
index 8c7a256..93ac74d 100644
--- a/lib/aprsme/cluster/leader_election.ex
+++ b/lib/aprsme/cluster/leader_election.ex
@@ -210,7 +210,8 @@ defmodule Aprsme.Cluster.LeaderElection do
         Map.put(status, :cluster_info, %{
           total_nodes: length(all_nodes),
           connected_nodes: length(connected_statuses),
-          leader_node: get_leader_node_name()
+          leader_node: get_leader_node_name(),
+          all_nodes: all_nodes |> Enum.map(&to_string/1) |> Enum.sort()
         })
 
       [] ->
@@ -220,7 +221,8 @@ defmodule Aprsme.Cluster.LeaderElection do
         Map.put(local_status, :cluster_info, %{
           total_nodes: length(all_nodes),
           connected_nodes: 0,
-          leader_node: get_leader_node_name()
+          leader_node: get_leader_node_name(),
+          all_nodes: all_nodes |> Enum.map(&to_string/1) |> Enum.sort()
         })
     end
   end
diff --git a/lib/aprsme_web/live/status_live/index.ex b/lib/aprsme_web/live/status_live/index.ex
index dc83f16..acaff08 100644
--- a/lib/aprsme_web/live/status_live/index.ex
+++ b/lib/aprsme_web/live/status_live/index.ex
@@ -137,7 +137,7 @@ defmodule AprsmeWeb.StatusLive.Index do
                   <div class="flex items-center">
                     <span class="text-sm font-medium opacity-70 mr-2">{gettext("Server:")}</span>
                     <span class="text-sm font-mono">
-                      {@aprs_status.server}:{@aprs_status.port}
+                      {@aprs_status.server}
                     </span>
                   </div>
 
@@ -317,6 +317,28 @@ defmodule AprsmeWeb.StatusLive.Index do
                     </div>
                   </div>
 
+                  <%= if Map.has_key?(@aprs_status.cluster_info, :all_nodes) do %>
+                    <div class="mt-4">
+                      <span class="text-sm font-medium opacity-70">{gettext("Cluster Nodes:")}</span>
+                      <div class="flex flex-wrap gap-2 mt-2">
+                        <%= for node_name <- @aprs_status.cluster_info.all_nodes do %>
+                          <div class={[
+                            "badge gap-1",
+                            if(node_name == @aprs_status.cluster_info.leader_node, do: "badge-primary", else: "badge-outline")
+                          ]}>
+                            <%= if node_name == @aprs_status.cluster_info.leader_node do %>
+                              <div class="w-2 h-2 bg-current rounded-full"></div>
+                            <% end %>
+                            <span class="font-mono text-xs">{node_name}</span>
+                          </div>
+                        <% end %>
+                      </div>
+                      <p class="text-xs opacity-70 mt-1">
+                        {gettext("Leader node")} <span class="badge badge-primary badge-xs">{gettext("highlighted")}</span>
+                      </p>
+                    </div>
+                  <% end %>
+
                   <p class="text-xs opacity-70 mt-2">
                     {gettext(
                       "Status is aggregated from all nodes in the cluster. Only the leader node maintains the APRS-IS connection."