diff --git a/templates/admin.html b/templates/admin.html
index dd0ead0..bab7aba 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -8,7 +8,7 @@
 
   <div class="row mb-4">
     <div class="col">
-      <a href="{{ url_for('admin_logs') }}" class="btn btn-outline-info">
+      <a href="{{ url_for('admin.logs') }}" class="btn btn-outline-info">
         <i class="bi bi-journal-text me-2"></i>Logs ansehen
       </a>
     </div>
@@ -39,7 +39,7 @@
               <td>{{ cfg.hub_id | default('–') }}</td>
               <td><code>{{ cfg.filename }}</code></td>
               <td>
-                <a href="{{ url_for('admin_edit_config', filename=cfg.filename) }}"
+                <a href="{{ url_for('admin.admin_edit_config', filename=cfg.filename) }}"
                    class="btn btn-sm btn-primary">
                   <i class="bi bi-pencil"></i> Bearbeiten
                 </a>
diff --git a/templates/admin_edit.html b/templates/admin_edit.html
index 7ee7a45..0769747 100644
--- a/templates/admin_edit.html
+++ b/templates/admin_edit.html
@@ -21,7 +21,7 @@
     </div>
     <div class="d-flex gap-3">
       <button type="submit" class="btn btn-primary btn-lg px-5">Speichern</button>
-      <a href="{{ url_for('admin') }}" class="btn btn-outline-secondary btn-lg px-5">Abbrechen</a>
+      <a href="{{ url_for('admin.admin') }}" class="btn btn-outline-secondary btn-lg px-5">Abbrechen</a>
     </div>
   </form>
 
diff --git a/templates/admin_logs.html b/templates/admin_logs.html
index 8208198..b50897e 100644
--- a/templates/admin_logs.html
+++ b/templates/admin_logs.html
@@ -30,6 +30,6 @@
 </pre>
 -->
 
-  <a href="{{ url_for('admin') }}" class="btn btn-secondary mt-3">Zurück zum Admin</a>
+  <a href="{{ url_for('admin.admin') }}" class="btn btn-secondary mt-3">Zurück zum Admin</a>
 </div>
 {% endblock %}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index 617cccb..24b661d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -27,7 +27,7 @@
   <!-- Navbar -->
   <nav class="navbar navbar-expand-lg bg-dark navbar-dark">
     <div class="container-fluid">
-      <a class="navbar-brand" href="{{ url_for('index') }}">MK Control</a>
+      <a class="navbar-brand" href="{{ url_for('main.index') }}">MK Control</a>
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
               data-bs-target="#navbarNav" aria-controls="navbarNav"
               aria-expanded="false" aria-label="Toggle navigation">
@@ -36,16 +36,16 @@
       <div class="collapse navbar-collapse" id="navbarNav">
         <ul class="navbar-nav me-auto">
           <li class="nav-item">
-            <a class="nav-link {% if request.path == url_for('index') %}active{% endif %}"
-               href="{{ url_for('index') }}">Home</a>
+            <a class="nav-link {% if request.path == url_for('main.index') %}active{% endif %}"
+               href="{{ url_for('main.index') }}">Home</a>
           </li>
           <li class="nav-item">
             <a class="nav-link {% if 'control' in request.path %}active{% endif %}"
-               href="{{ url_for('index') }}">Steuerung</a>
+               href="{{ url_for('main.index') }}">Steuerung</a>
           </li>
           <li class="nav-item">
             <a class="nav-link {% if 'admin' in request.path %}active{% endif %}"
-               href="{{ url_for('admin') }}">Admin</a>
+               href="{{ url_for('admin.admin') }}">Admin</a>
           </li>
           <li class="nav-item">
             <a class="nav-link {% if 'soundboard' in request.path %}active{% endif %}"
diff --git a/templates/index.html b/templates/index.html
index bf23768..88c01fc 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -42,12 +42,12 @@
   {% else %}
     <div class="alert alert-info text-center my-5">
       <h4>Noch keine Konfigurationen vorhanden</h4>
-      <p>Lege im <code>configs/</code>-Ordner JSON-Dateien an oder gehe zum <a href="{{ url_for('admin') }}">Admin-Bereich</a>.</p>
+      <p>Lege im <code>configs/</code>-Ordner JSON-Dateien an oder gehe zum <a href="{{ url_for('admin.admin') }}">Admin-Bereich</a>.</p>
     </div>
   {% endif %}
 
   <div class="text-center mt-5">
-    <a href="{{ url_for('admin') }}" class="btn btn-outline-secondary">
+    <a href="{{ url_for('admin.admin') }}" class="btn btn-outline-secondary">
       <i class="bi bi-gear me-2"></i>Admin-Bereich
     </a>
   </div>
diff --git a/templates/soundboard.html b/templates/soundboard.html
index d72190c..76d12ee 100644
--- a/templates/soundboard.html
+++ b/templates/soundboard.html
@@ -33,7 +33,7 @@
   {% endif %}
 
   <div class="mt-5 text-center">
-    <a href="{{ url_for('control_page') }}" class="btn btn-secondary">Zurück zur Steuerung</a>
+    <a href="{{ url_for('main.control_page') }}" class="btn btn-secondary">Zurück zur Steuerung</a>
   </div>
 </div>