diff --git a/css/style.css b/css/style.css
index 6d0df490..65dd20d0 100644
--- a/css/style.css
+++ b/css/style.css
@@ -88,7 +88,12 @@ a {
 	white-space: nowrap;
 }
 
-/* Styling/fixes for the table: */
+.comment-row td:first-of-type {
+	vertical-align: top;
+	text-align: right;
+}
+
+/* Table style & fixes */
 .table > tbody > tr > td {
     /* fix bootstrap uglyness */
     vertical-align: middle;
@@ -106,6 +111,10 @@ tr.torrent-info td.date {
 	opacity: 0.82;
 }
 
+.comment-row {
+	border-top: 1px solid #ddd;
+}
+
 div.container div.blockBody:nth-of-type(2) table{table-layout:fixed;}
 div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:first-of-type, div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(5){width:10%;}
 div.container div.blockBody:nth-of-type(2) table tr:first-of-type th:nth-of-type(3){width:15%;}
diff --git a/templates/FAQ.html b/templates/FAQ.html
index f7403c6c..aa1e01b9 100644
--- a/templates/FAQ.html
+++ b/templates/FAQ.html
@@ -2,7 +2,7 @@
 {{define "content"}}
     <div class="blockBody">
         <!-- marquees are the true purpose of HTML -->
-        <marquee><h2>NOTICE: KEEP SEEDING YOU RETARD</h2></marquee>
+        <marquee><h2>NOTICE: KEEP SEEDING AND ENABLE DHT YOU RETARD</h2></marquee>
 
         <h1>Official Nyaapocalypse FAQ</h1>
         <br />
@@ -15,7 +15,7 @@
         <ul>
             <li>nyaa.se and associated domains (such as nyaatorrents.info) went offline on May 01, 2017.</li>
             <li>They were deactivated, so it's not a DDoS attack like usual.</li>
-            <li>Future prospects for nyaa are not looking good.</li>
+            <li>Future prospects for nyaa are not looking good. (It's dead)</li>
             <li>There is a recovery effort taking place.</li>
         </ul>
 
@@ -30,8 +30,8 @@
         <h2>How are we recovering?</h2>
         <p>The aforementioned databases are being hosted at nyaa.pantsu.cat and sukebei.pantsu.cat.
             There is a search function, and (almost) full nyaa functionality should be coming soon.
-            Unfortunately, due to the lack of a tracker and no plans to make one,
-            seeder/leecher statistics will not be restored.</p>
+            Seeder/leecher statistics are possible via scraping and might be restored somewhen in the future,
+            since other feature take priority right now.</p>
 
         <h2>Are the torrents still working?</h2>
         <p>Even if the trackers are down, seeders are still connected to the decentralized DHT network.
@@ -40,8 +40,8 @@
         <h2>How do I download the torrents?</h2>
         <p>Just use the <b>magnet link</b>. The magnet link will used by your BitTorrent client to look up the file on the
             DHT network and it should download just fine.</p>
-        <p>If your magnet link starts with "magnet:magnet:", delete the first "magnet:". It should look like:
-            magnet:?xt=urn:btih:[hash]&dn=[name]&tr=[tracker]&tr=[...]</p>
+        <p>The magnet link should look like this: <span style="font-family:monospace">
+            magnet:?xt=urn:btih:[hash]&amp;dn=[name]&amp;tr=[tracker]&amp;tr=[...]</span></p>
 
         <h2>How can I help?</h2>
         <p>If you have website development expertise, you can join the #nyaapantsu IRC channel on irc.rizon.net.
@@ -50,6 +50,9 @@
         <h2>Your design sucks / I found a bug</h2>
         <p><a href="https://github.com/ewhal/nyaa/issues">https://github.com/ewhal/nyaa/issues</a>.</p>
 
+        <h2>Why is your shit written in Go?</h2>
+        <p>It's the authors favorite programming language.</p>
+
         <br />
         <h2>nyaa.pantsu.cat and sukebei.pantsu.cat do not host any files.</h2>
         </div>
diff --git a/templates/view.html b/templates/view.html
index c8c50ab8..4fd9eac7 100644
--- a/templates/view.html
+++ b/templates/view.html
@@ -34,16 +34,17 @@
                   <td>Description</td>
                   <td>{{.Description}}</td>
               </tr>
+              <tr style="height:2em"> <td></td><td></td> </tr>
               <tr>
                   <td>Comments</td>
-                  {{ range .Comments }}
-                  <tr>
-                      <td>{{.Un}}</td>
-                      <td>{{.C}}</td>
-                  </tr>
-                  {{end}}
+                  <td></td>
               </tr>
-
+              {{ range .Comments }}
+              <tr class="comment-row">
+                  <td>{{.Un}}</td>
+                  <td>{{.C}}</td>
+              </tr>
+              {{end}}
           </table>
           {{end}}
       </div>