diff --git a/app/Livewire/Layout/Navigation.php b/app/Livewire/Layout/Navigation.php
index 584bd8a..6736a5b 100644
--- a/app/Livewire/Layout/Navigation.php
+++ b/app/Livewire/Layout/Navigation.php
@@ -7,18 +7,31 @@ use App\Livewire\Actions\Logout;
 
 class Navigation extends Component
 {
-    // 菜單列表
-    public array $menus = [
+    private array $commonMenus = [
         ['name' => '首頁', 'route' => 'welcome'],
         ['name' => '新歌快報', 'route' => 'new-songs'],
         ['name' => '熱門排行', 'route' => 'top-ranking'],
         ['name' => '歌名查詢', 'route' => 'search-song'],
+    ];
+    private array $roomMenus = [
         ['name' => '已點歌曲', 'route' => 'clicked-song'],
         ['name' => '聲音控制', 'route' => 'sound-control'],
         ['name' => '社群媒體', 'route' => 'social-media'],
         ['name' => '真情告白', 'route' => 'love-message'],
         ['name' => '心情貼圖', 'route' => 'mood-stickers'],
     ];
+    public array $menus = [];
+
+    public function mount()
+    {
+        // 先放共用的
+        $this->menus = $this->commonMenus;
+
+        // 如果有 room_code，再合併
+        if (session()->has('room_code')) {
+            $this->menus = array_merge($this->menus, $this->roomMenus);
+        }
+    }
 
     public function logout(Logout $logout)
     {
diff --git a/app/Livewire/Pages/Home.php b/app/Livewire/Pages/Home.php
new file mode 100644
index 0000000..455b969
--- /dev/null
+++ b/app/Livewire/Pages/Home.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Livewire\Pages;
+
+use Livewire\Component;
+
+class Home extends Component
+{
+    public $roomCode;
+
+    public function mount()
+    {
+        // 先從 URL 取得 room_code，再存進 session
+        session()->forget('room_code');
+        $this->roomCode = request()->query('room_code', session('room_code', null));
+        if ($this->roomCode) {
+            session(['room_code' => $this->roomCode]);
+        }
+    }
+
+    public function render()
+    {
+        return view('livewire.pages.home');
+    }
+}
diff --git a/resources/views/livewire/pages/home.blade.php b/resources/views/livewire/pages/home.blade.php
new file mode 100644
index 0000000..613e683
--- /dev/null
+++ b/resources/views/livewire/pages/home.blade.php
@@ -0,0 +1,15 @@
+<div class="py-12 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
+    <div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-6">
+        
+        <x-button.flat-card image="{{ asset('手機點歌/首頁-新歌快報.png') }}" href="{{ route('new-songs') }}"  />
+        <x-button.flat-card image="{{ asset('手機點歌/首頁-熱門排行.png') }}" href="{{ route('top-ranking') }}"  />
+        <x-button.flat-card image="{{ asset('手機點歌/首頁-歌名查詢.png') }}" href="{{ route('search-song') }}" />
+        @if($roomCode)
+        <x-button.flat-card image="{{ asset('手機點歌/首頁-已點歌曲.png') }}" onclick="orderSongAndNavigate()" />
+        <x-button.flat-card image="{{ asset('手機點歌/首頁-聲音控制.png') }}" href="{{ route('sound-control') }}" />
+        <x-button.flat-card image="{{ asset('手機點歌/首頁-社群媒體.png') }}" href="{{ route('social-media') }}" />
+        <x-button.flat-card image="{{ asset('手機點歌/首頁-真情告白.png') }}" href="{{ route('love-message') }}" />
+        <x-button.flat-card image="{{ asset('手機點歌/首頁-心情貼圖.png') }}" href="{{ route('mood-stickers') }}" />
+        @endif
+    </div>
+</div>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index bff00fa..c928255 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1,21 +1,10 @@
 <x-app-layout>
-  <x-slot name="header">
-      <div class="header">超級巨星 自助式KTV</div>
-      <div class="banner">
-          <img src="{{ asset('手機點歌/LOGO_721x211px.png') }}" alt="超級巨星 Banner">
-      </div>
-  </x-slot>
+    <x-slot name="header">
+        <div class="header">超級巨星 自助式KTV</div>
+        <div class="banner">
+            <img src="{{ asset('手機點歌/LOGO_721x211px.png') }}" alt="超級巨星 Banner">
+        </div>
+    </x-slot>
 
-<div class="py-12 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-    <div class="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-6">
-        <x-button.flat-card image="{{ asset('手機點歌/首頁-新歌快報.png') }}" href="{{ route('new-songs') }}"  />
-        <x-button.flat-card image="{{ asset('手機點歌/首頁-熱門排行.png') }}" href="{{ route('top-ranking') }}"  />
-        <x-button.flat-card image="{{ asset('手機點歌/首頁-歌名查詢.png') }}" href="{{ route('search-song') }}" />
-        <x-button.flat-card image="{{ asset('手機點歌/首頁-已點歌曲.png') }}" onclick="orderSongAndNavigate()" />
-        <x-button.flat-card image="{{ asset('手機點歌/首頁-聲音控制.png') }}" href="{{ route('sound-control') }}" />
-        <x-button.flat-card image="{{ asset('手機點歌/首頁-社群媒體.png') }}" href="{{ route('social-media') }}" />
-        <x-button.flat-card image="{{ asset('手機點歌/首頁-真情告白.png') }}" href="{{ route('love-message') }}" />
-        <x-button.flat-card image="{{ asset('手機點歌/首頁-心情貼圖.png') }}" href="{{ route('mood-stickers') }}" />
-    </div>
-</div>
+    <livewire:pages.home />
 </x-app-layout>
\ No newline at end of file