diff --git a/app/Livewire/Grids/RoomGrid.php b/app/Livewire/Grids/RoomGrid.php
index 2e772f6..72f6ee2 100644
--- a/app/Livewire/Grids/RoomGrid.php
+++ b/app/Livewire/Grids/RoomGrid.php
@@ -38,6 +38,7 @@ class RoomGrid extends Component
         $this->rooms = Room::where('branch_id', $this->selectedBranchId)->orderBy('name')->get();
 
         $floors = $this->rooms->pluck('floor')->unique()->sort()->values()->toArray();
+        array_unshift($floors, 'all');
 
         return view('livewire.grids.room-grid', [
             'rooms' => $this->rooms,
diff --git a/app/Livewire/Forms/ImportDatas/Artist.php b/app/Livewire/ImportDatas/Artist.php
similarity index 96%
rename from app/Livewire/Forms/ImportDatas/Artist.php
rename to app/Livewire/ImportDatas/Artist.php
index 5d90ec7..4dc6d96 100644
--- a/app/Livewire/Forms/ImportDatas/Artist.php
+++ b/app/Livewire/ImportDatas/Artist.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\ImportDatas;
+namespace App\Livewire\ImportDatas;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
@@ -108,7 +108,7 @@ class Artist extends Component
 
     public function render()
     {
-        return view('livewire.forms.import-datas.artist');
+        return view('livewire.import-datas.artist');
     }
 
 }
\ No newline at end of file
diff --git a/app/Livewire/Forms/ImportDatas/Branch.php b/app/Livewire/ImportDatas/Branch.php
similarity index 96%
rename from app/Livewire/Forms/ImportDatas/Branch.php
rename to app/Livewire/ImportDatas/Branch.php
index c227e8e..90a445f 100644
--- a/app/Livewire/Forms/ImportDatas/Branch.php
+++ b/app/Livewire/ImportDatas/Branch.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\ImportDatas;
+namespace App\Livewire\ImportDatas;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
@@ -108,7 +108,7 @@ class Branch extends Component
 
     public function render()
     {
-        return view('livewire.forms.import-datas.branch');
+        return view('livewire.import-datas.branch');
     }
 
 }
\ No newline at end of file
diff --git a/app/Livewire/Forms/ImportDatas/Song.php b/app/Livewire/ImportDatas/Song.php
similarity index 96%
rename from app/Livewire/Forms/ImportDatas/Song.php
rename to app/Livewire/ImportDatas/Song.php
index 3b7459b..ca335e3 100644
--- a/app/Livewire/Forms/ImportDatas/Song.php
+++ b/app/Livewire/ImportDatas/Song.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Forms\ImportDatas;
+namespace App\Livewire\ImportDatas;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
@@ -108,7 +108,7 @@ class Song extends Component
 
     public function render()
     {
-        return view('livewire.forms.import-datas.song');
+        return view('livewire.import-datas.song');
     }
 
 }
\ No newline at end of file
diff --git a/app/Livewire/Tables/ActivityLogTable.php b/app/Livewire/Tables/ActivityLogTable.php
index 0144bd3..be6f638 100644
--- a/app/Livewire/Tables/ActivityLogTable.php
+++ b/app/Livewire/Tables/ActivityLogTable.php
@@ -44,7 +44,7 @@ final class ActivityLogTable extends PowerGridComponent
             ->showToggleColumns();
             //->showSoftDeletes()
             //->showSearchInput()
-        $header->includeViewOnTop('livewire.forms.headers.activity-log');
+        $header->includeViewOnTop('livewire.headers.activity-log');
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();     
         return $actions;
diff --git a/app/Livewire/Tables/ArtistTable.php b/app/Livewire/Tables/ArtistTable.php
index 71f66d4..486fdcd 100644
--- a/app/Livewire/Tables/ArtistTable.php
+++ b/app/Livewire/Tables/ArtistTable.php
@@ -63,7 +63,7 @@ final class ArtistTable extends PowerGridComponent
             //->showSoftDeletes()
             //->showSearchInput()
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.forms.headers.artist') ;
+            $header->includeViewOnTop('livewire.headers.artist') ;
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();     
diff --git a/app/Livewire/Tables/BranchTable.php b/app/Livewire/Tables/BranchTable.php
index ae7e7c1..e903b80 100644
--- a/app/Livewire/Tables/BranchTable.php
+++ b/app/Livewire/Tables/BranchTable.php
@@ -61,7 +61,7 @@ final class BranchTable extends PowerGridComponent
             //->showSoftDeletes()
             //->showSearchInput()
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.forms.headers.branch') ;
+            $header->includeViewOnTop('livewire.headers.branch') ;
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();
diff --git a/app/Livewire/Tables/RoleTable.php b/app/Livewire/Tables/RoleTable.php
index d8317ad..5c66b93 100644
--- a/app/Livewire/Tables/RoleTable.php
+++ b/app/Livewire/Tables/RoleTable.php
@@ -42,7 +42,7 @@ final class RoleTable extends PowerGridComponent
         $actions = [];
         $header =PowerGrid::header();
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.forms.headers.role');
+            $header->includeViewOnTop('livewire.headers.role');
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()
diff --git a/app/Livewire/Tables/RoomStatusLogTable.php b/app/Livewire/Tables/RoomStatusLogTable.php
index 1f597e0..a5a2735 100644
--- a/app/Livewire/Tables/RoomStatusLogTable.php
+++ b/app/Livewire/Tables/RoomStatusLogTable.php
@@ -28,7 +28,7 @@ final class RoomStatusLogTable extends PowerGridComponent
         $header = PowerGrid::header()
             ->withoutLoading()
             ->showToggleColumns();
