diff --git a/handler/routes.go b/handler/routes.go
index 5b66f16..09cb426 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -533,6 +533,8 @@ func Status(db store.IStore) echo.HandlerFunc {
 		LastHandshakeTime time.Time
 		LastHandshakeRel  time.Duration
 		Connected         bool
+		AllocatedIP       string
+		Endpoint          string
 	}
 
 	type DeviceVM struct {
diff --git a/templates/clients.html b/templates/clients.html
index f7f3a1a..2e42542 100644
--- a/templates/clients.html
+++ b/templates/clients.html
@@ -1,5 +1,5 @@
 {{define "title"}}
-Wireguard Clients
+Wireguard Clients - test
 {{end}}
 
 {{define "top_css"}}
diff --git a/templates/login.html b/templates/login.html
index 1f0e338..f6d7894 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>WireGuard UI</title>
+    <title>WireGuard UI - Techdynamics</title>
     <!-- Tell the browser to be responsive to screen width -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -23,7 +23,7 @@
 <body class="hold-transition login-page">
     <div class="login-box">
         <div class="login-logo">
-            <a href="https://github.com/ngoduykhanh/wireguard-ui">WireGuard UI</a>
+            <a href="https://github.com/ngoduykhanh/wireguard-ui">WireGuard UI test</a>
         </div>
         <!-- /.login-logo -->
         <div class="card">
diff --git a/templates/status.html b/templates/status.html
index b161646..f34a553 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -41,6 +41,8 @@ Connected Peers
                   <th scope="col">#</th>
                   <th scope="col">Name</th>
                   <th scope="col">Email</th>
+                  <th scope="col">Allocated IPs</th>
+                  <th scope="col">Endpoint</th>
                   <th scope="col">Public Key</th>
                   <th scope="col">Received</th>
                   <th scope="col">Transmitted</th>
@@ -54,6 +56,8 @@ Connected Peers
                 <th scope="row">{{ $idx }}</th>
                 <td>{{ $peer.Name }}</td>
                 <td>{{ $peer.Email }}</td>
+                <td>{{ $peer.AllocatedIP }}</td>
+                <td>{{ $peer.Endpoint }}</td>
                 <td>{{ $peer.PublicKey }}</td>
                 <td title="{{ $peer.ReceivedBytes }} Bytes"><script>document.write(bytesToHumanReadable({{ $peer.ReceivedBytes }}))</script></td>
                 <td title="{{ $peer.TransmitBytes }} Bytes"><script>document.write(bytesToHumanReadable({{ $peer.TransmitBytes }}))</script></td>
