diff --git a/brutaldon/static/css/brutaldon-dark.css b/brutaldon/static/css/brutaldon-dark.css
index a1aee64..61be09f 100644
--- a/brutaldon/static/css/brutaldon-dark.css
+++ b/brutaldon/static/css/brutaldon-dark.css
@@ -255,3 +255,10 @@ div.poll {
 {
     margin-top: 0;
 }
+
+li {
+     margin-top: 0.1vh;
+}
+ul {
+     padding-left: 2vw;
+}
diff --git a/brutaldon/templates/main/thread.html b/brutaldon/templates/main/thread.html
index 7c05fe4..dceb97e 100644
--- a/brutaldon/templates/main/thread.html
+++ b/brutaldon/templates/main/thread.html
@@ -18,14 +18,20 @@ mastodon.status_context(<numerical id>)
     <h1 id="title" class="title">
         Thread
     </h1>
-    {% include "main/toot_partial.html" with toot=root %}
-    {% for descendant in descendants %}
-        {% if descendant == toot %}
-            {% include "main/toot_partial.html" with toot=toot active=True %}
-        {% else %}
-            {% include "main/toot_partial.html" with toot=descendant %}
-        {% endif %}
-        <hr class="is-hidden">
+    {% for op in toots %}
+       {% if op == IN %}
+       <ul>
+       {% elif op == OUT %}
+       </ul>
+       {% else %}
+       <li>
+       {% if op.toot == toot %}
+            {% include "main/toot_partial.html" with toot=op.toot active=True %}
+       {% else %}
+            {% include "main/toot_partial.html" with toot=op.toot %}
+       {% endif %}
+       </li>
+       {% endif %}
     {% endfor %}
 
     {% if not preferences.no_javascript %}