diff --git a/templates/index.html b/templates/index.html
index 3ec678c..11c49bc 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -44,13 +44,13 @@ $def with (output, now)
                   $if isError != 0:
                       <tr>
                         <td><a href="$output[server]['url']/$env-$check"
-                          target="_blank">$check</a></td>
-                        <td><a href="$output[server]['url']/$check"
-                          target="_blank"><img src="static/img/error.png"></a></td>
+                          target="_blank" style="text-decoration:none;">$check</a></td>
+                        <td><img src="static/img/error.png"></td>
                       </tr>
                   $else:
                       <tr>
-                        <td>$check</td>
+                        <td><a href="$output[server]['url']/$env-$check"
+                          target="_blank" style="text-decoration:none;">$check</a></td>
                         <td><img src="static/img/ok.png"></td>
                       </tr>
 
@@ -79,14 +79,14 @@ $def with (output, now)
                   $ isError = services.get(check)
                   $if isError != 0:
                       <tr>
-                        <td><a href="$output[server]['url']/$check"
-                          target="_blank">$check</a></td>
-                        <td><a href="$output[server]['url']/$check"
-                          target="_blank"><img src="static/img/error.png"></a></td>
+                        <td><a href="$output[server]['url']/$env-$check"
+                          target="_blank" style="text-decoration:none;">$check</a></td>
+                        <td><img src="static/img/error.png"></td>
                       </tr>
                   $else:
                       <tr>
-                        <td>$check</td>
+                        <td><a href="$output[server]['url']/$env-$check"
+                          target="_blank" style="text-decoration:none;">$check</a></td>
                         <td><img src="static/img/ok.png"></td>
                       </tr>