diff --git a/nginx.conf b/nginx.conf
index 88e3709..cac9099 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -37,9 +37,14 @@ http {
             try_files $uri =404;
         }
 
+        # Serve HTML files without .html extension (e.g., /admin -> admin.html)
+        location ~ ^/([a-zA-Z0-9_-]+)$ {
+            try_files /$1.html =404;
+        }
+
         # Serve static files
         location / {
-            try_files $uri $uri/ /index.html;
+            try_files $uri $uri/ =404;
             # Apply X-Frame-Options to other files
             add_header X-Frame-Options "SAMEORIGIN" always;
         }
diff --git a/web/admin.html b/web/admin.html
index 06c4173..8c684c8 100644
--- a/web/admin.html
+++ b/web/admin.html
@@ -22,7 +22,7 @@
             <button class="btn btn-info" onclick="openBookInModal()">
                 🛬 Book In
             </button>
-            <button class="btn btn-primary" onclick="window.open('reports.html', '_blank')">
+            <button class="btn btn-primary" onclick="window.location.href = '/reports'">
                 📊 Reports
             </button>
             <button class="btn btn-warning" onclick="openUserManagementModal()" id="user-management-btn" style="display: none;">
diff --git a/web/reports.html b/web/reports.html
index ab1ca5f..80c3690 100644
--- a/web/reports.html
+++ b/web/reports.html
@@ -317,7 +317,7 @@
             <h1>📊 PPR Reports</h1>
         </div>
         <div class="menu-buttons">
-            <button class="btn btn-secondary" onclick="window.location.href='admin.html'">
+            <button class="btn btn-secondary" onclick="window.location.href='admin'">
                 ← Back to Admin
             </button>
         </div>
@@ -466,7 +466,7 @@
             }
 
             // No valid cached token, redirect to admin
-            window.location.href = 'admin.html';
+            window.location.href = 'admin';
         }
 
         function logout() {
@@ -475,13 +475,13 @@
             localStorage.removeItem('ppr_token_expiry');
             accessToken = null;
             currentUser = null;
-            window.location.href = 'admin.html';
+            window.location.href = 'admin';
         }
 
         // Enhanced fetch wrapper with token expiry handling
         async function authenticatedFetch(url, options = {}) {
             if (!accessToken) {
-                window.location.href = 'admin.html';
+                window.location.href = 'admin';
                 throw new Error('No access token available');
             }