diff --git a/templates/tunnel.tmpl b/templates/tunnel.tmpl
index 484c03e..8753e78 100644
--- a/templates/tunnel.tmpl
+++ b/templates/tunnel.tmpl
@@ -2,11 +2,11 @@
 
 <div class='tn-attribute'>
   <div class='tn-attribute__name'>Domain:</div>
-  <div class='tn-attribute__value'>{{$.Tunnel.Domain}}</div>
+  <div class='tn-attribute__value'><a href='https://{{$.Tunnel.Domain}}'>{{$.Tunnel.Domain}}</a></div>
 </div>
 <div class='tn-attribute'>
-  <div class='tn-attribute__name'>Owner:</div>
-  <div class='tn-attribute__value'>{{$.Tunnel.Owner}}</div>
+  <div class='tn-attribute__name'>Server Tunnel Port:</div>
+  <div class='tn-attribute__value'>{{$.Tunnel.TunnelPort}}</div>
 </div>
 <div class='tn-attribute'>
   <div class='tn-attribute__name'>Client:</div>
@@ -16,6 +16,18 @@
   <div class='tn-attribute__name'>Target:</div>
   <div class='tn-attribute__value'>{{$.Tunnel.ClientAddress}}:{{$.Tunnel.ClientPort}}</div>
 </div>
+<div class='tn-attribute'>
+  <div class='tn-attribute__name'>TLS Termination:</div>
+  <div class='tn-attribute__value'>{{$.Tunnel.TlsTermination}}</div>
+</div>
+<div class='tn-attribute'>
+  <div class='tn-attribute__name'>Allow External TCP:</div>
+  <div class='tn-attribute__value'>{{$.Tunnel.AllowExternalTcp}}</div>
+</div>
+<div class='tn-attribute'>
+  <div class='tn-attribute__name'>Owner:</div>
+  <div class='tn-attribute__value'>{{$.Tunnel.Owner}}</div>
+</div>
 
 <div class='button-row'>
   <a class='button' href="/tunnel-private-key?domain={{$.Tunnel.Domain}}">Download Private Key</a>
diff --git a/templates/tunnels.tmpl b/templates/tunnels.tmpl
index f38594e..4284314 100644
--- a/templates/tunnels.tmpl
+++ b/templates/tunnels.tmpl
@@ -4,7 +4,7 @@
   <div class='tn-tunnel-list-item'>
     <div class='tn-attribute'>
       <div class='tn-attribute__name'>Domain:</div>
-      <div class='tn-attribute__value'>{{$domain}}</div>
+      <div class='tn-attribute__value'><a href='https://{{$domain}}'>{{$domain}}</a></div>
     </div>
     <div class='tn-attribute'>
       <div class='tn-attribute__name'>Client:</div>
@@ -36,7 +36,7 @@
       {{range $domain, $tunnel:= .Tunnels}}
       <tr>
         <td class='tn-tunnel-table__cell'>
-          {{$domain}} 
+          <a href='https://{{$domain}}'>{{$domain}}</a>
         </td>
         <td class='tn-tunnel-table__cell'>{{$tunnel.ClientName}}</td>
         <td class='tn-tunnel-table__cell'>{{$tunnel.ClientAddress}}:{{$tunnel.ClientPort}}</td>