diff --git a/BDSM/static/css/style.css b/BDSM/static/css/style.css
index f447c5c..a8394eb 100644
--- a/BDSM/static/css/style.css
+++ b/BDSM/static/css/style.css
@@ -11,6 +11,13 @@ body {
     border-top: 1px solid #393f4f;
 }
 
+.reply {
+    padding-left: 30px;
+    border-left: 3px solid;
+    border-radius: 3px 0 0 3px;
+    background: #f2f0ea;
+}
+
 .meta .time {
   float: right;
   text-decoration: underline;
diff --git a/BDSM/templates/view.html b/BDSM/templates/view.html
index 99cff11..c34846c 100644
--- a/BDSM/templates/view.html
+++ b/BDSM/templates/view.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 
 {% block content %}
-    {% for toot in toots %}
+    {% for toot in toots recursive%}
     <div class="toot">
         <div class="status">
             <div class="meta">
@@ -73,7 +73,10 @@
                 </div>
                 </div>
                 </div>
-                {% endfor %}
+                    {%- if toot.reply -%}
+                    <div class="reply">{{ loop(toot.reply) }}</div>
+            {%- endif %}
+        {% endfor %}
 
                 <div class="pagination d-flex justify-content-center">
     {% if pagination %}
diff --git a/BDSM/views.py b/BDSM/views.py
index 6e0b06f..c0eda98 100644
--- a/BDSM/views.py
+++ b/BDSM/views.py
@@ -11,21 +11,25 @@ from mastodon import Mastodon
 from types import SimpleNamespace
 from datetime import timezone
 
-@app.context_processor
-def inject_setting():
-    settings = Settings.query.first()
-    return settings.__dict__
+# @app.context_processor
+# def inject_setting():
+#     settings = Settings.query.first()
+#     return settings.__dict__
 
 @app.route('/', methods=['GET', 'POST'])
 def index():
-    page = request.args.get('page', 1, type=int)
-    toots_ = Toot.query.order_by(Toot.created_at.desc()).paginate(page, per_page=50)
-    toots = process_toot(toots_)
-    path=SimpleNamespace()
-    path.path = "index"
-    path.args = {}
+    settings = Settings.query.first()
+    if settings == None:
+        return redirect(url_for('settings'))
+    else:
+        page = request.args.get('page', 1, type=int)
+        toots_ = Toot.query.order_by(Toot.created_at.desc()).paginate(page, per_page=50)
+        toots = process_toot(toots_)
+        path=SimpleNamespace()
+        path.path = "index"
+        path.args = {}
 
-    return render_template('view.html', toots=toots, pagination=toots_, path=path)
+        return render_template('view.html', toots=toots, pagination=toots_, path=path)
 
 @app.route('/search', methods=['GET', 'POST'])
 def search():
@@ -45,6 +49,25 @@ def search():
     return render_template('view.html', toots=toots, pagination=toots_, path=path)
 
 
+@app.route('/context/<int:toot_id>', methods=['GET', 'POST'])
+def context(toot_id):
+    def get_reply(reply_id):
+        toots = Toot.query.order_by(Toot.created_at.desc()).filter_by(in_reply_to_id=reply_id).all()
+        toots = process_toot(toots)
+
+        for i in toots:
+            if i.in_reply_to_id != None:
+                i.reply = get_reply(i.id)
+
+        return toots
+
+    toot = []
+    toot.append(Toot.query.get_or_404(toot_id))
+    toot = process_toot(toot)
+    toot[0].reply = get_reply(toot_id)
+
+    return render_template('view.html', toots=toot,)
+
 @app.route('/settings', methods=['GET', 'POST'])
 def settings():
     if request.method == 'POST':
@@ -129,7 +152,10 @@ def process_toot(toots_):
     user_timezone = pytz.timezone(settings.timezone)
     fmt = '%Y-%m-%d %H:%M:%S'
 
-    for toot_ in toots_.items:
+    if hasattr(toots_, 'items'):
+        toots_ = toots_.items
+
+    for toot_ in toots_:
         toot = SimpleNamespace(**toot_.__dict__)
 
         toot.created_at = toot.created_at.replace(tzinfo=timezone.utc)