diff --git a/template/admin.chtml b/template/admin.chtml
index 0b72c9b..f903d11 100644
--- a/template/admin.chtml
+++ b/template/admin.chtml
@@ -12,8 +12,8 @@
   <div class="container">
     <h1>🎛️ ADMIN DASHBOARD</h1>
     <div class="nav">
-      <a href="/asteroid/">← Back to Main</a>
-      <a href="/asteroid/player/">Web Player</a>
+      <a href="/asteroid/">Home</a>
+      <a href="/asteroid/player/">Player</a>
       <a href="/asteroid/profile">Profile</a>
       <a href="/asteroid/admin/users">👥 Users</a>
       <a href="/asteroid/logout" class="btn-logout">Logout</a>
diff --git a/template/front-page.chtml b/template/front-page.chtml
index df13e02..2864a43 100644
--- a/template/front-page.chtml
+++ b/template/front-page.chtml
@@ -15,9 +15,9 @@
       <nav class="nav">
         <a href="/asteroid/">Home</a>
         <a href="/asteroid/player">Player</a>
+        <a href="/asteroid/status">Status</a>
         <a href="/asteroid/profile" data-show-if-logged-in>Profile</a>
         <a href="/asteroid/admin" data-show-if-admin>Admin</a>
-        <a href="/asteroid/status">Status</a>
         <a href="/asteroid/login" data-show-if-logged-out>Login</a>
         <a href="/asteroid/register" data-show-if-logged-out>Register</a>
         <a href="/asteroid/logout" data-show-if-logged-in class="btn-logout">Logout</a>
diff --git a/template/login.chtml b/template/login.chtml
index e20f416..7c315c2 100644
--- a/template/login.chtml
+++ b/template/login.chtml
@@ -8,7 +8,16 @@
 </head>
 <body>
   <div class="container">
-    <h1>🎵 ASTEROID RADIO - LOGIN</h1>
+    <header>
+      <h1>🎵 ASTEROID RADIO - LOGIN</h1>
+      <nav class="nav">
+        <a href="/asteroid/">Home</a>
+        <a href="/asteroid/player">Player</a>
+        <a href="/asteroid/status">Status</a>
+        <a href="/asteroid/register">Register</a>
+      </nav>
+    </header>
+
     <div class="auth-container">
       <div class="auth-form">
         <h2>System Access</h2>
diff --git a/template/player.chtml b/template/player.chtml
index 17db19c..8c08528 100644
--- a/template/player.chtml
+++ b/template/player.chtml
@@ -12,9 +12,11 @@
   <div class="container">
     <h1>🎵 WEB PLAYER</h1>
     <div class="nav">
-      <a href="/asteroid/">← Back to Main</a>
+      <a href="/asteroid/">Home</a>
       <a href="/asteroid/profile" data-show-if-logged-in>Profile</a>
-      <a href="/asteroid/admin" data-show-if-admin>Admin Dashboard</a>
+      <a href="/asteroid/admin" data-show-if-admin>Admin</a>
+      <a href="/asteroid/login" data-show-if-logged-out>Login</a>
+      <a href="/asteroid/register" data-show-if-logged-out>Register</a>
       <a href="/asteroid/logout" data-show-if-logged-in class="btn-logout">Logout</a>
     </div>
     
diff --git a/template/profile.chtml b/template/profile.chtml
index 15412d7..5398903 100644
--- a/template/profile.chtml
+++ b/template/profile.chtml
@@ -12,8 +12,8 @@
   <div class="container">
     <h1>👤 USER PROFILE</h1>
     <div class="nav">
-      <a href="/asteroid/">← Back to Main</a>
-      <a href="/asteroid/player/">Web Player</a>
+      <a href="/asteroid/">Home</a>
+      <a href="/asteroid/player/">Player</a>
       <a href="/asteroid/admin/" data-show-if-admin>Admin</a>
       <a href="/asteroid/logout" class="btn-logout">Logout</a>
     </div>
diff --git a/template/register.chtml b/template/register.chtml
index 7e0c5cf..95ba65f 100644
--- a/template/register.chtml
+++ b/template/register.chtml
@@ -8,12 +8,16 @@
 </head>
 <body>
   <div class="container">
-    <h1>🎵 ASTEROID RADIO - REGISTER</h1>
-    <div class="nav">
-      <a href="/asteroid/">← Back to Main</a>
-      <a href="/asteroid/login">Login</a>
-    </div>
-    
+    <header>
+        <h1>🎵 ASTEROID RADIO - REGISTER</h1>
+        <nav class="nav">
+            <a href="/asteroid/">Home</a>
+            <a href="/asteroid/player">Player</a>
+            <a href="/asteroid/status">Status</a>
+            <a href="/asteroid/login">Login</a>
+        </nav>
+    </header>
+
     <div class="auth-container">
       <div class="auth-form">
         <h2>Create Account</h2>
diff --git a/template/users.chtml b/template/users.chtml
index e96d19f..bd63584 100644
--- a/template/users.chtml
+++ b/template/users.chtml
@@ -11,8 +11,9 @@
   <div class="container">
     <h1>👥 USER MANAGEMENT</h1>
     <div class="nav">
-      <a href="/asteroid/admin">← Back to Admin</a>
       <a href="/asteroid/">Home</a>
+      <a href="/asteroid/admin">Admin</a>
+      <a href="/asteroid/logout" class="btn-logout">Logout</a>
     </div>
     
     <!-- User Statistics -->
