diff --git a/app/Livewire/Layout/Navigation.php b/app/Livewire/Layout/Navigation.php
index 6e05c8b..7145e38 100644
--- a/app/Livewire/Layout/Navigation.php
+++ b/app/Livewire/Layout/Navigation.php
@@ -39,7 +39,7 @@ class Navigation extends Component
         if (session()->has('room_code')) {
             $this->menus = array_merge($this->menus, $this->roomMenus);
         }
-        if (auth()->check()) {
+        if (auth()->check() && !auth()->user()->hasRole('User')) {
             $user = auth()->user();
             foreach ($this->adminmenus as $menu) 
                 if (!$menu['permission'] || $user->can($menu['permission'])) 
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
deleted file mode 100644
index 66028f2..0000000
--- a/resources/views/dashboard.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<x-app-layout>
-    <x-slot name="header">
-        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('Dashboard') }}
-        </h2>
-    </x-slot>
-
-    <div class="py-12">
-        <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
-            <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
-                <div class="p-6 text-gray-900">
-                    {{ __("You're logged in!") }}
-                </div>
-            </div>
-        </div>
-    </div>
-</x-app-layout>
diff --git a/resources/views/clicked-song.blade.php b/resources/views/livewire/app/clicked-song.blade.php
similarity index 100%
rename from resources/views/clicked-song.blade.php
rename to resources/views/livewire/app/clicked-song.blade.php
diff --git a/resources/views/love-message.blade.php b/resources/views/livewire/app/love-message.blade.php
similarity index 100%
rename from resources/views/love-message.blade.php
rename to resources/views/livewire/app/love-message.blade.php
diff --git a/resources/views/new-songs.blade.php b/resources/views/livewire/app/new-songs.blade.php
similarity index 100%
rename from resources/views/new-songs.blade.php
rename to resources/views/livewire/app/new-songs.blade.php
diff --git a/resources/views/profile.blade.php b/resources/views/livewire/app/profile.blade.php
similarity index 89%
rename from resources/views/profile.blade.php
rename to resources/views/livewire/app/profile.blade.php
index 57a01b1..cd7b6b1 100644
--- a/resources/views/profile.blade.php
+++ b/resources/views/livewire/app/profile.blade.php
@@ -1,8 +1,6 @@
 <x-app-layout>
     <x-slot name="header">
-        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('Profile') }}
-        </h2>
+        <div class="header">超級巨星 自助式KTV</div>
     </x-slot>
 
     <div class="py-12">
diff --git a/resources/views/search-song.blade.php b/resources/views/livewire/app/search-song.blade.php
similarity index 100%
rename from resources/views/search-song.blade.php
rename to resources/views/livewire/app/search-song.blade.php
diff --git a/resources/views/sound-control.blade.php b/resources/views/livewire/app/sound-control.blade.php
similarity index 100%
rename from resources/views/sound-control.blade.php
rename to resources/views/livewire/app/sound-control.blade.php
diff --git a/resources/views/top-ranking.blade.php b/resources/views/livewire/app/top-ranking.blade.php
similarity index 100%
rename from resources/views/top-ranking.blade.php
rename to resources/views/livewire/app/top-ranking.blade.php
diff --git a/resources/views/welcome.blade.php b/resources/views/livewire/app/welcome.blade.php
similarity index 100%
rename from resources/views/welcome.blade.php
rename to resources/views/livewire/app/welcome.blade.php
diff --git a/routes/web.php b/routes/web.php
index 43e8100..6826488 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -6,33 +6,29 @@ use App\Livewire\Admin\Dashboard as AdminDashboard;
 
 
 //Route::redirect('/', '/login');
-Route::view('/', 'welcome');
+Route::view('/', 'livewire.app.welcome');
+Route::view('/welcome', 'livewire.app.welcome')->name('welcome');
+Route::view('/new-songs', 'livewire.app.new-songs')->name('new-songs');
+Route::view('/top-ranking', 'livewire.app.top-ranking')->name('top-ranking');
+Route::view('/search-song', 'livewire.app.search-song')->name('search-song');
+Route::view('/clicked-song', 'livewire.app.clicked-song')->name('clicked-song');
+Route::view('/sound-control', 'livewire.app.sound-control')->name('sound-control');
+Route::view('/love-message', 'livewire.app.love-message')->name('love-message');
 
-Route::view('/welcome', 'welcome')->name('welcome');
-Route::view('/new-songs', 'new-songs')->name('new-songs');
-Route::view('/top-ranking', 'top-ranking')->name('top-ranking');
-Route::view('/search-song', 'search-song')->name('search-song');
-Route::view('/clicked-song', 'clicked-song')->name('clicked-song');
-Route::view('/sound-control', 'sound-control')->name('sound-control');
-Route::view('/love-message', 'love-message')->name('love-message');
+Route::middleware(['auth'])->group(function () {
+    // Profile
+    //Route::view('profile', 'livewire.app.profile')->name('profile');
 
-//Route::view('dashboard', 'dashboard')
-//    ->middleware(['auth', 'verified'])
-//.   ->name('dashboard');
-
-Route::view('profile', 'profile')
-    ->middleware(['auth'])
-    ->name('profile');
-
-require __DIR__.'/auth.php';
-
-Route::middleware(['auth'])->prefix('admin')->name('admin.')->group(function () {
-    Route::get('/activity-log', function () {return view('livewire.admin.activity-log');})->name('activity-log');
-    Route::get('/room-status-log', function () {return view('livewire.admin.room-status-log');})->name('room-status-log');
-    Route::get('/machine-status', function () {return view('livewire.admin.machine-status');})->name('machine-status');
-    Route::get('/users', function () {return view('livewire.admin.users');})->name('users');
-    Route::get('/rooms', function () {return view('livewire.admin.rooms');})->name('rooms'); 
-    Route::get('/room-grids', function () {return view('livewire.admin.room-grids');})->name('room-grids'); 
-    Route::get('/text-ads', function () {return view('livewire.admin.text-ads');})->name('text-ads'); 
-    Route::get('/broadcast-templates', function () {return view('livewire.admin.broadcast-templates');})->name('broadcast-templates'); 
-});
\ No newline at end of file
+    // Admin
+    Route::prefix('admin')->name('admin.')->group(function () {
+        Route::view('/activity-log', 'livewire.admin.activity-log')->name('activity-log');
+        Route::view('/room-status-log', 'livewire.admin.room-status-log')->name('room-status-log');
+        Route::view('/machine-status', 'livewire.admin.machine-status')->name('machine-status');
+        Route::view('/rooms', 'livewire.admin.rooms')->name('rooms'); 
+        Route::view('/room-grids', 'livewire.admin.room-grids')->name('room-grids'); 
+        Route::view('/users', 'livewire.admin.users')->name('users');
+        Route::view('/text-ads', 'livewire.admin.text-ads')->name('text-ads'); 
+        Route::view('/broadcast-templates', 'livewire.admin.broadcast-templates')->name('broadcast-templates'); 
+    });
+});
+require __DIR__.'/auth.php';
\ No newline at end of file