-        $header->includeViewOnTop('livewire.forms.headers.room-status-log');
+        $header->includeViewOnTop('livewire.headers.room-status-log');
             
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();     
diff --git a/app/Livewire/Tables/RoomTable.php b/app/Livewire/Tables/RoomTable.php
index 92493c7..b2e23bf 100644
--- a/app/Livewire/Tables/RoomTable.php
+++ b/app/Livewire/Tables/RoomTable.php
@@ -18,6 +18,7 @@ use PowerComponents\LivewirePowerGrid\PowerGridComponent;
 use PowerComponents\LivewirePowerGrid\Traits\WithExport; 
 use PowerComponents\LivewirePowerGrid\Components\SetUp\Exportable; 
 use Livewire\Attributes\On;
+use Livewire\Attributes\Url;
 use WireUi\Traits\WireUiActions;
 
 final class RoomTable extends PowerGridComponent
@@ -26,6 +27,7 @@ final class RoomTable extends PowerGridComponent
     public string $tableName = 'room-table';
     public bool $canDownload;
     public bool $canDelect;
+    #[Url]
     public ?int $selectedBranchId = null;
     public ?string $external_ip= "";
 
@@ -54,7 +56,7 @@ final class RoomTable extends PowerGridComponent
         $header = PowerGrid::header()
             ->withoutLoading()
             ->showToggleColumns();
-        $header->includeViewOnTop('livewire.forms.headers.room');
+        $header->includeViewOnTop('livewire.headers.room');
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();     
         return $actions;
diff --git a/app/Livewire/Tables/SongTable.php b/app/Livewire/Tables/SongTable.php
index 83f2c73..801665f 100644
--- a/app/Livewire/Tables/SongTable.php
+++ b/app/Livewire/Tables/SongTable.php
@@ -59,7 +59,7 @@ final class SongTable extends PowerGridComponent
         }
         $header = PowerGrid::header()->showSoftDeletes()->showToggleColumns();
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.forms.headers.song');
+            $header->includeViewOnTop('livewire.headers.song');
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();
diff --git a/app/Livewire/Tables/TextAdsTable.php b/app/Livewire/Tables/TextAdsTable.php
index cfcb8ae..e0a07d3 100644
--- a/app/Livewire/Tables/TextAdsTable.php
+++ b/app/Livewire/Tables/TextAdsTable.php
@@ -53,7 +53,7 @@ final class TextAdsTable extends PowerGridComponent
         }
         $header = PowerGrid::header()->showSoftDeletes()->showToggleColumns();
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.forms.headers.text-ad');
+            $header->includeViewOnTop('livewire.headers.text-ad');
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();
diff --git a/app/Livewire/Tables/UserTable.php b/app/Livewire/Tables/UserTable.php
index 9d4267e..e57fc23 100644
--- a/app/Livewire/Tables/UserTable.php
+++ b/app/Livewire/Tables/UserTable.php
@@ -55,7 +55,7 @@ final class UserTable extends PowerGridComponent
         $header = PowerGrid::header()
             ->showToggleColumns();
         if($this->canCreate){
-            $header->includeViewOnTop('livewire.forms.headers.user');
+            $header->includeViewOnTop('livewire.headers.user');
         }
         $actions[]=$header;
         $actions[]=PowerGrid::footer()->showPerPage()->showRecordCount();
diff --git a/resources/views/livewire/admin/artists.blade.php b/resources/views/livewire/admin/artists.blade.php
index 53964dc..2362c14 100644
--- a/resources/views/livewire/admin/artists.blade.php
+++ b/resources/views/livewire/admin/artists.blade.php
@@ -3,5 +3,5 @@
     <x-wireui:notifications/>
     <livewire:tables.artist-table />
     <livewire:forms.artist-form />
-    <livewire:forms.import-datas.artist />
+    <livewire:import-datas.artist />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/branches.blade.php b/resources/views/livewire/admin/branches.blade.php
index c83fe74..f5d5c42 100644
--- a/resources/views/livewire/admin/branches.blade.php
+++ b/resources/views/livewire/admin/branches.blade.php
@@ -3,5 +3,5 @@
     <x-wireui:notifications/>
     <livewire:tables.branch-table />
     <livewire:forms.branch-form />
