diff --git a/template.html b/template.html
index 7af768e..7934b17 100644
--- a/template.html
+++ b/template.html
@@ -42,30 +42,24 @@
 </table>
 
 <h2>Torrent Info</h2>
-{{range .TorrentInfo}}
 <table style="width:100%">
   <tr>
-    <td>Name</td>
-    <td class="name">{{.Name}}</td>
+    <th>Name</th>
+    <th>Date Added</th>
+    <th>Total Size</th>
+    <th>Peers Connected</th>
+    <th>Peers Getting From Us</th>
   </tr>
+  {{range .TorrentInfo}}
   <tr>
-    <td>Date Added</td>
+    <td>{{.Name}}</td>
     <td>{{.DateAdded}}</td>
-  </tr>
-  <tr>
-    <td>Total Size</td>
     <td>{{.TotalSize}}</td>
-  </tr>
-  <tr>
-    <td>Peers Connected</td>
     <td>{{.PeersConnected}}</td>
-  </tr>
-  <tr>
-    <td>Peers Getting From Us</td>
     <td>{{.PeersGettingFromUs}}</td>
   </tr>
+  {{end}}
 </table>
-{{end}}
 </div>
 </body>
 </html>