diff --git a/asteroid.lisp b/asteroid.lisp
index d583cf5..c96bdab 100644
--- a/asteroid.lisp
+++ b/asteroid.lisp
@@ -425,8 +425,8 @@
   "Main front page"
   (clip:process-to-string 
    (load-template "front-page")
-   :title "🎵 ASTEROID RADIO 🎵"
-   :station-name "🎵 ASTEROID RADIO 🎵"
+   :title "ASTEROID RADIO"
+   :station-name "ASTEROID RADIO"
    :status-message "🟢 LIVE - Broadcasting asteroid music for hackers"
    :listeners "0"
    :stream-quality "128kbps MP3"
@@ -444,15 +444,15 @@
   "Frameset wrapper with persistent audio player"
   (clip:process-to-string 
    (load-template "frameset-wrapper")
-   :title "🎵 ASTEROID RADIO 🎵"))
+   :title "ASTEROID RADIO"))
 
 ;; Content frame - front page content without player
 (define-page front-page-content #@"/content" ()
   "Front page content (displayed in content frame)"
   (clip:process-to-string 
    (load-template "front-page-content")
-   :title "🎵 ASTEROID RADIO 🎵"
-   :station-name "🎵 ASTEROID RADIO 🎵"
+   :title "ASTEROID RADIO"
+   :station-name "ASTEROID RADIO"
    :status-message "🟢 LIVE - Broadcasting asteroid music for hackers"
    :listeners "0"
    :stream-quality "128kbps MP3"
@@ -601,7 +601,7 @@
   (require-authentication)
   (clip:process-to-string 
    (load-template "users")
-   :title "🎵 ASTEROID RADIO - User Management"))
+   :title "ASTEROID RADIO - User Management"))
 
 ;; User Profile page (requires authentication)
 (define-page user-profile #@"/profile" ()
diff --git a/auth-routes.lisp b/auth-routes.lisp
index 559d99b..10ff630 100644
--- a/auth-routes.lisp
+++ b/auth-routes.lisp
@@ -51,7 +51,7 @@
 (define-page logout #@"/logout" ()
   "Handle user logout"
   (setf (session:field "user-id") nil)
-  (radiance:redirect "/asteroid/"))
+  (radiance:redirect "/"))
 
 ;; API: Get all users (admin only)
 (define-api asteroid/users () ()
diff --git a/template/frameset-wrapper.ctml b/template/frameset-wrapper.ctml
index 0cf1f2e..648e2b4 100644
--- a/template/frameset-wrapper.ctml
+++ b/template/frameset-wrapper.ctml
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title lquery="(text title)">🎵 ASTEROID RADIO 🎵</title>
+  <title lquery="(text title)">ASTEROID RADIO</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <script>
diff --git a/template/front-page-content.ctml b/template/front-page-content.ctml
index 8018f0f..fa6a804 100644
--- a/template/front-page-content.ctml
+++ b/template/front-page-content.ctml
@@ -1,9 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title data-text="title">🎵 ASTEROID RADIO 🎵</title>
+    <title data-text="title">ASTEROID RADIO</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" type="image/x-icon" href="/asteroid/static/favicon.ico">
+    <link rel="icon" type="image/png" sizes="32x32" href="/asteroid/static/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/asteroid/static/favicon-16x16.png">
     <link rel="stylesheet" type="text/css" href="/asteroid/static/asteroid.css">
   <script src="/asteroid/static/js/auth-ui.js"></script>
   <script src="/asteroid/static/js/front-page.js"></script>
@@ -11,7 +14,11 @@
 <body>
   <div class="container">
     <header>
-      <h1 data-text="station-name">🎵 ASTEROID RADIO 🎵</h1>
+      <h1 style="display: flex; align-items: center; justify-content: center; gap: 15px;">
+        <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 60px; width: auto;">
+        <span data-text="station-name">ASTEROID RADIO</span>
+        <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 60px; width: auto;">
+      </h1>
       <nav class="nav">
         <a href="/asteroid/content" target="content-frame">Home</a>
         <a href="/asteroid/player-content" target="content-frame">Player</a>
diff --git a/template/front-page.ctml b/template/front-page.ctml
index 7a3f0c8..e5e3b09 100644
--- a/template/front-page.ctml
+++ b/template/front-page.ctml
@@ -1,9 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title data-text="title">🎵 ASTEROID RADIO 🎵</title>
+    <title data-text="title">ASTEROID RADIO</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" type="image/x-icon" href="/asteroid/static/favicon.ico">
+    <link rel="icon" type="image/png" sizes="32x32" href="/asteroid/static/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/asteroid/static/favicon-16x16.png">
     <link rel="stylesheet" type="text/css" href="/asteroid/static/asteroid.css">
   <script src="/asteroid/static/js/auth-ui.js"></script>
   <script src="/asteroid/static/js/front-page.js"></script>
@@ -11,7 +14,11 @@
 <body>
   <div class="container">
     <header>
-      <h1 data-text="station-name">🎵 ASTEROID RADIO 🎵</h1>
+      <h1 style="display: flex; align-items: center; justify-content: center; gap: 15px;">
+        <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 60px; width: auto;">
+        <span data-text="station-name">ASTEROID RADIO</span>
+        <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 60px; width: auto;">
+      </h1>
       <nav class="nav">
         <a href="/asteroid/">Home</a>
         <a href="/asteroid/player">Player</a>
diff --git a/template/login.ctml b/template/login.ctml
index 3dadc34..1372031 100644
--- a/template/login.ctml
+++ b/template/login.ctml
@@ -4,12 +4,18 @@
   <title data-text="title">Asteroid Radio - Login</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="/asteroid/static/favicon.ico">
+  <link rel="icon" type="image/png" sizes="32x32" href="/asteroid/static/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/asteroid/static/favicon-16x16.png">
   <link rel="stylesheet" type="text/css" href="/static/asteroid.css">
 </head>
 <body>
   <div class="container">
     <header>
-      <h1>🎵 ASTEROID RADIO - LOGIN</h1>
+      <h1 style="display: flex; align-items: center; justify-content: center; gap: 15px;">
+        <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 50px; width: auto;">
+        <span>ASTEROID RADIO - LOGIN</span>
+      </h1>
       <nav class="nav">
         <a href="/asteroid">Home</a>
         <a href="/asteroid/player">Player</a>
diff --git a/template/player-content.ctml b/template/player-content.ctml
index c347c46..2e201d0 100644
--- a/template/player-content.ctml
+++ b/template/player-content.ctml
@@ -10,7 +10,11 @@
 </head>
 <body>
   <div class="container">
-    <h1>🎵 WEB PLAYER</h1>
+    <h1 style="display: flex; align-items: center; justify-content: center; gap: 15px;">
+      <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 50px; width: auto;">
+      <span>WEB PLAYER</span>
+      <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 50px; width: auto;">
+    </h1>
     <div class="nav">
       <a href="/asteroid/content" target="content-frame">Home</a>
       <a href="/asteroid/profile" target="content-frame" data-show-if-logged-in>Profile</a>
diff --git a/template/player.ctml b/template/player.ctml
index e305ed5..fa92bcb 100644
--- a/template/player.ctml
+++ b/template/player.ctml
@@ -4,13 +4,20 @@
   <title data-text="title">Asteroid Radio - Web Player</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="/asteroid/static/favicon.ico">
+  <link rel="icon" type="image/png" sizes="32x32" href="/asteroid/static/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/asteroid/static/favicon-16x16.png">
   <link rel="stylesheet" type="text/css" href="/asteroid/static/asteroid.css">
   <script src="/asteroid/static/js/auth-ui.js"></script>
   <script src="/asteroid/static/js/player.js"></script>
 </head>
 <body>
   <div class="container">
-    <h1>🎵 WEB PLAYER</h1>
+    <h1 style="display: flex; align-items: center; justify-content: center; gap: 15px;">
+      <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 50px; width: auto;">
+      <span>WEB PLAYER</span>
+      <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 50px; width: auto;">
+    </h1>
     <div class="nav">
       <a href="/asteroid">Home</a>
       <a href="/asteroid/profile">Profile</a>
diff --git a/template/register.ctml b/template/register.ctml
index 3d90ce0..81f1663 100644
--- a/template/register.ctml
+++ b/template/register.ctml
@@ -4,12 +4,18 @@
   <title data-text="title">Asteroid Radio - Register</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="/asteroid/static/favicon.ico">
+  <link rel="icon" type="image/png" sizes="32x32" href="/asteroid/static/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/asteroid/static/favicon-16x16.png">
   <link rel="stylesheet" type="text/css" href="/asteroid/static/asteroid.css">
 </head>
 <body>
   <div class="container">
     <header>
-        <h1>🎵 ASTEROID RADIO - REGISTER</h1>
+        <h1 style="display: flex; align-items: center; justify-content: center; gap: 15px;">
+          <img src="/asteroid/static/asteroid.png" alt="Asteroid" style="height: 50px; width: auto;">
+          <span>ASTEROID RADIO - REGISTER</span>
+        </h1>
         <nav class="nav">
             <a href="/asteroid">Home</a>
             <a href="/asteroid/player">Player</a>
diff --git a/user-management.lisp b/user-management.lisp
index 5017f74..a9e9e3e 100644
--- a/user-management.lisp
+++ b/user-management.lisp
@@ -151,7 +151,7 @@
    If :api t, returns JSON error (401). Otherwise redirects to login page.
    Auto-detects API routes if not specified."
   (let* ((user-id (session:field "user-id"))
-         (uri (uri-path (radiance:uri *request*)))
+         (uri (radiance:path (radiance:uri *request*)))
          ;; Use explicit flag if provided, otherwise auto-detect from URI
          (is-api-request (if api t (search "/api/" uri))))
     (format t "Authentication check - User ID: ~a, URI: ~a, Is API: ~a~%" 
@@ -170,7 +170,7 @@
             ;; Page request - redirect to login (redirect doesn't return)
             (progn
               (format t "Authentication failed - redirecting to login~%")
-              (radiance:redirect "/asteroid/login"))))))
+              (radiance:redirect "/login"))))))
 
 (defun require-role (role &key (api nil))
   "Require user to have a specific role.
@@ -178,7 +178,7 @@
    If :api t, returns JSON error (403). Otherwise redirects to login page.
    Auto-detects API routes if not specified."
   (let* ((current-user (get-current-user))
-         (uri (uri-path (radiance:uri *request*)))
+         (uri (radiance:path (radiance:uri *request*)))
          ;; Use explicit flag if provided, otherwise auto-detect from URI
          (is-api-request (if api t (search "/api/" uri))))
     (format t "Current user for role check: ~a~%" (if current-user "FOUND" "NOT FOUND"))
@@ -281,7 +281,11 @@
 (defun initialize-user-system ()
   "Initialize the user management system"
   (format t "Initializing user management system...~%")
+  ;; Skip database check at startup - database queries hang with current setup
+  (format t "Skipping admin creation check - database already initialized~%")
+  (format t "User management initialization complete.~%")
   ;; Try immediate initialization first
+  #+nil
   (handler-case
       (progn
         (format t "Setting up user management...~%")