-    <livewire:forms.import-datas.branch />
+    <livewire:import-datas.branch />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/admin/songs.blade.php b/resources/views/livewire/admin/songs.blade.php
index e8effd8..4a15aa0 100644
--- a/resources/views/livewire/admin/songs.blade.php
+++ b/resources/views/livewire/admin/songs.blade.php
@@ -3,5 +3,5 @@
     <x-wireui:notifications/>
     <livewire:tables.song-table />
     <livewire:forms.song-form />
-    <livewire:forms.import-datas.song />
+    <livewire:import-datas.song />
 </x-layouts.admin>
\ No newline at end of file
diff --git a/resources/views/livewire/grids/room-grid.blade.php b/resources/views/livewire/grids/room-grid.blade.php
index e2b8f2f..f143a93 100644
--- a/resources/views/livewire/grids/room-grid.blade.php
+++ b/resources/views/livewire/grids/room-grid.blade.php
@@ -22,7 +22,7 @@
                     :class="floor === '{{ $fl }}' ? 'bg-blue-500 text-white' : 'bg-white text-gray-700'"
                     x-on:click="floor = '{{ $fl }}'"
                 >
-                    {{ $fl }}F
+                    {{ $fl === 'all' ? '全部' : $fl . '樓' }}
                 </button>
             @endforeach
         </div>
@@ -44,7 +44,7 @@
         <div wire:poll.5s>
             <div class="grid grid-cols-3 md:grid-cols-4 lg:grid-cols-6 gap-4">
                 @forelse($rooms as $room)
-                    <div x-show="floor == '{{ $room->floor }}' && (type == 'all' || type == '{{ $room->type }}')" x-transition class="transition-all duration-300">
+                    <div x-show="(floor == 'all' || floor == '{{ $room->floor }}') && (type == 'all' || type == '{{ $room->type }}')" x-transition class="transition-all duration-300">
                         @if($room->type->value === \App\Enums\RoomType::SVR->value)
                             <x-room-card-svr :room="$room" />
                         @else
diff --git a/resources/views/livewire/forms/headers/activity-log.blade.php b/resources/views/livewire/headers/activity-log.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/activity-log.blade.php
rename to resources/views/livewire/headers/activity-log.blade.php
diff --git a/resources/views/livewire/forms/headers/artist.blade.php b/resources/views/livewire/headers/artist.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/artist.blade.php
rename to resources/views/livewire/headers/artist.blade.php
diff --git a/resources/views/livewire/forms/headers/branch.blade.php b/resources/views/livewire/headers/branch.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/branch.blade.php
rename to resources/views/livewire/headers/branch.blade.php
diff --git a/resources/views/livewire/forms/headers/role.blade.php b/resources/views/livewire/headers/role.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/role.blade.php
rename to resources/views/livewire/headers/role.blade.php
diff --git a/resources/views/livewire/forms/headers/room-status-log.blade.php b/resources/views/livewire/headers/room-status-log.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/room-status-log.blade.php
rename to resources/views/livewire/headers/room-status-log.blade.php
diff --git a/resources/views/livewire/forms/headers/room.blade.php b/resources/views/livewire/headers/room.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/room.blade.php
rename to resources/views/livewire/headers/room.blade.php
diff --git a/resources/views/livewire/forms/headers/song.blade.php b/resources/views/livewire/headers/song.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/song.blade.php
rename to resources/views/livewire/headers/song.blade.php
diff --git a/resources/views/livewire/forms/headers/text-ad.blade.php b/resources/views/livewire/headers/text-ad.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/text-ad.blade.php
rename to resources/views/livewire/headers/text-ad.blade.php
diff --git a/resources/views/livewire/forms/headers/user.blade.php b/resources/views/livewire/headers/user.blade.php
similarity index 100%
rename from resources/views/livewire/forms/headers/user.blade.php
rename to resources/views/livewire/headers/user.blade.php
diff --git a/resources/views/livewire/forms/import-datas/artist.blade.php b/resources/views/livewire/import-datas/artist.blade.php
similarity index 100%
rename from resources/views/livewire/forms/import-datas/artist.blade.php
rename to resources/views/livewire/import-datas/artist.blade.php
diff --git a/resources/views/livewire/forms/import-datas/branch.blade.php b/resources/views/livewire/import-datas/branch.blade.php
similarity index 100%
rename from resources/views/livewire/forms/import-datas/branch.blade.php
rename to resources/views/livewire/import-datas/branch.blade.php
diff --git a/resources/views/livewire/forms/import-datas/song.blade.php b/resources/views/livewire/import-datas/song.blade.php
similarity index 100%
rename from resources/views/livewire/forms/import-datas/song.blade.php
rename to resources/views/livewire/import-datas/song.blade.php