diff --git a/src/main/java/org/rostislav/quickdrop/controller/AdminViewController.java b/src/main/java/org/rostislav/quickdrop/controller/AdminViewController.java
index de956d4..c8efc4c 100644
--- a/src/main/java/org/rostislav/quickdrop/controller/AdminViewController.java
+++ b/src/main/java/org/rostislav/quickdrop/controller/AdminViewController.java
@@ -46,7 +46,7 @@ public class AdminViewController {
         AnalyticsDataView analytics = analyticsService.getAnalytics();
         model.addAttribute("analytics", analytics);
 
-        return "admin/dashboard";
+        return "dashboard";
     }
 
     @GetMapping("/setup")
@@ -97,12 +97,12 @@ public class AdminViewController {
             request.getSession().setAttribute("adminPassword", adminPasswordHash);
             return "redirect:/admin/dashboard";
         } else {
-            return "redirect:/admin/admin-password";
+            return "redirect:/admin/password";
         }
     }
 
     @GetMapping("/password")
     public String showAdminPasswordPage() {
-        return "/admin/admin-password";
+        return "/admin-password";
     }
 }
diff --git a/src/main/resources/templates/admin/admin-password.html b/src/main/resources/templates/admin-password.html
similarity index 100%
rename from src/main/resources/templates/admin/admin-password.html
rename to src/main/resources/templates/admin-password.html
diff --git a/src/main/resources/templates/admin/dashboard.html b/src/main/resources/templates/dashboard.html
similarity index 98%
rename from src/main/resources/templates/admin/dashboard.html
rename to src/main/resources/templates/dashboard.html
index 8f6eff7..b9fd9bd 100644
--- a/src/main/resources/templates/admin/dashboard.html
+++ b/src/main/resources/templates/dashboard.html
@@ -10,7 +10,7 @@
 <!-- Navbar -->
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container">
-        <a class="navbar-brand" href="/">
+        <a class="navbar-brand" href="/static">
             <img alt="QuickDrop Logo" class="me-2" height="40" src="/images/favicon.png">
             QuickDrop Admin
         </a>
@@ -24,7 +24,7 @@
                     <a class="nav-link" href="/admin/settings">Settings</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/">Home</a>
+                    <a class="nav-link" href="/static">Home</a>
                 </li>
             </ul>
         </div>
diff --git a/src/main/resources/templates/admin/download-history.html b/src/main/resources/templates/download-history.html
similarity index 98%
rename from src/main/resources/templates/admin/download-history.html
rename to src/main/resources/templates/download-history.html
index 60c6105..1a79d44 100644
--- a/src/main/resources/templates/admin/download-history.html
+++ b/src/main/resources/templates/download-history.html
@@ -38,7 +38,7 @@
 <!-- Navbar -->
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container">
-        <a class="navbar-brand" href="/">
+        <a class="navbar-brand" href="/static">
             <img alt="QuickDrop Logo" class="me-2" height="40" src="/images/favicon.png">
             QuickDrop Admin
         </a>
diff --git a/src/main/resources/templates/admin/settings.html b/src/main/resources/templates/settings.html
similarity index 98%
rename from src/main/resources/templates/admin/settings.html
rename to src/main/resources/templates/settings.html
index 7c7b9d2..73a1317 100644
--- a/src/main/resources/templates/admin/settings.html
+++ b/src/main/resources/templates/settings.html
@@ -9,7 +9,7 @@
 <!-- Navbar -->
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container">
-        <a class="navbar-brand" href="/">
+        <a class="navbar-brand" href="/static">
             <img alt="QuickDrop Logo" class="me-2" height="40" src="/images/favicon.png">
             QuickDrop Admin
         </a>