diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 230507d..e58e5f5 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -129,6 +129,7 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: APP_VERSION=${{ steps.ver.outputs.tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
diff --git a/Dockerfile b/Dockerfile
index 954d4f6..dbbdf0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
 FROM nginx:alpine
 
+ARG APP_VERSION=dev
+ENV APP_VERSION=${APP_VERSION}
+
 COPY www/index.html /usr/share/nginx/html/index.html.template
 COPY www/favicon.svg /usr/share/nginx/html/favicon.svg
 COPY www/manifest.json /usr/share/nginx/html/manifest.json
diff --git a/docker-entrypoint.d/40-envsubst-html.sh b/docker-entrypoint.d/40-envsubst-html.sh
index 8e99d52..2cf51a9 100644
--- a/docker-entrypoint.d/40-envsubst-html.sh
+++ b/docker-entrypoint.d/40-envsubst-html.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-envsubst '${PH_HOSTS} ${PH_PASSWORD}' \
+envsubst '${PH_HOSTS} ${PH_PASSWORD} ${APP_VERSION}' \
     < /usr/share/nginx/html/index.html.template \
     > /usr/share/nginx/html/index.html
diff --git a/www/index.html b/www/index.html
index 0111a48..cb9eec1 100644
--- a/www/index.html
+++ b/www/index.html
@@ -186,6 +186,16 @@
       white-space: nowrap;
     }
 
+    .instance-host a {
+      color: inherit;
+      text-decoration: none;
+    }
+
+    .instance-host a:hover {
+      text-decoration: underline;
+      color: var(--md-primary);
+    }
+
     .instance-stats {
       display: grid;
       grid-template-columns: 1fr 1fr;
@@ -680,7 +690,7 @@ <h1>Pi-hole toggle sync</h1>
 
   <footer>
     <a href="https://github.com/bartekmp/pihole-toggle-sync" target="_blank">pihole-toggle-sync</a>
-    &mdash; MIT license
+    ${APP_VERSION} &mdash; MIT license
   </footer>
 
   <script>
@@ -823,7 +833,7 @@ <h1>Pi-hole toggle sync</h1>
         card.innerHTML = `
         <div class="instance-header">
           <div class="instance-dot offline"></div>
-          <div class="instance-host">${hostLabel(host)}</div>
+          <div class="instance-host"><a href="${cleanHost(host)}/admin" target="_blank" rel="noopener noreferrer">${hostLabel(host)}</a></div>
         </div>
         <div class="instance-error">
           <span>error</span>Unable to reach instance
@@ -842,7 +852,7 @@ <h1>Pi-hole toggle sync</h1>
       card.innerHTML = `
       <div class="instance-header">
         <div class="instance-dot online"></div>
-        <div class="instance-host">${hostLabel(host)}</div>
+        <div class="instance-host"><a href="${cleanHost(host)}/admin" target="_blank" rel="noopener noreferrer">${hostLabel(host)}</a></div>
       </div>
       <div class="instance-subheader">
         <span class="instance-blocking-badge ${isBlocking ? 'on' : 'off'}">
@@ -956,7 +966,7 @@ <h1>Pi-hole toggle sync</h1>
     }
 
     async function apiCall(host, enable, timer) {
-      const body = enable ? { blocking: true } : { blocking: false, timer: timer || 0 };
+      const body = enable ? { blocking: true } : (timer ? { blocking: false, timer } : { blocking: false });
       const sid = await getSid(host);
       const headers = { 'Content-Type': 'application/json' };
       if (sid) headers['X-FTL-SID'] = sid;