diff --git a/public/oldschool/css/main.css b/public/oldschool/css/main.css
index c71e8b7..fbcf9d1 100644
--- a/public/oldschool/css/main.css
+++ b/public/oldschool/css/main.css
@@ -241,6 +241,7 @@ a.thispage:hover {
 	background-color:transparent!important
 }
 a.thispage span,
+a.dropdown-item.thispage,
 a.thispage:hover span {
 	color:#c60!important
 }
diff --git a/resources/views/layouts/partials/topmenu.blade.php b/resources/views/layouts/partials/topmenu.blade.php
index b1c56cc..03bfe1a 100644
--- a/resources/views/layouts/partials/topmenu.blade.php
+++ b/resources/views/layouts/partials/topmenu.blade.php
@@ -4,15 +4,21 @@
 	<ul id="navlist-desktop">
 		<li><a href="{{ url($user ? 'dashboard' : '/') }}" class="@if(preg_match('#^([dashboard]?[/]?)+$#',request()->path()))thispage disabled @endif"><span>Home</span></a></li>
 		<li><a href="{{ url('about') }}" class="@if(preg_match('#^about#',request()->path()))thispage disabled @endif"><span>About</span></a></li>
-		<li><a href="{{ url('domain/list') }}" class="@if(preg_match('#^domain/list#',request()->path()))thispage disabled @endif"><span>FTN List</span></a></li>
-		<li><a href="{{ url('system/list') }}" class="@if(preg_match('#^system/list#',request()->path()))thispage disabled @endif"><span>BBS List</span></a></li>
+		<li>
+			<a class="@if(preg_match('#[domain|system]/list#',request()->path()))thispage @endif" type="button" data-bs-toggle="collapse" data-bs-target="#dropdown-list" aria-controls="dropdown-list" aria-expanded="false" aria-label="Toggle Lists">
+				<span>Lists</span>
+			</a>
+			<div class="collapse navbar-collapse" id="dropdown-list">
+				<ul class="dropdown-menu dropdown-menu-dark">
+					<li><a class="dropdown-item @if(preg_match('#^system/list#',request()->path()))thispage disabled @endif" href="{{ url('system/list') }}">BBS List</a></li>
+					<li><a class="dropdown-item @if(preg_match('#^domain/list#',request()->path()))thispage disabled @endif" href="{{ url('domain/list') }}">FTN List</a></li>
+				</ul>
+			</div>
+		</li>
 		<li><a href="{{ url('status') }}" class="@if(preg_match('#^status#',request()->path()))thispage disabled @endif"><span>Status</span></a></li>
 		{{--
 		<li><a href="{{ url('help') }}" class="@if(preg_match('#^help#',request()->path()))thispage @endif disabled"><span>Help</span></a></li>
 		--}}
-		@can('admin')
-			<li><a href="{{ url('setup') }}" class="@if(preg_match('#^setup#',request()->path()))thispage @endif"><span>Setup</span></a></li>
-		@endcan
 		@if(preg_match('#^/network/#',request()->path()))
 			<li><a href="{{ url('join') }}" class="@if(preg_match('#^join#',request()->path()))thispage @endif"><span>Join</span></a></li>
 		@endif
@@ -21,24 +27,23 @@
 	<ul class="float-end">
 		@auth
 			<li>
-				<a class="{{ $user->switched ? 'switched' : '' }}" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDarkDropdown" aria-controls="navbarNavDarkDropdown" aria-expanded="false" aria-label="Toggle navigation">
+				<a class="{{ $user->switched ? 'switched' : '' }}" type="button" data-bs-toggle="collapse" data-bs-target="#user-menu-list" aria-controls="navbarNavDarkDropdown" aria-expanded="false" aria-label="Toggle navigation">
 					<span>{{ $user->name }}</span>
 				</a>
-				<div class="collapse navbar-collapse" id="navbarNavDarkDropdown">
+				<div class="collapse navbar-collapse" id="user-menu-list">
 					<ul class="dropdown-menu dropdown-menu-dark">
 						<li><a class="dropdown-item" href="{{ url('user/system/register') }}">Register/Link System</a></li>
+						@can('admin')
+							<li><a class="dropdown-item @if(preg_match('#^setup#',request()->path()))thispage @endif" href="{{ url('setup') }}">Setup</a></li>
+						@endcan
+						@if($user->switched)
+							<li><a class="dropdown-item" href="{{ url('admin/switch/stop') }}">Switch Back</a></li>
+						@else
+							<li><a class="dropdown-item" href="{{ url('logout') }}">Logout</a></li>
+						@endif
 					</ul>
 				</div>
 			</li>
-
-			@if($user->switched)
-				<li><a href="{{ url('admin/switch/stop') }}">
-					<span>Switch Back</span>
-				</a></li>
-			@else
-				<li><a href="{{ url('logout') }}"><span>Logout</span></a></li>
-			@endif
-
 		@endauth
 		@guest
 			<li><a href="{{ url('login') }}"><span>Login</span></a></li>