diff --git a/core/templates/base.html b/core/templates/base.html
index 21afa7a..5613f38 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -13,7 +13,10 @@
         <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}">
         <link rel="stylesheet" href="{% static 'css/style.css' %}">
     </head>
-    <body>
+    <body data-bs-spy="scroll"
+          data-bs-target=".toc"
+          data-bs-offset="-200"
+          tabindex="0">
         {% include "partials/alerts.html" %}
         <article class="container mt-5">
             {% include "partials/header.html" %}
diff --git a/core/templates/index.html b/core/templates/index.html
index ee30bcc..a24b5f6 100644
--- a/core/templates/index.html
+++ b/core/templates/index.html
@@ -1,22 +1,16 @@
 {% extends "base.html" %}
 {% load static %}
 {% block content %}
-    <body data-bs-spy="scroll"
-          data-bs-target=".toc"
-          data-bs-offset="-200"
-          tabindex="0">
-        <div class="container mt-4">
-            <div class="row">
-                <div class="col-lg-3">{% include "partials/toc.html" %}</div>
-                <div class="col-lg-9">
-                    {% include "partials/info_box.html" %}
-                    {% include "partials/news.html" %}
-                    {% for game in games %}
-                        {% include "partials/game_card.html" %}
-                    {% endfor %}
-                </div>
+    <div class="container mt-4">
+        <div class="row">
+            <div class="col-lg-3">{% include "partials/toc.html" %}</div>
+            <div class="col-lg-9">
+                {% include "partials/info_box.html" %}
+                {% include "partials/news.html" %}
+                {% for game in games %}
+                    {% include "partials/game_card.html" %}
+                {% endfor %}
             </div>
         </div>
-        <script src="{% static 'js/index.js' %}"></script>
-    </body>
+    </div>
 {% endblock content %}
diff --git a/core/templates/partials/news.html b/core/templates/partials/news.html
index e56f35f..ef290f4 100644
--- a/core/templates/partials/news.html
+++ b/core/templates/partials/news.html
@@ -1,44 +1,48 @@
-<div class="card mb-4 shadow-sm" id="info-box">
-    <div class="row g-0">
-        <div class="col-md-10">
-            <div class="card-body">
-                <h2 class="card-title h2">Site news</h2>
-                <div class="mt-auto">
-                    {% for webhook in webhooks %}
-                        <div class="mt-3">
-                            <img src="{{ webhook.avatar }}?size=32"
-                                 alt="{{ webhook.name }}"
-                                 class="rounded-circle"
-                                 height="32"
-                                 width="32">
-                            <a href="{{ webhook.url }}" target="_blank">{{ webhook.name }}</a>
-                            <div class="form-check form-switch">
-                                <input class="form-check-input" type="checkbox" id="new-drop-switch-daily">
-                                <label class="form-check-label" for="new-drop-switch-daily">Daily notification of newly added games to TTVdrops</label>
+{% if webhooks %}
+    <div class="card mb-4 shadow-sm" id="info-box">
+        <div class="row g-0">
+            <div class="col-md-10">
+                <div class="card-body">
+                    <h2 class="card-title h2">Site news</h2>
+                    <div class="mt-auto">
+                        {% for webhook in webhooks %}
+                            <div class="mt-3">
+                                <img src="{{ webhook.avatar }}?size=32"
+                                     alt="{{ webhook.name }}"
+                                     class="rounded-circle"
+                                     height="32"
+                                     width="32">
+                                <a href="{{ webhook.url }}" target="_blank">{{ webhook.name }}</a>
+                                <div class="form-check form-switch">
+                                    <input class="form-check-input" type="checkbox" id="new-drop-switch-daily">
+                                    <label class="form-check-label" for="new-drop-switch-daily">Daily notification of newly added games to TTVdrops</label>
+                                </div>
+                                <div class="form-check form-switch">
+                                    <input class="form-check-input" type="checkbox" id="new-drop-switch-weekly">
+                                    <label class="form-check-label" for="new-drop-switch-weekly">
+                                        Weekly notification of newly added games to TTVdrops
+                                    </label>
+                                </div>
+                                <br>
+                                <div class="form-check form-switch">
+                                    <input class="form-check-input" type="checkbox" id="new-org-switch-daily">
+                                    <label class="form-check-label" for="new-org-switch-daily">
+                                        Daily notification of newly added <abbr title="Organizations are the companies that own the games.">organizations</abbr> to TTVdrops
+                                    </label>
+                                </div>
+                                <div class="form-check form-switch">
+                                    <input class="form-check-input" type="checkbox" id="new-org-switch-weekly">
+                                    <label class="form-check-label" for="new-org-switch-weekly">
+                                        Weekly notification of newly added <abbr title="Organizations are the companies that own the games.">organizations</abbr> to TTVdrops
+                                    </label>
+                                </div>
                             </div>
-                            <div class="form-check form-switch">
-                                <input class="form-check-input" type="checkbox" id="new-drop-switch-weekly">
-                                <label class="form-check-label" for="new-drop-switch-weekly">
-                                    Weekly notification of newly added games to TTVdrops
-                                </label>
-                            </div>
-                            <br>
-                            <div class="form-check form-switch">
-                                <input class="form-check-input" type="checkbox" id="new-org-switch-daily">
-                                <label class="form-check-label" for="new-org-switch-daily">
-                                    Daily notification of newly added <abbr title="Organizations are the companies that own the games.">organizations</abbr> to TTVdrops
-                                </label>
-                            </div>
-                            <div class="form-check form-switch">
-                                <input class="form-check-input" type="checkbox" id="new-org-switch-weekly">
-                                <label class="form-check-label" for="new-org-switch-weekly">
-                                    Weekly notification of newly added <abbr title="Organizations are the companies that own the games.">organizations</abbr> to TTVdrops
-                                </label>
-                            </div>
-                        </div>
-                    {% endfor %}
+                        {% endfor %}
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
+{% else %}
+    <p class="text-muted">No webhooks added yet.</p>
+{% endif %}
