diff --git a/server/templates/layout.html b/server/templates/layout.html
index c44cc28a..e98f2161 100644
--- a/server/templates/layout.html
+++ b/server/templates/layout.html
@@ -27,16 +27,13 @@
                 <th>Pull Command</th>
             </tr>
             {{ range $key, $value := .Repos }}
+            {{ if $value.VulnURI }}<a href="{{ $value.VulnURI }}">{{ end }}
             <tr>
                 <td valign="top">
-                    {{ if $value.VulnURI }}<a href="{{ $value.VulnURI }}">{{ end }}
-                        {{ $value.Name }}
-                    {{ if $value.VulnURI }}</a>{{ end }}
+                    {{ $value.Name }}
                 </td>
                 <td>
-                    {{ if $value.VulnURI }}<a href="{{ $value.VulnURI }}">{{ end }}
-                        {{ $value.Tag }}
-                    {{ if $value.VulnURI }}</a>{{ end }}
+                    {{ $value.Tag }}
                 </td>
                 <td>
                     {{ $value.CreatedDate }}
@@ -45,6 +42,7 @@
                     <code>docker pull {{ $value.RepoURI }}</code>
                 </td>
             </tr>
+            {{ if $value.VulnURI }}</a>{{ end }}
             {{ end }}
         </table>
     </div>