diff --git a/brutaldon/templates/main/boost.html b/brutaldon/templates/main/boost.html
index edf856e..7bfc3e4 100644
--- a/brutaldon/templates/main/boost.html
+++ b/brutaldon/templates/main/boost.html
@@ -3,34 +3,32 @@
 {% block title  %} Brutaldon - confirm boost {% endblock %}
 
 {% block content %}
-    {% if toot.reblogged %}
-        <h1 class="title">Unboost that toot?</h1>
-    {% else %}
-        <h1 class="title" >Boost that toot?</h1>
-    {% endif %}
+{% if toot.reblogged %}
+<h1 class="title">Unboost that toot?</h1>
+{% else %}
+<h1 class="title" >Boost that toot?</h1>
+{% endif %}
 
-    <div class="box">
-        {% include "main/toot_partial.html" with toot=toot %}
-    </div>
-    <form method="POST" action="{% url "boost" toot.id %}">
-        {% csrf_token %}
-        <div class="level is-mobile">
-            <div class="level-left">
-                <div class="level-item">
-                    <input class="button" type="submit" name="cancel" value="Cancel">
-                </div>
-            </div>
-            <div class="level-right">
-                <div class="level-item">
-                    {% if toot.reblogged %}
-                        <input class="button is-primary" type="submit" name="boost"
-                               value="Unboost">
-                    {% else %}
-                        <input class="button is-primary" type="submit" name="boost"
-                               value="Boost">
-                    {% endif %}
-                </div>
+{% include "main/toot_partial.html" with toot=toot %}
+<form method="POST" action="{% url "boost" toot.id %}">
+    {% csrf_token %}
+    <div class="level is-mobile">
+        <div class="level-left">
+            <div class="level-item">
+                <input class="button" type="submit" name="cancel" value="Cancel">
             </div>
         </div>
-    </form>
+        <div class="level-right">
+            <div class="level-item">
+                {% if toot.reblogged %}
+                <input class="button is-primary" type="submit" name="boost"
+                       value="Unboost">
+                {% else %}
+                <input class="button is-primary" type="submit" name="boost"
+                       value="Boost">
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</form>
 {% endblock %}
diff --git a/brutaldon/templates/main/delete.html b/brutaldon/templates/main/delete.html
index 17390b8..4a5dee7 100644
--- a/brutaldon/templates/main/delete.html
+++ b/brutaldon/templates/main/delete.html
@@ -3,25 +3,23 @@
 {% block title  %} Brutaldon - confirm delete {% endblock %}
 
 {% block content %}
-    <h1 class="title">Delete that toot?</h1>
+<h1 class="title">Delete that toot?</h1>
 
-    <div class="box">
-        {% include "main/toot_partial.html" with toot=toot %}
-    </div>
-    <form method="POST" action="{% url "delete" toot.id %}">
-        {% csrf_token %}
-        <div class="level is-mobile">
-            <div class="level-left">
-                <div class="level-item">
-                    <input class="button" type="submit" name="cancel" value="Cancel">
-                </div>
-            </div>
-            <div class="level-right">
-                <div class="level-item">
-                    <input class="button is-primary" type="submit" name="delete"
-                           value="Delete">
-                </div>
+{% include "main/toot_partial.html" with toot=toot %}
+<form method="POST" action="{% url "delete" toot.id %}">
+    {% csrf_token %}
+    <div class="level is-mobile">
+        <div class="level-left">
+            <div class="level-item">
+                <input class="button" type="submit" name="cancel" value="Cancel">
             </div>
         </div>
-    </form>
+        <div class="level-right">
+            <div class="level-item">
+                <input class="button is-primary" type="submit" name="delete"
+                       value="Delete">
+            </div>
+        </div>
+    </div>
+</form>
 {% endblock %}
diff --git a/brutaldon/templates/main/fav.html b/brutaldon/templates/main/fav.html
index 23aca17..c4ccf3a 100644
--- a/brutaldon/templates/main/fav.html
+++ b/brutaldon/templates/main/fav.html
@@ -3,34 +3,32 @@
 {% block title  %} Brutaldon - confirm favorite {% endblock %}
 
 {% block content %}
-    {% if toot.favourited %}
-        <h1 class="title">Unfav that toot?</h1>
-    {% else %}
-        <h1 class="title" >Fav that toot?</h1>
-    {% endif %}
+{% if toot.favourited %}
+<h1 class="title">Unfav that toot?</h1>
+{% else %}
+<h1 class="title" >Fav that toot?</h1>
+{% endif %}
 
-    <div class="box">
-        {% include "main/toot_partial.html" with toot=toot %}
-    </div>
-    <form method="POST" action="{% url "fav" toot.id %}">
-        {% csrf_token %}
-        <div class="level is-mobile">
-            <div class="level-left">
-                <div class="level-item">
-                    <input class="button" type="submit" name="cancel" value="Cancel">
-                </div>
-            </div>
-            <div class="level-right">
-                <div class="level-item">
-                    {% if toot.favorited %}
-                        <input class="button is-primary" type="submit" name="fav"
-                               value="Unfavorite">
-                    {% else %}
-                        <input class="button is-primary" type="submit" name="fav"
-                               value="Favorite">
-                    {% endif %}
-                </div>
+{% include "main/toot_partial.html" with toot=toot %}
+<form method="POST" action="{% url "fav" toot.id %}">
+    {% csrf_token %}
+    <div class="level is-mobile">
+        <div class="level-left">
+            <div class="level-item">
+                <input class="button" type="submit" name="cancel" value="Cancel">
             </div>
         </div>
-    </form>
+        <div class="level-right">
+            <div class="level-item">
+                {% if toot.favorited %}
+                <input class="button is-primary" type="submit" name="fav"
+                       value="Unfavorite">
+                {% else %}
+                <input class="button is-primary" type="submit" name="fav"
+                       value="Favorite">
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</form>
 {% endblock %}
diff --git a/brutaldon/templates/main/reply.html b/brutaldon/templates/main/reply.html
index dec781d..63d98da 100644
--- a/brutaldon/templates/main/reply.html
+++ b/brutaldon/templates/main/reply.html
@@ -2,23 +2,19 @@
 {% load humanize %}
 
 {% block title %}
-    Brutaldon - reply
+Brutaldon - reply
 {% endblock %}
 
 {% block content %}
-    <h1 class="title">Thread</h1>
-    {% for ancestor in context.ancestors %}
-        <div class="box">
-            {% include "main/toot_partial.html" with toot=ancestor %}
-        </div>
-        <hr class="is-hidden">
-    {% endfor %}
-    <div class="box active_context">
-        {% include "main/toot_partial.html" with toot=toot %}
-    </div>
-    <hr class="is-hidden">
-    <div class="box">
-        {% include "main/post_partial.html" %}
-    </div>
+<h1 class="title">Thread</h1>
+{% for ancestor in context.ancestors %}
+{% include "main/toot_partial.html" with toot=ancestor %}
+<hr class="is-hidden">
+{% endfor %}
+{% include "main/toot_partial.html" with toot=toot active=True %}
+<hr class="is-hidden">
+<div class="box">
+    {% include "main/post_partial.html" %}
+</div>
 
 {% endblock %}