diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index d6106c1b1..1d133c683 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -11,6 +11,9 @@
                 <a href="/profile">
                     <x-inputs.button>Profile</x-inputs.button>
                 </a>
+                <a href="/profile/team">
+                    <x-inputs.button>Team</x-inputs.button>
+                </a>
                 @if (auth()->user()->isRoot())
                     <a href="/settings">
                         <x-inputs.button>Settings</x-inputs.button>
diff --git a/resources/views/livewire/switch-team.blade.php b/resources/views/livewire/switch-team.blade.php
index 09319185e..22830065b 100644
--- a/resources/views/livewire/switch-team.blade.php
+++ b/resources/views/livewire/switch-team.blade.php
@@ -1,6 +1,10 @@
-<div>
-    @foreach (auth()->user()->otherTeams() as $team)
-        <x-inputs.button wire:key="{{ $team->id }}" wire:click="switch_to('{{ $team->id }}')">Switch to:
-            {{ $team->name }}</x-inputs.button>
-    @endforeach
+<div class="pt-4">
+    <h3>Other Teams</h3>
+    <div class="flex flex-col gap-2">
+        @foreach (auth()->user()->otherTeams() as $team)
+            <x-inputs.button isBold wire:key="{{ $team->id }}" wire:click="switch_to('{{ $team->id }}')">Switch
+                to:
+                {{ $team->name }}</x-inputs.button>
+        @endforeach
+    </div>
 </div>
diff --git a/resources/views/profile.blade.php b/resources/views/profile.blade.php
index 6377b54a4..6827ef272 100644
--- a/resources/views/profile.blade.php
+++ b/resources/views/profile.blade.php
@@ -6,12 +6,5 @@
             <p>Id: {{ auth()->user()->id }}</p>
             <p>Uuid: {{ auth()->user()->uuid }}</p>
         </div>
-        <div>
-            <h3>Current Team</h3>
-            <p>Name: {{ session('currentTeam')->name }}</p>
-            <p>Id: {{ session('currentTeam')->id }}</p>
-            <p>Uuid: {{ session('currentTeam')->uuid }}</p>
-        </div>
-        <livewire:switch-team>
     </div>
 </x-layout>
diff --git a/resources/views/team.blade.php b/resources/views/team.blade.php
new file mode 100644
index 000000000..c6265e32c
--- /dev/null
+++ b/resources/views/team.blade.php
@@ -0,0 +1,7 @@
+<x-layout>
+    <div>
+        <h3>Current Team</h3>
+        <p>Name: {{ session('currentTeam')->name }}</p>
+        <livewire:switch-team>
+    </div>
+</x-layout>
diff --git a/routes/web.php b/routes/web.php
index 04ba7bf81..746c9619b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -128,6 +128,9 @@ Route::middleware(['auth'])->group(function () {
     Route::get('/profile', function () {
         return view('profile');
     })->name('profile');
+    Route::get('/profile/team', function () {
+        return view('team');
+    })->name('team');
 
     Route::get('/settings', function () {
         $isRoot = auth()->user()->isRoot();