diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java
index e5653848..05242302 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java
@@ -180,7 +180,7 @@ public class PeerManager {
         });
     }
 
-    private Optional<PeerAddress> selectBestAddress(PeerId host) {
+    public Optional<PeerAddress> selectBestAddress(PeerId host) {
         return peerDiscoveryDirectory.getForPeer(host).stream().min(Comparator.comparing(PeerAddress::type));
     }
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java
index 6700fc78..5cd2e561 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java
@@ -1,4 +1,6 @@
 package com.usatiuk.dhfs.repository.webapi;
 
-public record KnownPeerInfo(String uuid) {
+import jakarta.annotation.Nullable;
+
+public record KnownPeerInfo(String uuid, @Nullable String knownAddress) {
 }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeers.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeers.java
new file mode 100644
index 00000000..5e7fe932
--- /dev/null
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeers.java
@@ -0,0 +1,6 @@
+package com.usatiuk.dhfs.repository.webapi;
+
+import java.util.List;
+
+public record KnownPeers(List<KnownPeerInfo> peers, String selfUuid) {
+}
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerManagementApi.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerManagementApi.java
index 272a3a69..aa19e6d1 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerManagementApi.java
+++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerManagementApi.java
@@ -2,6 +2,7 @@ package com.usatiuk.dhfs.repository.webapi;
 
 import com.usatiuk.dhfs.PeerId;
 import com.usatiuk.dhfs.repository.PeerManager;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
 import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.DELETE;
@@ -11,6 +12,8 @@ import jakarta.ws.rs.Path;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
 @Path("/peers-manage")
 public class PeerManagementApi {
@@ -18,11 +21,15 @@ public class PeerManagementApi {
     PeerInfoService peerInfoService;
     @Inject
     PeerManager peerManager;
+    @Inject
+    PersistentPeerDataService persistentPeerDataService;
 
     @Path("known-peers")
     @GET
-    public List<KnownPeerInfo> knownPeers() {
-        return peerInfoService.getPeers().stream().map(peerInfo -> new KnownPeerInfo(peerInfo.id().toString())).toList();
+    public KnownPeers knownPeers() {
+        return new KnownPeers(peerInfoService.getPeers().stream().map(peerInfo -> new KnownPeerInfo(peerInfo.id().toString(),
+                Optional.ofNullable(peerManager.getAddress(peerInfo.id())).map(Objects::toString).orElse(null))).toList(),
+                persistentPeerDataService.getSelfUuid().toString());
     }
 
     @Path("known-peers")
@@ -40,7 +47,10 @@ public class PeerManagementApi {
     @Path("available-peers")
     @GET
     public Collection<KnownPeerInfo> availablePeers() {
-        return peerManager.getSeenButNotAddedHosts().stream().map(p -> new KnownPeerInfo(p.toString())).toList();
+        return peerManager.getSeenButNotAddedHosts().stream()
+                .map(p -> new KnownPeerInfo(p.toString(),
+                        peerManager.selectBestAddress(p).map(Objects::toString).orElse(null)))
+                .toList();
     }
 
     @Path("peer-state")
diff --git a/webui/src/PeerAvailableCard.tsx b/webui/src/PeerAvailableCard.tsx
index 0798f654..d813be9c 100644
--- a/webui/src/PeerAvailableCard.tsx
+++ b/webui/src/PeerAvailableCard.tsx
@@ -12,8 +12,14 @@ export function PeerAvailableCard({ peerInfo }: TPeerAvailableCardProps) {
     return (
         <div className="peerAvailableCard">
             <div className={"peerInfo"}>
-                <span>UUID: </span>
-                <span>{peerInfo.uuid}</span>
+                <div>
+                    <span>UUID: </span>
+                    <span>{peerInfo.uuid}</span>
+                </div>
+                <div>
+                    <span>Address: </span>
+                    <span>{peerInfo.knownAddress}</span>
+                </div>
             </div>
             <fetcher.Form
                 className="actions"
diff --git a/webui/src/PeerKnownCard.tsx b/webui/src/PeerKnownCard.tsx
index 04a6c0a2..d4107799 100644
--- a/webui/src/PeerKnownCard.tsx
+++ b/webui/src/PeerKnownCard.tsx
@@ -21,8 +21,15 @@ export function PeerKnownCard({ peerInfo }: TPeerKnownCardProps) {
         <div className="peerKnownCard">
             <div className={"peerInfo"}>
                 <div>
+                    <div>
+
                     <span>UUID: </span>
                     <span>{peerInfo.uuid}</span>
+                    </div>
+                    <div>
+                        <span>Address: </span>
+                        <span>{peerInfo.knownAddress || "not connected"}</span>
+                    </div>
                 </div>
                 <div>
                     <fetcher.Form
diff --git a/webui/src/PeerState.tsx b/webui/src/PeerState.tsx
index ec20145e..daefd684 100644
--- a/webui/src/PeerState.tsx
+++ b/webui/src/PeerState.tsx
@@ -8,9 +8,9 @@ import { PeerKnownCard } from "./PeerKnownCard";
 export function PeerState() {
     const loaderData = useLoaderData() as LoaderToType<typeof peerStateLoader>;
 
-    const knownPeers = loaderData.knownPeers.map((p) => (
-        <PeerKnownCard peerInfo={p} key={p.uuid} />
-    ));
+    const knownPeers = loaderData.knownPeers.peers
+        .filter((p) => p.uuid !== loaderData.knownPeers.selfUuid)
+        .map((p) => <PeerKnownCard peerInfo={p} key={p.uuid} />);
 
     const availablePeers = loaderData.availablePeers.map((p) => (
         <PeerAvailableCard peerInfo={p} key={p.uuid} />
@@ -18,6 +18,7 @@ export function PeerState() {
 
     return (
         <div id={"PeerState"}>
+            <div>Self UUID: {loaderData.knownPeers.selfUuid}</div>
             <div>
                 <div>Known peers</div>
                 <div>{knownPeers}</div>
diff --git a/webui/src/api/PeerState.ts b/webui/src/api/PeerState.ts
index 7fa6aca0..3c5bb399 100644
--- a/webui/src/api/PeerState.ts
+++ b/webui/src/api/PeerState.ts
@@ -1,13 +1,13 @@
 import { fetchJSON, fetchJSON_throws } from "./utils";
 import {
     AvailablePeerInfoToResp,
-    KnownPeerInfoToResp,
+    KnownPeersToResp,
     NoContentToResp,
     PeerAddressInfoToResp,
     TAvailablePeerInfoArrTo,
     TAvailablePeerInfoToResp,
-    TKnownPeerInfoArrTo,
-    TKnownPeerInfoToResp,
+    TKnownPeerInfoArrTo, TKnownPeersTo,
+    TKnownPeersToResp,
     TNoContentToResp,
     TPeerAddressInfoArrTo,
     TPeerAddressInfoToResp,
@@ -20,11 +20,11 @@ export async function getAvailablePeers(): Promise<TAvailablePeerInfoArrTo> {
     >("/peers-manage/available-peers", "GET", AvailablePeerInfoToResp);
 }
 
-export async function getKnownPeers(): Promise<TKnownPeerInfoArrTo> {
-    return fetchJSON_throws<TKnownPeerInfoToResp, typeof KnownPeerInfoToResp>(
+export async function getKnownPeers(): Promise<TKnownPeersTo> {
+    return fetchJSON_throws<TKnownPeersToResp, typeof KnownPeersToResp>(
         "/peers-manage/known-peers",
         "GET",
-        KnownPeerInfoToResp,
+        KnownPeersToResp,
     );
 }
 
diff --git a/webui/src/api/dto.ts b/webui/src/api/dto.ts
index 98eb22a7..f893a623 100644
--- a/webui/src/api/dto.ts
+++ b/webui/src/api/dto.ts
@@ -39,6 +39,7 @@ export type TTokenToResp = z.infer<typeof TokenToResp>;
 //  AvailablePeerInfo
 export const AvailablePeerInfoTo = z.object({
     uuid: z.string(),
+    knownAddress: z.string().optional(),
     // addr: z.string(),
     // port: z.number(),
 });
@@ -55,14 +56,21 @@ export type TAvailablePeerInfoToResp = z.infer<typeof AvailablePeerInfoToResp>;
 // KnownPeerInfo
 export const KnownPeerInfoTo = z.object({
     uuid: z.string(),
+    knownAddress: z.string().optional(),
 });
 export type TKnownPeerInfoTo = z.infer<typeof KnownPeerInfoTo>;
 
 export const KnownPeerInfoArrTo = z.array(KnownPeerInfoTo);
 export type TKnownPeerInfoArrTo = z.infer<typeof KnownPeerInfoArrTo>;
 
-export const KnownPeerInfoToResp = CreateAPIResponse(KnownPeerInfoArrTo);
-export type TKnownPeerInfoToResp = z.infer<typeof KnownPeerInfoToResp>;
+export const KnownPeersTo = z.object({
+    selfUuid: z.string(),
+    peers: KnownPeerInfoArrTo,
+});
+export type TKnownPeersTo = z.infer<typeof KnownPeersTo>;
+
+export const KnownPeersToResp = CreateAPIResponse(KnownPeersTo);
+export type TKnownPeersToResp = z.infer<typeof KnownPeersToResp>;
 
 // PeerAddressInfo
 export const PeerAddressInfoTo = z.object({