diff --git a/templates/index.html b/templates/index.html
index 2b835e8eb..d1b744e94 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -11,7 +11,7 @@
       {%- endfor %}
     </ul>
     <hr>
-    <form action="/thread" method="post">
+    <form action="/thread/submit" method="post">
       <div>
         <label for="title">Title:</label>
         <input type="text" id="title" name="title">
diff --git a/templates/thread.html b/templates/thread.html
index e841668bf..e26d4bcc6 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -8,7 +8,19 @@
 
     <p>{{ thread.body }}<br><i>Posted at {{ thread.posted }}</i></p>
     {% for post in posts -%}
-      <li>{{ post.body }}<br><i>Posted at {{ post.posted }}</i></p>
+    <li>{{ post.body }}<br><i>Posted at {{ post.posted }}</i></li>
     {%- endfor %}
+
+    <hr>
+    <form action="/thread/reply" method="post">
+      <input type="hidden" id="thread_id" name="thread_id" value="{{ thread.id }}">
+      <div>
+        <label for="body">Content:</label>
+        <textarea id="body" name="body"></textarea>
+      </div>
+      <div>
+        <input type="submit" value="Reply">
+      </div>
+    </form>
   </body>
 </html>