diff --git a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
index b9fe4223d3..c8e6267d62 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue
@@ -49,6 +49,9 @@ const modalConfirmUnpair = ref()
 const modalConfirmReinstall = ref()
 
 const props = defineProps<InstanceSettingsTabProps>()
+const emit = defineEmits<{
+	unlinked: []
+}>()
 
 const loader = ref(props.instance.loader)
 const gameVersion = ref(props.instance.game_version)
@@ -273,7 +276,7 @@ async function unpairProfile() {
 	modpackProject.value = null
 	modpackVersion.value = null
 	modpackVersions.value = null
-	modalConfirmUnpair.value.hide()
+	emit('unlinked')
 }
 
 async function repairModpack() {
diff --git a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
index 06e23d2e8e..6964a83f68 100644
--- a/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
+++ b/apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ConfirmModal } from '@modrinth/ui'
-import { ref } from 'vue'
+import { useTemplateRef } from 'vue'
 
 import { hide_ads_window, show_ads_window } from '@/helpers/ads.js'
 import { useTheming } from '@/store/theme.ts'
@@ -49,16 +49,16 @@ const props = defineProps({
 })
 
 const emit = defineEmits(['proceed'])
-const modal = ref(null)
+const modal = useTemplateRef('modal')
 
 defineExpose({
 	show: () => {
 		hide_ads_window()
-		modal.value.show()
+		modal.value?.show()
 	},
 	hide: () => {
 		onModalHide()
-		modal.value.hide()
+		modal.value?.hide()
 	},
 })
 
diff --git a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
index 30c1ed9ae1..2d1259aac5 100644
--- a/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/InstanceSettingsModal.vue
@@ -32,8 +32,12 @@ import type { InstanceSettingsTabProps } from '../../../helpers/types'
 const { formatMessage } = useVIntl()
 
 const props = defineProps<InstanceSettingsTabProps>()
+const emit = defineEmits<{
+	unlinked: []
+}>()
 
 const isMinecraftServer = ref(false)
+const handleUnlinked = () => emit('unlinked')
 
 watch(
 	() => props.instance,
@@ -121,7 +125,14 @@ defineExpose({ show })
 
 		<TabbedModal
 			:tabs="
-				tabs.map((tab) => ({ ...tab, props: { ...props, isMinecraftServer: isMinecraftServer } }))
+				tabs.map((tab) => ({
+					...tab,
+					props: {
+						...props,
+						isMinecraftServer,
+						onUnlinked: handleUnlinked,
+					},
+				}))
 			"
 		/>
 	</ModalWrapper>
diff --git a/apps/app-frontend/src/components/ui/modal/UpdateToPlayModal.vue b/apps/app-frontend/src/components/ui/modal/UpdateToPlayModal.vue
index 2c8394816d..b635383ec7 100644
--- a/apps/app-frontend/src/components/ui/modal/UpdateToPlayModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/UpdateToPlayModal.vue
@@ -187,10 +187,11 @@ type ProjectInfo = {
 
 const { formatMessage } = useVIntl()
 const installStore = useInstall()
+type UpdateCompleteCallback = () => void | Promise<void>
 
 const modal = ref<InstanceType<typeof NewModal>>()
 const instance = ref<GameInstance | null>(null)
-const onUpdateComplete = ref<() => void>(() => {})
+const onUpdateComplete = ref<UpdateCompleteCallback>(() => {})
 const diffs = ref<DependencyDiff[]>([])
 const modpackVersionId = ref<string | null>(null)
 const modpackVersion = ref<Version | null>(null)
@@ -316,6 +317,7 @@ async function computeDependencyDiffs(
 
 async function checkUpdateAvailable(inst: GameInstance): Promise<DependencyDiff[] | null> {
 	if (!inst.linked_data) return null
+	if (!modpackVersionId.value || !inst.linked_data.version_id) return null
 
 	try {
 		// For server projects, linked_data.project_id is the server project but
@@ -327,8 +329,8 @@ async function checkUpdateAvailable(inst: GameInstance): Promise<DependencyDiff[
 		// Compute dependency diffs between current and latest version
 		if (instanceModpackVersion && modpackVersion.value) {
 			return await computeDependencyDiffs(
-				modpackVersion.value.dependencies || [],
 				instanceModpackVersion.dependencies || [],
+				modpackVersion.value.dependencies || [],
 			)
 		}
 	} catch (error) {
@@ -355,7 +357,7 @@ async function handleUpdate() {
 	try {
 		if (modpackVersionId.value && instance.value) {
 			await update_managed_modrinth_version(instance.value.path, modpackVersionId.value)
-			onUpdateComplete.value()
+			await onUpdateComplete.value()
 		}
 	} catch (error) {
 		console.error('Error updating instance:', error)
@@ -379,7 +381,7 @@ function handleDecline() {
 function show(
 	instanceVal: GameInstance,
 	modpackVersionIdVal: string | null = null,
-	callback: () => void = () => {},
+	callback: UpdateCompleteCallback = () => {},
 	e?: MouseEvent,
 ) {
 	instance.value = instanceVal
diff --git a/apps/app-frontend/src/components/ui/world/WorldItem.vue b/apps/app-frontend/src/components/ui/world/WorldItem.vue
index c53685c2aa..28470b95fd 100644
--- a/apps/app-frontend/src/components/ui/world/WorldItem.vue
+++ b/apps/app-frontend/src/components/ui/world/WorldItem.vue
@@ -45,7 +45,7 @@ import type {
 	SingleplayerWorld,
 	World,
 } from '@/helpers/worlds.ts'
-import { getWorldIdentifier, isLinkedWorld, set_world_display_status } from '@/helpers/worlds.ts'
+import { getWorldIdentifier, set_world_display_status } from '@/helpers/worlds.ts'
 
 import { LockIcon } from '../../../../../../packages/assets/generated-icons'
 
@@ -81,6 +81,8 @@ const props = withDefaults(
 			message: MessageDescriptor
 		}
 
+		managed?: boolean
+
 		// Instance
 		instancePath?: string
 		instanceName?: string
@@ -99,6 +101,7 @@ const props = withDefaults(
 		renderedMotd: undefined,
 
 		gameMode: undefined,
+		managed: false,
 
 		instancePath: undefined,
 		instanceName: undefined,
@@ -120,7 +123,7 @@ const serverIncompatible = computed(
 )
 
 const locked = computed(() => props.world.type === 'singleplayer' && props.world.locked)
-const linked = computed(() => isLinkedWorld(props.world))
+const managed = computed(() => props.managed)
 
 const messages = defineMessages({
 	hardcore: {
@@ -209,7 +212,7 @@ const messages = defineMessages({
 						{{ world.name }}
 					</div>
 					<TagItem
-						v-if="linked"
+						v-if="managed"
 						v-tooltip="formatMessage(messages.linkedServer)"
 						class="border !border-solid border-blue bg-highlight-blue text-xs"
 						:style="`--_color: var(--color-blue)`"
@@ -412,10 +415,10 @@ const messages = defineMessages({
 								id: 'edit',
 								action: () => emit('edit'),
 								shown: !instancePath,
-								disabled: locked || linked,
+								disabled: locked || managed,
 								tooltip: locked
 									? formatMessage(messages.worldInUse)
-									: linked
+									: managed
 										? formatMessage(messages.linkedServer)
 										: undefined,
 							},
@@ -452,10 +455,10 @@ const messages = defineMessages({
 								hoverFilled: true,
 								action: () => emit('delete'),
 								shown: !instancePath,
-								disabled: locked || linked,
+								disabled: locked || managed,
 								tooltip: locked
 									? formatMessage(messages.worldInUse)
-									: linked
+									: managed
 										? formatMessage(messages.linkedServer)
 										: undefined,
 							},
diff --git a/apps/app-frontend/src/helpers/worlds.ts b/apps/app-frontend/src/helpers/worlds.ts
index 8eb2e1f336..25be338a8a 100644
--- a/apps/app-frontend/src/helpers/worlds.ts
+++ b/apps/app-frontend/src/helpers/worlds.ts
@@ -30,7 +30,6 @@ export type ServerWorld = BaseWorld & {
 	index: number
 	address: string
 	pack_status: ServerPackStatus
-	linked_project_id?: string
 }
 
 export type World = SingleplayerWorld | ServerWorld
@@ -141,14 +140,12 @@ export async function add_server_to_profile(
 	name: string,
 	address: string,
 	packStatus: ServerPackStatus,
-	linkedProjectId?: string,
 ): Promise<number> {
 	return await invoke('plugin:worlds|add_server_to_profile', {
 		path,
 		name,
 		address,
 		packStatus,
-		linkedProjectId,
 	})
 }
 
@@ -158,7 +155,6 @@ export async function edit_server_in_profile(
 	name: string,
 	address: string,
 	packStatus: ServerPackStatus,
-	linkedProjectId?: string,
 ): Promise<void> {
 	return await invoke('plugin:worlds|edit_server_in_profile', {
 		path,
@@ -166,7 +162,6 @@ export async function edit_server_in_profile(
 		name,
 		address,
 		packStatus,
-		linkedProjectId,
 	})
 }
 
@@ -204,11 +199,6 @@ export function getWorldIdentifier(world: World) {
 
 export function sortWorlds(worlds: World[]) {
 	worlds.sort((a, b) => {
-		const aLinked = isLinkedWorld(a)
-		const bLinked = isLinkedWorld(b)
-		if (aLinked !== bLinked) {
-			return aLinked ? -1 : 1
-		}
 		if (!a.last_played) {
 			return 1
 		}
@@ -227,8 +217,78 @@ export function isServerWorld(world: World): world is ServerWorld {
 	return world.type === 'server'
 }
 
-export function isLinkedWorld(world: World): boolean {
-	return world.type === 'server' && !!world.linked_project_id
+const DEFAULT_MINECRAFT_SERVER_PORT = 25565
+
+function parseServerPort(port: string): number | null {
+	const parsed = Number.parseInt(port, 10)
+	return Number.isInteger(parsed) && parsed > 0 && parsed <= 65535 ? parsed : null
+}
+
+/**
+ * Normalization converts addresses to a canonical form (lowercase-host:port, default port 25565)
+ */
+export function normalizeServerAddress(address: string): string {
+	const trimmedAddress = address.trim()
+	if (!trimmedAddress) return ''
+
+	let host = trimmedAddress
+	let port = DEFAULT_MINECRAFT_SERVER_PORT
+
+	if (trimmedAddress.startsWith('[')) {
+		const closingBracket = trimmedAddress.indexOf(']')
+		if (closingBracket > 0) {
+			host = trimmedAddress.slice(1, closingBracket)
+			const suffix = trimmedAddress.slice(closingBracket + 1)
+			if (suffix.startsWith(':')) {
+				const parsedPort = parseServerPort(suffix.slice(1))
+				if (parsedPort != null) {
+					port = parsedPort
+				}
+			}
+		}
+	} else {
+		const firstColon = trimmedAddress.indexOf(':')
+		const lastColon = trimmedAddress.lastIndexOf(':')
+		if (firstColon !== -1 && firstColon === lastColon) {
+			host = trimmedAddress.slice(0, firstColon)
+			const parsedPort = parseServerPort(trimmedAddress.slice(firstColon + 1))
+			if (parsedPort != null) {
+				port = parsedPort
+			} else {
+				host = trimmedAddress
+			}
+		}
+	}
+
+	return `${host.trim().toLowerCase()}:${port}`
+}
+
+export function resolveManagedServerWorld(
+	worlds: World[],
+	managedName: string | null | undefined,
+	managedAddress: string | null | undefined,
+): ServerWorld | null {
+	if (!managedName || !managedAddress) return null
+
+	const normalizedManagedAddress = normalizeServerAddress(managedAddress)
+	if (!normalizedManagedAddress) return null
+
+	const servers = worlds
+		.filter(isServerWorld)
+		.slice()
+		.sort((a, b) => a.index - b.index)
+
+	const exactMatch = servers.find(
+		(server) =>
+			server.name === managedName &&
+			normalizeServerAddress(server.address) === normalizedManagedAddress,
+	)
+	if (exactMatch) return exactMatch
+
+	return (
+		servers.find((server) => normalizeServerAddress(server.address) === normalizedManagedAddress) ??
+		null
+	)
 }
 
 export async function getServerLatency(
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index 5161a723d3..fa2c554ad4 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -2,7 +2,12 @@
 	<div v-if="instance">
 		<div class="p-6 pr-2 pb-4" @contextmenu.prevent.stop="(event) => handleRightClick(event)">
 			<ExportModal ref="exportModal" :instance="instance" />
-			<InstanceSettingsModal ref="settingsModal" :instance="instance" :offline="offline" />
+			<InstanceSettingsModal
+				ref="settingsModal"
+				:instance="instance"
+				:offline="offline"
+				@unlinked="fetchInstance"
+			/>
 			<UpdateToPlayModal ref="updateToPlayModal" :instance="instance" />
 			<ContentPageHeader>
 				<template #icon>
@@ -55,27 +60,26 @@
 						</template>
 
 						<template v-else>
-							<ServerOnlinePlayers
-								v-if="playersOnline !== undefined"
-								:online="playersOnline"
-								:status-online="statusOnline"
-								hide-label
-							/>
-
-							<ServerRecentPlays :recent-plays="recentPlays ?? 0" hide-label />
-
-							<div
-								v-if="
-									(playersOnline !== undefined || recentPlays !== undefined) &&
-									(minecraftServer?.region || ping)
-								"
-								class="w-1.5 h-1.5 rounded-full bg-surface-5"
-							></div>
+							<template v-if="loadingServerPing">
+								<ServerOnlinePlayers
+									v-if="playersOnline !== undefined"
+									:online="playersOnline"
+									:status-online="statusOnline"
+									hide-label
+								/>
+								<ServerRecentPlays :recent-plays="recentPlays ?? 0" hide-label />
+								<div
+									v-if="
+										(playersOnline !== undefined || recentPlays !== undefined) &&
+										(minecraftServer?.region || ping)
+									"
+									class="w-1.5 h-1.5 rounded-full bg-surface-5"
+								></div>
+								<ServerPing v-if="ping" :ping="ping" />
+							</template>
 
 							<ServerRegion v-if="minecraftServer?.region" :region="minecraftServer?.region" />
 
-							<ServerPing v-if="ping" :ping="ping" />
-
 							<div
 								v-if="minecraftServer?.region || ping"
 								class="w-1.5 h-1.5 rounded-full bg-surface-5"
@@ -329,7 +333,7 @@ import { get_by_profile_path } from '@/helpers/process'
 import { finish_install, get, get_full_path, kill, run } from '@/helpers/profile'
 import type { GameInstance } from '@/helpers/types'
 import { showProfileInFolder } from '@/helpers/utils.js'
-import { get_server_status, getServerLatency } from '@/helpers/worlds'
+import { get_server_status } from '@/helpers/worlds'
 import { handleSevereError } from '@/store/error.js'
 import { playServerProject } from '@/store/install.js'
 import { useBreadcrumbs, useLoading } from '@/store/state'
@@ -370,6 +374,7 @@ const recentPlays = computed(
 )
 const playersOnline = ref<number | undefined>(undefined)
 const ping = ref<number | undefined>(undefined)
+const loadingServerPing = ref(false)
 
 async function fetchInstance() {
 	isServerInstance.value = false
@@ -377,6 +382,7 @@ async function fetchInstance() {
 	modrinthVersions.value = []
 	ping.value = undefined
 	playersOnline.value = undefined
+	loadingServerPing.value = false
 
 	instance.value = await get(route.params.id as string).catch(handleError)
 
@@ -409,14 +415,19 @@ async function fetchInstance() {
 function fetchDeferredData() {
 	const serverAddress = linkedProjectV3.value?.minecraft_java_server?.address
 	if (isServerInstance.value && serverAddress) {
-		Promise.all([get_server_status(serverAddress), getServerLatency(serverAddress)])
-			.then(([status, latency]) => {
-				ping.value = latency
+		get_server_status(serverAddress)
+			.then((status) => {
 				playersOnline.value = status.players?.online
+				ping.value = status.ping
+			})
+			.catch((error) => {
+				console.error(`Failed to fetch server status for ${serverAddress}:`, error)
 			})
-			.catch((err) => {
-				console.error(`Failed to ping server ${serverAddress}:`, err)
+			.finally(() => {
+				loadingServerPing.value = true
 			})
+	} else {
+		loadingServerPing.value = true
 	}
 
 	updatePlayState()
diff --git a/apps/app-frontend/src/pages/instance/Worlds.vue b/apps/app-frontend/src/pages/instance/Worlds.vue
index 6a57e3177b..d42fc4f210 100644
--- a/apps/app-frontend/src/pages/instance/Worlds.vue
+++ b/apps/app-frontend/src/pages/instance/Worlds.vue
@@ -62,6 +62,7 @@
 				v-for="world in filteredWorlds"
 				:key="`world-${world.type}-${world.type == 'singleplayer' ? world.path : `${world.address}-${world.index}`}`"
 				:world="world"
+				:managed="world.type === 'server' ? isManagedServerWorld(world) : false"
 				:highlighted="highlightedWorld === getWorldIdentifier(world)"
 				:supports-server-quick-play="supportsServerQuickPlay"
 				:supports-world-quick-play="supportsWorldQuickPlay"
@@ -80,13 +81,13 @@
 				@refresh="() => refreshServer((world as ServerWorld).address)"
 				@edit="
 					() =>
-						isLinkedWorld(world)
-							? undefined
-							: world.type === 'server'
-								? editServerModal?.show(world)
-								: editWorldModal?.show(world)
+						world.type === 'singleplayer'
+							? editWorldModal?.show(world)
+							: isManagedServerWorld(world)
+								? undefined
+								: editServerModal?.show(world)
 				"
-				@delete="() => !isLinkedWorld(world) && promptToRemoveWorld(world)"
+				@delete="() => !isManagedServerWorld(world) && promptToRemoveWorld(world)"
 				@open-folder="(world: SingleplayerWorld) => showWorldInFolder(instance.path, world.path)"
 			/>
 		</div>
@@ -144,6 +145,7 @@ import AddServerModal from '@/components/ui/world/modal/AddServerModal.vue'
 import EditServerModal from '@/components/ui/world/modal/EditServerModal.vue'
 import EditWorldModal from '@/components/ui/world/modal/EditSingleplayerWorldModal.vue'
 import WorldItem from '@/components/ui/world/WorldItem.vue'
+import { get_project, get_project_v3 } from '@/helpers/cache.js'
 import { profile_listener } from '@/helpers/events'
 import { get_game_versions } from '@/helpers/tags'
 import type { GameInstance } from '@/helpers/types'
@@ -154,7 +156,6 @@ import {
 	handleDefaultProfileUpdateEvent,
 	hasServerQuickPlaySupport,
 	hasWorldQuickPlaySupport,
-	isLinkedWorld,
 	type ProfileEvent,
 	type ProtocolVersion,
 	refreshServerData,
@@ -162,6 +163,7 @@ import {
 	refreshWorld,
 	refreshWorlds,
 	remove_server_from_profile,
+	resolveManagedServerWorld,
 	type ServerData,
 	type ServerWorld,
 	showWorldInFolder,
@@ -171,7 +173,11 @@ import {
 	start_join_singleplayer_world,
 	type World,
 } from '@/helpers/worlds.ts'
-import { playServerProject } from '@/store/install'
+import {
+	ensureManagedServerWorldExists,
+	getServerAddress,
+	playServerProject,
+} from '@/store/install'
 
 const { handleError } = injectNotificationManager()
 const route = useRoute()
@@ -225,6 +231,69 @@ const linuxRefreshCount = ref(0)
 const protocolVersion = ref<ProtocolVersion | null>(
 	await get_profile_protocol_version(instance.value.path),
 )
+const managedServerName = ref<string | null>(null)
+const managedServerAddress = ref<string | null>(null)
+
+const managedServerWorld = computed(() =>
+	resolveManagedServerWorld(worlds.value, managedServerName.value, managedServerAddress.value),
+)
+
+function isManagedServerWorld(world: World): world is ServerWorld {
+	return world.type === 'server' && managedServerWorld.value?.index === world.index
+}
+
+async function refreshManagedServerMetadata() {
+	await ensureManagedServerWorldExists(
+		instance.value.path,
+		managedServerName.value,
+		managedServerAddress.value,
+	)
+
+	const projectId = instance.value.linked_data?.project_id
+	if (!projectId) {
+		managedServerName.value = null
+		managedServerAddress.value = null
+		return
+	}
+
+	try {
+		const [project, projectV3] = await Promise.all([
+			get_project(projectId, 'bypass'),
+			get_project_v3(projectId, 'bypass'),
+		])
+
+		if (projectV3?.minecraft_server == null) {
+			managedServerName.value = null
+			managedServerAddress.value = null
+			return
+		}
+
+		const serverAddress = getServerAddress(projectV3.minecraft_java_server)
+		if (!serverAddress) {
+			managedServerName.value = null
+			managedServerAddress.value = null
+			return
+		}
+
+		managedServerName.value = project.title
+		managedServerAddress.value = serverAddress
+	} catch (err) {
+		console.error(
+			`Failed to resolve managed server metadata for profile: ${instance.value.path}`,
+			err,
+		)
+		managedServerName.value = null
+		managedServerAddress.value = null
+	}
+}
+
+watch(
+	() => instance.value.linked_data?.project_id,
+	async () => {
+		await refreshManagedServerMetadata()
+	},
+	{ immediate: true },
+)
 
 const unlistenProfile = await profile_listener(async (e: ProfileEvent) => {
 	if (e.profile_path_id !== instance.value.path) return
@@ -257,6 +326,7 @@ async function refreshAllWorlds() {
 		console.log(`Already refreshing, cancelling refresh.`)
 		return
 	}
+	await refreshManagedServerMetadata()
 
 	refreshingAll.value = true
 
@@ -334,8 +404,11 @@ async function joinWorld(world: World) {
 	startingInstance.value = true
 	worldPlaying.value = world
 	if (world.type === 'server') {
-		if (isLinkedWorld(world)) {
-			playServerProject(world.linked_project_id)
+		const managedProjectId = instance.value.linked_data?.project_id
+		if (managedProjectId && isManagedServerWorld(world)) {
+			await playServerProject(managedProjectId).catch(handleJoinError)
+			startingInstance.value = false
+			return
 		}
 		await start_join_server(instance.value.path, world.address).catch(handleJoinError)
 	} else if (world.type === 'singleplayer') {
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index 64103d0e5b..cd03d41932 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -26,6 +26,7 @@
 				:project-v3="projectV3"
 				class="project-sidebar-section"
 			/>
+			<ProjectSidebarTags :project="data" class="project-sidebar-section" />
 			<ProjectSidebarCreators
 				:organization="null"
 				:members="members"
@@ -34,7 +35,6 @@
 				link-target="_blank"
 				class="project-sidebar-section"
 			/>
-			<ProjectSidebarTags :project="data" class="project-sidebar-section" />
 			<ProjectSidebarDetails
 				:project="data"
 				:has-versions="versions.length > 0"
@@ -79,7 +79,7 @@
 								}}
 							</button>
 						</ButtonStyled>
-						<ButtonStyled size="large" circular type="transparent">
+						<ButtonStyled size="large" circular>
 							<button v-tooltip="'Add server to instance'" @click="handleAddServerToInstance">
 								<PlusIcon />
 							</button>
diff --git a/apps/app-frontend/src/store/install.js b/apps/app-frontend/src/store/install.js
index aa7da097a1..702c2712c3 100644
--- a/apps/app-frontend/src/store/install.js
+++ b/apps/app-frontend/src/store/install.js
@@ -21,8 +21,8 @@ import {
 } from '@/helpers/profile.js'
 import {
 	add_server_to_profile,
-	edit_server_in_profile,
 	get_profile_worlds,
+	resolveManagedServerWorld,
 	start_join_server,
 } from '@/helpers/worlds.ts'
 import router from '@/routes.js'
@@ -328,7 +328,7 @@ export const installServerProject = async (serverProjectId) => {
 	})
 	await edit_icon(profilePath, originalIconPath)
 
-	await syncServerProjectAsWorld(profilePath, project.title, serverAddress, serverProjectId)
+	await ensureManagedServerWorldExists(profilePath, project.title, serverAddress)
 }
 
 export const getServerAddress = (javaServer) => {
@@ -337,61 +337,16 @@ export const getServerAddress = (javaServer) => {
 	return address
 }
 
-const syncServerProjectAsWorld = async (
-	profilePath,
-	serverName,
-	serverAddress,
-	serverProjectId = null,
-) => {
+export const ensureManagedServerWorldExists = async (profilePath, serverName, serverAddress) => {
 	if (!profilePath || !serverAddress) return
 	try {
 		const worlds = await get_profile_worlds(profilePath)
-
-		if (serverProjectId) {
-			// Check if a linked world for this project already exists
-			const linkedWorld = worlds.find(
-				(w) => w.type === 'server' && w.linked_project_id === serverProjectId,
-			)
-			if (linkedWorld) {
-				// Sync linked world data with project details
-				if (linkedWorld.address !== serverAddress || linkedWorld.name !== serverName) {
-					await edit_server_in_profile(
-						profilePath,
-						linkedWorld.index,
-						serverName,
-						serverAddress,
-						linkedWorld.pack_status,
-						serverProjectId,
-					)
-				}
-				return
-			}
-		}
-
-		const existingServer = worlds.find((w) => w.type === 'server' && w.address === serverAddress)
-		if (existingServer) {
-			// Re-link and sync existing server (link may have been lost by Minecraft rewriting servers.dat)
-			if (serverProjectId || existingServer.name !== serverName) {
-				await edit_server_in_profile(
-					profilePath,
-					existingServer.index,
-					serverName,
-					serverAddress,
-					existingServer.pack_status,
-					serverProjectId ?? undefined,
-				)
-			}
-		} else {
-			await add_server_to_profile(
-				profilePath,
-				serverName,
-				serverAddress,
-				'prompt',
-				serverProjectId ?? undefined,
-			)
+		const managedWorld = resolveManagedServerWorld(worlds, serverName, serverAddress)
+		if (!managedWorld) {
+			await add_server_to_profile(profilePath, serverName, serverAddress, 'prompt')
 		}
 	} catch (err) {
-		console.error('Failed to add server to instance worlds:', err)
+		console.error('Failed to ensure managed server world exists:', err)
 	}
 }
 
@@ -420,8 +375,7 @@ const createVanillaServerInstance = async (project, gameVersion, serverAddress)
 		},
 	)
 
-	//
-	await syncServerProjectAsWorld(profilePath, project.title, serverAddress, project.id)
+	await ensureManagedServerWorldExists(profilePath, project.title, serverAddress)
 
 	return profilePath
 }
@@ -552,7 +506,7 @@ export const playServerProject = async (projectId) => {
 
 	if (!instance) return
 
-	await syncServerProjectAsWorld(instance.path, project.title, serverAddress, project.id)
+	await ensureManagedServerWorldExists(instance.path, project.title, serverAddress)
 
 	// Update existing instance if needed
 	if (isModpack && instance.linked_data?.version_id !== modpackVersionId) {
diff --git a/apps/app/src/api/worlds.rs b/apps/app/src/api/worlds.rs
index c20b89a614..f0914f2d9c 100644
--- a/apps/app/src/api/worlds.rs
+++ b/apps/app/src/api/worlds.rs
@@ -151,7 +151,6 @@ pub async fn add_server_to_profile(
     name: String,
     address: String,
     pack_status: ServerPackStatus,
-    linked_project_id: Option<String>,
 ) -> Result<usize> {
     let path = get_full_path(path).await?;
     Ok(worlds::add_server_to_profile(
@@ -159,7 +158,6 @@ pub async fn add_server_to_profile(
         name,
         address,
         pack_status,
-        linked_project_id,
     )
     .await?)
 }
@@ -171,7 +169,6 @@ pub async fn edit_server_in_profile(
     name: String,
     address: String,
     pack_status: ServerPackStatus,
-    linked_project_id: Option<String>,
 ) -> Result<()> {
     let path = get_full_path(path).await?;
     worlds::edit_server_in_profile(
@@ -180,7 +177,6 @@ pub async fn edit_server_in_profile(
         name,
         address,
         pack_status,
-        linked_project_id,
     )
     .await?;
     Ok(())
diff --git a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
index 17f8766ca1..5b1deab837 100644
--- a/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
+++ b/apps/frontend/src/components/ui/create/ProjectCreateModal.vue
@@ -329,7 +329,7 @@ const userOption = computed(() => ({
 						h('img', {
 							src: auth.value.user?.avatar_url,
 							alt: 'User Avatar',
-							class: 'h-5 w-5 rounded',
+							class: 'h-5 w-5 rounded-full',
 						}),
 				}),
 			)
diff --git a/apps/frontend/src/composables/queries/version.ts b/apps/frontend/src/composables/queries/version.ts
new file mode 100644
index 0000000000..552410fa13
--- /dev/null
+++ b/apps/frontend/src/composables/queries/version.ts
@@ -0,0 +1,11 @@
+import type { AbstractModrinthClient } from '@modrinth/api-client'
+
+import { STALE_TIME } from './project'
+
+export const versionQueryOptions = {
+	v3: (versionId: string, client: AbstractModrinthClient) => ({
+		queryKey: ['version', 'v3', versionId] as const,
+		queryFn: () => client.labrinth.versions_v3.getVersion(versionId),
+		staleTime: STALE_TIME,
+	}),
+}
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index dce61484fe..68a0e1c992 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -2132,6 +2132,12 @@
   "project-type.datapack.singular": {
     "message": "Data Pack"
   },
+  "project-type.minecraft_java_server.plural": {
+    "message": "Servers"
+  },
+  "project-type.minecraft_java_server.singular": {
+    "message": "Server"
+  },
   "project-type.mod.plural": {
     "message": "Mods"
   },
@@ -2990,6 +2996,9 @@
   "settings.display.project-list-layouts.resourcepack": {
     "message": "Resource Packs page"
   },
+  "settings.display.project-list-layouts.server": {
+    "message": "Servers page"
+  },
   "settings.display.project-list-layouts.shader": {
     "message": "Shaders page"
   },
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index 9c94f42b25..a7d8fb2769 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -443,7 +443,27 @@
 						"
 					>
 						<template #actions>
-							<ButtonStyled v-if="auth.user && currentMember" size="large" color="brand">
+							<ButtonStyled
+								v-if="auth.user && currentMember"
+								size="large"
+								color="brand"
+								class="lg:!hidden"
+								circular
+							>
+								<nuxt-link
+									v-tooltip="'Edit project'"
+									:to="`/${project.project_type}/${project.slug ? project.slug : project.id}/settings`"
+									class="!font-bold"
+								>
+									<SettingsIcon aria-hidden="true" />
+								</nuxt-link>
+							</ButtonStyled>
+							<ButtonStyled
+								v-if="auth.user && currentMember"
+								size="large"
+								color="brand"
+								class="max-lg:!hidden"
+							>
 								<nuxt-link
 									:to="`/${project.project_type}/${project.slug ? project.slug : project.id}/settings`"
 									class="!font-bold"
@@ -501,7 +521,11 @@
 									v-if="!isServerProject"
 									size="large"
 									circular
-									:color="route.name === 'type-id-version-version' ? `standard` : `brand`"
+									:color="
+										route.name === 'type-id-version-version' || (auth.user && currentMember)
+											? `standard`
+											: `brand`
+									"
 								>
 									<button
 										:aria-label="formatMessage(commonMessages.downloadButton)"
@@ -515,7 +539,11 @@
 									v-else
 									size="large"
 									circular
-									:color="route.name === 'type-id-version-version' ? `standard` : `brand`"
+									:color="
+										route.name === 'type-id-version-version' || (auth.user && currentMember)
+											? `standard`
+											: `brand`
+									"
 								>
 									<button aria-label="Play" class="flex sm:hidden" @click="handlePlayServerProject">
 										<PlayIcon aria-hidden="true" />
@@ -1070,6 +1098,7 @@ import NavTabs from '~/components/ui/NavTabs.vue'
 import ProjectMemberHeader from '~/components/ui/ProjectMemberHeader.vue'
 import { saveFeatureFlags } from '~/composables/featureFlags.ts'
 import { STALE_TIME, STALE_TIME_LONG } from '~/composables/queries/project'
+import { versionQueryOptions } from '~/composables/queries/version'
 import { userCollectProject, userFollowProject } from '~/composables/user.js'
 import { useModerationStore } from '~/store/moderation.ts'
 import { reportProject } from '~/utils/report-helpers.ts'
@@ -1630,52 +1659,41 @@ const serverModpackVersionId = computed(() => {
 })
 
 const { data: serverModpackVersion, isPending: serverModpackVersionPending } = useQuery({
-	queryKey: computed(() => ['sidebar-modpack-version', serverModpackVersionId.value]),
+	queryKey: computed(() => ['version', 'v3', serverModpackVersionId.value]),
 	queryFn: () => client.labrinth.versions_v3.getVersion(serverModpackVersionId.value),
 	staleTime: STALE_TIME,
 	enabled: computed(() => !!serverModpackVersionId.value),
 })
 
-const serverModpackProjectId = computed(() => serverModpackVersion.value?.project_id ?? null)
-
-const { data: serverModpackProject, isPending: serverModpackProjectPending } = useQuery({
-	queryKey: computed(() => ['sidebar-modpack-project', serverModpackProjectId.value]),
-	queryFn: () => client.labrinth.projects_v3.get(serverModpackProjectId.value),
-	staleTime: STALE_TIME,
-	enabled: computed(() => !!serverModpackProjectId.value),
-})
-
 const serverDataLoaded = computed(() => {
 	if (!projectV3.value) return false
 	if (serverModpackVersionId.value && serverModpackVersionPending.value) return false
-	if (serverModpackProjectId.value && serverModpackProjectPending.value) return false
 	return true
 })
 
 const serverRequiredContent = computed(() => {
-	if (!serverModpackProject.value) return null
+	const content = projectV3.value?.minecraft_java_server?.content
+	if (!content || content.kind !== 'modpack') return null
 	const primaryFile =
 		serverModpackVersion.value?.files?.find((f) => f.primary) ??
 		serverModpackVersion.value?.files?.[0]
 	return {
-		name: serverModpackProject.value.name,
+		name: content.project_name ?? '',
 		versionNumber: serverModpackVersion.value?.version_number ?? '',
-		icon: serverModpackProject.value.icon_url,
+		icon: content.project_icon,
 		onclickName:
-			serverModpackProject.value.id !== projectId.value
-				? () => navigateTo(`/modpack/${serverModpackProject.value.slug}`)
+			content.project_id && content.project_id !== projectId.value
+				? () => navigateTo(`/project/${content.project_id}`)
 				: undefined,
 		onclickVersion:
-			serverModpackProject.value.id !== projectId.value
+			content.project_id && content.project_id !== projectId.value
 				? () =>
-						navigateTo(
-							`/modpack/${serverModpackProject.value.slug}/version/${serverModpackVersion.value?.id}`,
-						)
+						navigateTo(`/project/${content.project_id}/version/${serverModpackVersion.value?.id}`)
 				: undefined,
 		onclickDownload: primaryFile?.url
 			? () => navigateTo(primaryFile.url, { external: true })
 			: undefined,
-		showCustomModpackTooltip: serverModpackProject.value.id === projectId.value,
+		showCustomModpackTooltip: content.project_id === projectId.value,
 	}
 })
 
@@ -1710,6 +1728,11 @@ const serverModpackLoaders = computed(() => {
 	return serverModpackVersion.value.mrpack_loaders ?? []
 })
 
+watch(serverModpackVersionId, (versionId) => {
+	if (!versionId) return
+	queryClient.prefetchQuery(versionQueryOptions.v3(versionId, client))
+})
+
 // Members
 const { data: allMembersRaw, error: _membersError } = useQuery({
 	queryKey: computed(() => ['project', projectId.value, 'members']),
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/index.vue b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
index 02b66082cd..65141f412f 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/index.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/index.vue
@@ -84,7 +84,7 @@
 						<div class="input-stack">
 							<FileInput
 								id="project-icon"
-								:max-size="262144"
+								:max-size="262144000"
 								:show-icon="true"
 								accept="image/png,image/jpeg,image/gif,image/webp"
 								class="choose-image iconified-button"
diff --git a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
index c0aa5b23de..96f62ea5e6 100644
--- a/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
+++ b/apps/frontend/src/pages/[type]/[id]/settings/tags.vue
@@ -75,8 +75,8 @@
 						>
 							<div class="category-selector__label">
 								<component
-									:is="getCategoryIcon(category.name)"
-									v-if="header !== 'resolutions' && getCategoryIcon(category.name)"
+									:is="getTagIcon(category.name)"
+									v-if="header !== 'resolutions' && getTagIcon(category.name)"
 									aria-hidden="true"
 									class="icon"
 								/>
@@ -111,8 +111,8 @@
 					>
 						<div class="category-selector__label">
 							<component
-								:is="getCategoryIcon(category.name)"
-								v-if="category.header !== 'resolutions' && getCategoryIcon(category.name)"
+								:is="getTagIcon(category.name)"
+								v-if="category.header !== 'resolutions' && getTagIcon(category.name)"
 								aria-hidden="true"
 								class="icon"
 							/>
@@ -135,7 +135,12 @@
 </template>
 
 <script setup lang="ts">
-import { getCategoryIcon, StarIcon, TriangleAlertIcon } from '@modrinth/assets'
+import {
+	getCategoryIcon,
+	SERVER_CATEGORY_ICON_MAP,
+	StarIcon,
+	TriangleAlertIcon,
+} from '@modrinth/assets'
 import {
 	Checkbox,
 	formatCategory,
@@ -167,6 +172,13 @@ const formatCategoryName = (categoryName: string) => {
 
 const isServerProject = computed(() => projectV3.value?.minecraft_server != null)
 
+const getTagIcon = (categoryName: string) => {
+	const iconName = isServerProject.value
+		? (SERVER_CATEGORY_ICON_MAP[categoryName] ?? categoryName)
+		: categoryName
+	return getCategoryIcon(iconName)
+}
+
 const matchesProjectType = (x: Category) =>
 	x.project_type === project.value.actualProjectType ||
 	(x.project_type === 'minecraft_java_server' && isServerProject.value)
@@ -232,6 +244,14 @@ const categoryLists = computed(() => {
 			lists[header].push(x)
 		}
 	})
+	const featuresKey = 'minecraft_server_features'
+	if (lists[featuresKey]) {
+		lists[featuresKey].sort((a, b) => {
+			if (a.name === 'pokemon') return -1
+			if (b.name === 'pokemon') return 1
+			return 0
+		})
+	}
 	return lists
 })
 
@@ -333,6 +353,7 @@ const toggleFeaturedCategory = (category: Category) => {
 		.category-selector__label {
 			display: flex;
 			align-items: center;
+			text-align: left;
 
 			.icon {
 				height: 1rem;
diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue
index af485f6c13..fb47fad2d2 100644
--- a/apps/frontend/src/pages/discover/[type]/index.vue
+++ b/apps/frontend/src/pages/discover/[type]/index.vue
@@ -44,6 +44,7 @@ import { computed, type Reactive, watch } from 'vue'
 import LogoAnimated from '~/components/brand/LogoAnimated.vue'
 import AdPlaceholder from '~/components/ui/AdPlaceholder.vue'
 import { projectQueryOptions } from '~/composables/queries/project'
+import { versionQueryOptions } from '~/composables/queries/version'
 import type { ModrinthServer } from '~/composables/servers/modrinth-servers.ts'
 import { useModrinthServers } from '~/composables/servers/modrinth-servers.ts'
 import type { DisplayLocation, DisplayMode } from '~/plugins/cosmetics.ts'
@@ -77,6 +78,25 @@ const handleProjectMouseEnter = (result: Labrinth.Search.v2.ResultSearchProject)
 	prefetchTimeout.start()
 }
 
+const handleServerProjectMouseEnter = (result: Labrinth.Search.v3.ResultSearchProject) => {
+	const slug = result.slug || result.project_id
+
+	prefetchTimeout = useTimeoutFn(
+		async () => {
+			queryClient.prefetchQuery(projectQueryOptions.v2(slug, modrinthClient))
+			queryClient.prefetchQuery(projectQueryOptions.v3(slug, modrinthClient))
+
+			const content = result.minecraft_java_server?.content
+			if (content?.kind === 'modpack' && content.version_id) {
+				queryClient.prefetchQuery(versionQueryOptions.v3(content.version_id, modrinthClient))
+			}
+		},
+		HOVER_DURATION_TO_PREFETCH_MS,
+		{ immediate: false },
+	)
+	prefetchTimeout.start()
+}
+
 const handleProjectHoverEnd = () => {
 	if (prefetchTimeout) prefetchTimeout.stop()
 }
@@ -810,6 +830,8 @@ const getServerModpackContent = (hit: Labrinth.Search.v3.ResultSearchProject) =>
 							:max-tags="2"
 							is-server-project
 							exclude-loaders
+							@mouseenter="handleServerProjectMouseEnter(project)"
+							@mouseleave="handleProjectHoverEnd"
 						>
 						</ProjectCard>
 					</template>
diff --git a/apps/frontend/src/pages/organization/[id].vue b/apps/frontend/src/pages/organization/[id].vue
index 9539d3bff4..514bc4886b 100644
--- a/apps/frontend/src/pages/organization/[id].vue
+++ b/apps/frontend/src/pages/organization/[id].vue
@@ -144,7 +144,7 @@
 				<div class="card flex-card">
 					<h2>Members</h2>
 					<div class="details-list">
-						<template v-for="member in acceptedMembers" :key="member.user.id">
+						<template v-for="member in acceptedMembers" :key="member?.user.id">
 							<nuxt-link
 								class="details-list__item details-list__item--type-large"
 								:to="`/user/${member?.user?.username}`"
@@ -187,7 +187,7 @@
 					<NavTabs :links="navLinks" />
 				</div>
 				<ProjectCardList v-if="projects && projects.length > 0">
-					<ProjectCard
+					<template
 						v-for="project in (route.params.projectType !== undefined
 							? (projects ?? []).filter((x) =>
 									x.project_types.includes(
@@ -204,28 +204,55 @@
 							.slice()
 							.sort((a, b) => b.downloads - a.downloads)"
 						:key="project.id"
-						:link="`/${project.project_types[0] ?? 'project'}/${project.slug || project.id}`"
-						:title="project.name"
-						:icon-url="project.icon_url"
-						:banner="project.gallery.find((element) => element.featured)?.url"
-						:summary="project.summary"
-						:date-updated="project.updated"
-						:downloads="project.downloads"
-						:followers="project.followers"
-						:tags="project.categories"
-						:environment="{
-							clientSide: project.client_side,
-							serverSide: project.server_side,
-						}"
-						:status="
-							auth.user &&
-							(auth.user.id! === (user as any).id || tags.staffRoles.includes(auth.user.role))
-								? (project.status as ProjectStatus)
-								: undefined
-						"
-						:color="project.color"
-						layout="list"
-					/>
+					>
+						<ProjectCard
+							v-if="isProjectServer(project)"
+							:link="`/server/${project.slug || project.id}`"
+							:title="project.name"
+							:icon-url="project.icon_url"
+							:summary="project.summary"
+							:tags="project.categories"
+							:server-online-players="
+								project.minecraft_java_server?.ping?.data?.players_online ?? 0
+							"
+							:server-recent-plays="project.minecraft_java_server?.verified_plays_2w ?? 0"
+							:server-region="project.minecraft_server?.region"
+							:server-status-online="!!project.minecraft_java_server?.ping?.data"
+							:server-modpack-content="getServerModpackContent(project)"
+							:status="
+								auth.user && (auth.user.id! === user.id || tags.staffRoles.includes(auth.user.role))
+									? (project.status as ProjectStatus)
+									: undefined
+							"
+							:max-tags="2"
+							layout="list"
+							is-server-project
+							exclude-loaders
+						/>
+						<ProjectCard
+							v-else
+							:link="`/${project.project_types[0] ?? 'project'}/${project.slug || project.id}`"
+							:title="project.name"
+							:icon-url="project.icon_url"
+							:banner="project.gallery.find((element) => element.featured)?.url"
+							:summary="project.summary"
+							:date-updated="project.updated"
+							:downloads="project.downloads"
+							:followers="project.followers"
+							:tags="project.categories"
+							:environment="{
+								clientSide: project.client_side,
+								serverSide: project.server_side,
+							}"
+							:status="
+								auth.user && (auth.user.id! === user.id || tags.staffRoles.includes(auth.user.role))
+									? (project.status as ProjectStatus)
+									: undefined
+							"
+							:color="project.color"
+							layout="list"
+						/>
+					</template>
 				</ProjectCardList>
 				<div v-else-if="true" class="error">
 					<UpToDate class="icon" />
@@ -234,7 +261,7 @@
 						This organization doesn't have any projects yet.
 						<template v-if="isPermission(currentMember?.permissions, 1 << 4)">
 							Would you like to
-							<a class="link" @click="($refs as any).modal_creation?.show()">create one</a>?
+							<a class="link" @click="modal_creation?.show()">create one</a>?
 						</template>
 					</span>
 				</div>
@@ -244,6 +271,7 @@
 </template>
 
 <script setup lang="ts">
+import type { Labrinth } from '@modrinth/api-client'
 import {
 	BoxIcon,
 	ChartIcon,
@@ -267,7 +295,7 @@ import {
 	ProjectCardList,
 	useVIntl,
 } from '@modrinth/ui'
-import type { Organization, ProjectStatus, ProjectType, ProjectV3 } from '@modrinth/utils'
+import type { Organization, ProjectStatus, ProjectType } from '@modrinth/utils'
 import { formatNumber } from '@modrinth/utils'
 
 import UpToDate from '~/assets/images/illustrations/up_to_date.svg?component'
@@ -282,6 +310,11 @@ import {
 } from '~/providers/organization-context.ts'
 import { isPermission } from '~/utils/permissions.ts'
 
+type ProjectV3 = Labrinth.Projects.v3.Project & {
+	client_side: 'required' | 'optional' | 'unsupported'
+	server_side: 'required' | 'optional' | 'unsupported'
+}
+
 const vintl = useVIntl()
 const { formatMessage } = vintl
 
@@ -294,6 +327,7 @@ const route = useNativeRoute()
 const router = useRouter()
 const tags = useGeneratedState()
 const config = useRuntimeConfig()
+const modal_creation = useTemplateRef('modal_creation')
 
 const orgId = useRouteId()
 
@@ -397,6 +431,30 @@ const projectTypes = computed(() => {
 
 	return Object.keys(obj)
 })
+function isProjectServer(project: ProjectV3): boolean {
+	return project.minecraft_server != null
+}
+
+function getServerModpackContent(project: ProjectV3) {
+	const content = project.minecraft_java_server?.content
+	if (content?.kind === 'modpack') {
+		const { project_name, project_icon, project_id } = content
+		if (!project_name) return undefined
+		return {
+			name: project_name,
+			icon: project_icon,
+			onclick:
+				project_id !== project.id
+					? () => {
+							navigateTo(`/project/${project_id}`)
+						}
+					: undefined,
+			showCustomModpackTooltip: project_id === project.id,
+		}
+	}
+	return undefined
+}
+
 const sumDownloads = computed(() => {
 	let sum = 0
 
diff --git a/apps/frontend/src/pages/settings/index.vue b/apps/frontend/src/pages/settings/index.vue
index 5cf6cb8d18..a2c4b2417e 100644
--- a/apps/frontend/src/pages/settings/index.vue
+++ b/apps/frontend/src/pages/settings/index.vue
@@ -257,6 +257,10 @@ const projectListLayouts = defineMessages({
 		id: 'settings.display.project-list-layouts.modpack',
 		defaultMessage: 'Modpacks page',
 	},
+	server: {
+		id: 'settings.display.project-list-layouts.server',
+		defaultMessage: 'Servers page',
+	},
 	user: {
 		id: 'settings.display.project-list-layouts.user',
 		defaultMessage: 'User profile pages',
diff --git a/apps/frontend/src/utils/i18n-project-type.ts b/apps/frontend/src/utils/i18n-project-type.ts
index 15173b1a48..98df9a9bc3 100644
--- a/apps/frontend/src/utils/i18n-project-type.ts
+++ b/apps/frontend/src/utils/i18n-project-type.ts
@@ -49,6 +49,14 @@ const projectTypeMessages = defineMessages({
 		id: 'project-type.server.plural',
 		defaultMessage: 'Servers',
 	},
+	minecraft_java_server: {
+		id: 'project-type.minecraft_java_server.singular',
+		defaultMessage: 'Server',
+	},
+	minecraft_java_servers: {
+		id: 'project-type.minecraft_java_server.plural',
+		defaultMessage: 'Servers',
+	},
 	shader: {
 		id: 'project-type.shader.singular',
 		defaultMessage: 'Shader',
diff --git a/packages/app-lib/src/api/worlds.rs b/packages/app-lib/src/api/worlds.rs
index be8f2fb6db..dcd3b287cb 100644
--- a/packages/app-lib/src/api/worlds.rs
+++ b/packages/app-lib/src/api/worlds.rs
@@ -142,8 +142,6 @@ pub enum WorldDetails {
         index: usize,
         address: String,
         pack_status: ServerPackStatus,
-        #[serde(skip_serializing_if = "Option::is_none")]
-        linked_project_id: Option<String>,
     },
 }
 
@@ -428,7 +426,6 @@ async fn get_server_worlds_in_profile(
                 index,
                 address: server.ip,
                 pack_status: server.accept_textures.into(),
-                linked_project_id: server.linked_project_id,
             },
         };
         worlds.push(world);
@@ -718,7 +715,6 @@ pub async fn add_server_to_profile(
     name: String,
     address: String,
     pack_status: ServerPackStatus,
-    linked_project_id: Option<String>,
 ) -> Result<usize> {
     let mut servers = servers_data::read(profile_path).await?;
     let insert_index = servers
@@ -733,7 +729,6 @@ pub async fn add_server_to_profile(
             accept_textures: pack_status.into(),
             hidden: false,
             icon: None,
-            linked_project_id,
         },
     );
     servers_data::write(profile_path, &servers).await?;
@@ -746,7 +741,6 @@ pub async fn edit_server_in_profile(
     name: String,
     address: String,
     pack_status: ServerPackStatus,
-    linked_project_id: Option<String>,
 ) -> Result<()> {
     let mut servers = servers_data::read(profile_path).await?;
     let server =
@@ -762,9 +756,6 @@ pub async fn edit_server_in_profile(
     server.name = name;
     server.ip = address;
     server.accept_textures = pack_status.into();
-    if let Some(id) = linked_project_id {
-        server.linked_project_id = Some(id);
-    }
     servers_data::write(profile_path, &servers).await?;
     Ok(())
 }
@@ -804,8 +795,6 @@ mod servers_data {
         pub name: String,
         #[serde(skip_serializing_if = "Option::is_none")]
         pub accept_textures: Option<bool>,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        pub linked_project_id: Option<String>,
     }
 
     pub async fn read(instance_dir: &Path) -> Result<Vec<ServerData>> {
diff --git a/packages/assets/index.ts b/packages/assets/index.ts
index 615a7f18b4..02e39d825d 100644
--- a/packages/assets/index.ts
+++ b/packages/assets/index.ts
@@ -149,3 +149,52 @@ export function getTagIcon(tagName: string): IconComponent | undefined {
 	}
 	return getLoaderIcon(tagName) ?? getCategoryIcon(tagName)
 }
+
+export const SERVER_CATEGORY_ICON_MAP: Record<string, string> = {
+	'adventure-mode': 'compass',
+	anarchy: 'skull',
+	'battle-royale': 'target',
+	bedwars: 'bed-double',
+	bosses: 'crown',
+	classes: 'badge',
+	competitive: 'trophy',
+	'creative-mode': 'palette',
+	'creator-community': 'clapperboard',
+	crossplay: 'gamepad-2',
+	'custom-content': 'blocks',
+	dungeons: 'castle',
+	factions: 'flag',
+	gens: 'pickaxe',
+	'hardcore-mode': 'heart-crack',
+	'keep-inventory': 'backpack',
+	kitpvp: 'sword',
+	lifesteal: 'heart-pulse',
+	media: 'film',
+	microgames: 'grid-3x3',
+	minigames: 'dices',
+	mmo: 'globe',
+	network: 'network',
+	'offline-mode': 'wifi-off',
+	oneblock: 'square',
+	op: 'zap',
+	parkour: 'footprints',
+	'personal-worlds': 'house',
+	plots: 'map-pinned',
+	pokemon: 'paw-print',
+	prison: 'lock',
+	pve: 'shield',
+	pvp: 'swords',
+	questing: 'scroll-text',
+	racing: 'gauge',
+	'recording-smp': 'camera',
+	roleplay: 'theater',
+	rpg: 'wand-sparkles',
+	skyblock: 'cloud',
+	smp: 'users',
+	'survival-mode': 'tree-pine',
+	teams: 'handshake',
+	technical: 'terminal',
+	towns: 'building-2',
+	whitelisted: 'badge-check',
+	'world-resets': 'refresh-ccw',
+}
diff --git a/packages/ui/src/components/base/ContentPageHeader.vue b/packages/ui/src/components/base/ContentPageHeader.vue
index 7caadb1214..18aad4a770 100644
--- a/packages/ui/src/components/base/ContentPageHeader.vue
+++ b/packages/ui/src/components/base/ContentPageHeader.vue
@@ -1,36 +1,53 @@
 <template>
-	<div
-		class="grid grid-cols-[1fr_auto] max-lg:gap-x-8 gap-y-6 border-0 border-b border-solid border-divider pb-4"
-	>
-		<div class="flex gap-4 w-full">
-			<slot name="icon" />
-			<div class="flex flex-col gap-2 justify-center w-full">
-				<div class="flex justify-between items-start gap-2">
-					<div class="flex flex-col gap-1.5 justify-center">
-						<div class="flex flex-wrap items-center gap-2">
-							<h1 class="m-0 text-2xl font-semibold leading-none text-contrast">
-								<slot name="title" />
-							</h1>
-							<slot name="title-suffix" />
+	<div class="flex flex-col gap-2 border-0 border-b border-solid border-divider pb-4">
+		<div class="grid grid-cols-[1fr_auto] gap-y-6">
+			<div class="flex gap-4 w-full">
+				<slot name="icon" />
+				<div class="flex flex-col gap-2 justify-center w-full">
+					<div class="flex justify-between items-start gap-2">
+						<div class="flex flex-col gap-1.5 justify-center">
+							<div class="flex flex-wrap items-center gap-2">
+								<h1 class="m-0 text-2xl font-semibold leading-none text-contrast">
+									<slot name="title" />
+								</h1>
+								<slot name="title-suffix" />
+							</div>
+							<p
+								v-if="$slots.summary"
+								class="m-0 max-w-[40rem] empty:hidden"
+								:class="[disableLineClamp ? '' : 'line-clamp-2']"
+							>
+								<slot name="summary" />
+							</p>
+						</div>
+						<div v-if="$slots.summary" class="flex gap-2 items-start max-md:hidden">
+							<slot name="actions" />
 						</div>
-						<p v-if="$slots.summary" class="m-0 line-clamp-2 max-w-[40rem] empty:hidden">
-							<slot name="summary" />
-						</p>
 					</div>
-					<div v-if="$slots.summary" class="flex gap-2 items-start max-lg:hidden">
-						<slot name="actions" />
+					<div v-if="$slots.stats" class="flex flex-wrap gap-3 empty:hidden max-md:hidden">
+						<slot name="stats" />
 					</div>
 				</div>
-				<div v-if="$slots.stats" class="flex flex-wrap gap-3 empty:hidden">
-					<slot name="stats" />
-				</div>
-				<div class="flex gap-2 items-start lg:hidden">
-					<slot name="actions" />
-				</div>
+			</div>
+			<div v-if="!$slots.summary" class="flex gap-2 items-start max-md:hidden">
+				<slot name="actions" />
 			</div>
 		</div>
-		<div v-if="!$slots.summary" class="flex gap-2 items-start max-lg:hidden">
-			<slot name="actions" />
+		<div class="flex justify-between">
+			<div v-if="$slots.stats" class="flex flex-wrap gap-3 empty:hidden md:hidden">
+				<slot name="stats" />
+			</div>
+			<div class="flex gap-2 items-start self-end md:hidden">
+				<slot name="actions" />
+			</div>
 		</div>
 	</div>
 </template>
+
+<script setup lang="ts">
+interface Props {
+	disableLineClamp?: boolean
+}
+
+const { disableLineClamp } = defineProps<Props>()
+</script>
diff --git a/packages/ui/src/components/modal/ConfirmModal.vue b/packages/ui/src/components/modal/ConfirmModal.vue
index cd19864f2e..2bbcc913a0 100644
--- a/packages/ui/src/components/modal/ConfirmModal.vue
+++ b/packages/ui/src/components/modal/ConfirmModal.vue
@@ -38,7 +38,7 @@
 					</button>
 				</ButtonStyled>
 				<ButtonStyled>
-					<button @click="modal.hide()">
+					<button @click="hide()">
 						<XIcon />
 						Cancel
 					</button>
@@ -124,6 +124,9 @@ function proceed() {
 function show() {
 	modal.value.show()
 }
+function hide() {
+	modal.value.hide()
+}
 
-defineExpose({ show })
+defineExpose({ show, hide })
 </script>
diff --git a/packages/ui/src/components/project/ProjectHeader.vue b/packages/ui/src/components/project/ProjectHeader.vue
index 9c068aae6c..b21d2ee680 100644
--- a/packages/ui/src/components/project/ProjectHeader.vue
+++ b/packages/ui/src/components/project/ProjectHeader.vue
@@ -13,7 +13,7 @@
 			{{ project.description }}
 		</template>
 		<template #stats>
-			<div class="flex items-center gap-3">
+			<div class="flex items-center gap-3 flex-wrap gap-y-0">
 				<div
 					v-tooltip="
 						capitalizeString(
diff --git a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
index a9f841ad34..4554b7d27e 100644
--- a/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
+++ b/packages/ui/src/components/project/ProjectSidebarServerInfo.vue
@@ -58,8 +58,12 @@
 		<section v-if="props.ping !== undefined || region" class="flex flex-col gap-2">
 			<h3 class="text-primary text-base m-0">Region</h3>
 			<div class="flex flex-wrap gap-1.5 items-center">
+				<ServerPing
+					v-if="projectV3?.status !== 'draft'"
+					:ping="props.ping"
+					:status-online="props.statusOnline"
+				/>
 				<ServerRegion v-if="region" :region="region" />
-				<ServerPing :ping="props.ping" :status-online="props.statusOnline" />
 			</div>
 		</section>
 		<section v-if="languages.length > 0" class="flex flex-col gap-2">
diff --git a/packages/ui/src/components/project/ProjectSidebarTags.vue b/packages/ui/src/components/project/ProjectSidebarTags.vue
index 4eb548b363..7a88d37c7e 100644
--- a/packages/ui/src/components/project/ProjectSidebarTags.vue
+++ b/packages/ui/src/components/project/ProjectSidebarTags.vue
@@ -2,7 +2,11 @@
 	<div v-if="allTags.length > 0" class="flex flex-col gap-3">
 		<h2 class="text-lg m-0">Tags</h2>
 		<div class="flex flex-wrap gap-1">
-			<TagItem v-for="tag in allTags" :key="tag">
+			<TagItem
+				v-for="tag in allTags"
+				:key="tag"
+				:action="props.project.actualProjectType ? () => handleClickTag(tag) : undefined"
+			>
 				<FormattedTag :tag="tag" />
 			</TagItem>
 		</div>
@@ -10,14 +14,31 @@
 </template>
 <script setup lang="ts">
 import { computed } from 'vue'
+import { useRouter } from 'vue-router'
 
 import FormattedTag from '../base/FormattedTag.vue'
 import TagItem from '../base/TagItem.vue'
 
+const router = useRouter()
+
+const handleClickTag = (tag: string) => {
+	if (!props.project.actualProjectType) return
+
+	const projectType =
+		props.project.actualProjectType === 'minecraft_java_server'
+			? 'server'
+			: props.project.actualProjectType
+
+	const params = projectType === 'server' ? `sc=${tag}` : `f=categories:${tag}`
+
+	router.push(`/discover/${projectType}?${params}`)
+}
+
 const props = defineProps<{
 	project: {
 		categories: string[]
 		additional_categories: string[]
+		actualProjectType?: string
 	}
 }>()
 
diff --git a/packages/ui/src/components/project/ServerProjectHeader.vue b/packages/ui/src/components/project/ServerProjectHeader.vue
index afae5da6d4..067ae72a16 100644
--- a/packages/ui/src/components/project/ServerProjectHeader.vue
+++ b/packages/ui/src/components/project/ServerProjectHeader.vue
@@ -1,7 +1,7 @@
 <template>
-	<ContentPageHeader>
+	<ContentPageHeader disable-line-clamp>
 		<template #icon>
-			<Avatar :src="project.icon_url" :alt="project.title" size="96px" />
+			<Avatar :src="project.icon_url" :alt="project.title" size="108px" />
 		</template>
 		<template #title>
 			{{ project.title }}
@@ -15,6 +15,7 @@
 		<template #stats>
 			<div class="flex items-center gap-3 gap-y-1 flex-wrap">
 				<ServerDetails
+					v-if="projectV3?.status !== 'draft'"
 					:online-players="playersOnline"
 					:status-online="statusOnline"
 					:recent-plays="javaServer?.verified_plays_2w ?? 0"
@@ -24,7 +25,7 @@
 						<TagItem
 							v-for="(category, index) in project.categories"
 							:key="index"
-							:action="() => router.push(`/${project.project_type}s?f=categories:${category}`)"
+							:action="() => router.push(`/discover/servers?sc=${category}`)"
 						>
 							<FormattedTag :tag="category" />
 						</TagItem>
diff --git a/packages/ui/src/components/project/card/ProjectCard.vue b/packages/ui/src/components/project/card/ProjectCard.vue
index fa42dc40b8..4e151bab9a 100644
--- a/packages/ui/src/components/project/card/ProjectCard.vue
+++ b/packages/ui/src/components/project/card/ProjectCard.vue
@@ -49,16 +49,21 @@
 				</div>
 				<div class="mt-auto flex flex-col gap-3 flex-wrap overflow-hidden justify-between grow">
 					<div class="flex items-center gap-1 flex-wrap overflow-hidden">
-						<ServerDetails
-							v-if="isServerProject"
-							:region="serverRegion"
-							:online-players="serverOnlinePlayers"
-							:recent-plays="serverRecentPlays"
-							:ping="serverPing"
-							:status-online="serverStatusOnline"
-							:hide-online-players-label="true"
-							:hide-recent-plays-label="true"
-						/>
+						<template v-if="isServerProject">
+							<ServerOnlinePlayers
+								v-if="serverOnlinePlayers !== undefined"
+								:online="serverOnlinePlayers"
+								:status-online="serverStatusOnline"
+								:hide-label="true"
+							/>
+							<ServerRecentPlays
+								v-if="serverRecentPlays !== undefined"
+								:recent-plays="serverRecentPlays"
+								:hide-label="true"
+							/>
+							<ServerPing v-if="serverPing && serverStatusOnline" :ping="serverPing" />
+							<ServerRegion v-if="serverRegion" :region="serverRegion" />
+						</template>
 						<ProjectCardEnvironment
 							v-if="environment"
 							:client-side="environment.clientSide"
@@ -134,16 +139,21 @@
 			</div>
 			<div class="mt-auto flex items-center gap-3 grid-project-card-list__tags">
 				<div class="flex items-center gap-2 w-full">
-					<ServerDetails
-						v-if="isServerProject"
-						:region="serverRegion"
-						:online-players="serverOnlinePlayers"
-						:status-online="serverStatusOnline"
-						:recent-plays="serverRecentPlays"
-						:ping="serverPing"
-						:hide-online-players-label="true"
-						:hide-recent-plays-label="true"
-					/>
+					<template v-if="isServerProject">
+						<ServerOnlinePlayers
+							v-if="serverOnlinePlayers !== undefined"
+							:online="serverOnlinePlayers"
+							:status-online="serverStatusOnline"
+							:hide-label="true"
+						/>
+						<ServerRecentPlays
+							v-if="serverRecentPlays !== undefined"
+							:recent-plays="serverRecentPlays"
+							:hide-label="true"
+						/>
+						<ServerPing v-if="serverPing && serverStatusOnline" :ping="serverPing" />
+						<ServerRegion v-if="serverRegion" :region="serverRegion" />
+					</template>
 					<div class="flex items-center gap-1">
 						<ProjectCardEnvironment
 							v-if="environment"
@@ -181,8 +191,11 @@ import { computed } from 'vue'
 import { AutoLink, Avatar } from '../../base'
 import { SmartClickable } from '../../base/index.ts'
 import ProjectStatusBadge from '../ProjectStatusBadge.vue'
-import ServerDetails from '../server/ServerDetails.vue'
 import ServerModpackContent from '../server/ServerModpackContent.vue'
+import ServerOnlinePlayers from '../server/ServerOnlinePlayers.vue'
+import ServerPing from '../server/ServerPing.vue'
+import ServerRecentPlays from '../server/ServerRecentPlays.vue'
+import ServerRegion from '../server/ServerRegion.vue'
 import ProjectCardAuthor from './ProjectCardAuthor.vue'
 import ProjectCardDate from './ProjectCardDate.vue'
 import ProjectCardEnvironment, {
diff --git a/packages/ui/src/components/project/server/ServerDetails.vue b/packages/ui/src/components/project/server/ServerDetails.vue
index c4891be88e..031eae067c 100644
--- a/packages/ui/src/components/project/server/ServerDetails.vue
+++ b/packages/ui/src/components/project/server/ServerDetails.vue
@@ -21,7 +21,7 @@ defineProps<{
 }>()
 </script>
 <template>
-	<div class="empty:hidden flex items-center gap-2">
+	<div class="empty:hidden flex items-center gap-2 flex-wrap gap-y-1">
 		<ServerOnlinePlayers
 			v-if="onlinePlayers !== undefined"
 			:online="onlinePlayers"
@@ -33,8 +33,8 @@ defineProps<{
 			:recent-plays="recentPlays"
 			:hide-label="hideRecentPlaysLabel"
 		/>
-		<ServerRegion v-if="region" :region="region" />
 		<ServerPing v-if="ping && statusOnline" :ping="ping" />
+		<ServerRegion v-if="region" :region="region" />
 		<ServerModpackContent
 			v-if="modpackContent"
 			:name="modpackContent.name"
diff --git a/packages/ui/src/components/project/server/ServerPing.vue b/packages/ui/src/components/project/server/ServerPing.vue
index 497802dd4a..344b114bf0 100644
--- a/packages/ui/src/components/project/server/ServerPing.vue
+++ b/packages/ui/src/components/project/server/ServerPing.vue
@@ -21,7 +21,7 @@ const pingClass = computed(() => {
 	if (props.ping === undefined) {
 		return 'border-brand bg-highlight-green text-brand'
 	}
-	if (props.ping < 100) {
+	if (props.ping < 150) {
 		return 'border-brand bg-highlight-green text-brand'
 	}
 	if (props.ping < 250) {
diff --git a/packages/ui/src/components/project/server/ServerRegion.vue b/packages/ui/src/components/project/server/ServerRegion.vue
index ec7e471ca1..9270fb5bc3 100644
--- a/packages/ui/src/components/project/server/ServerRegion.vue
+++ b/packages/ui/src/components/project/server/ServerRegion.vue
@@ -21,5 +21,5 @@ const regionNames: Record<string, string> = {
 const regionName = computed(() => regionNames[region] ?? region)
 </script>
 <template>
-	<TagItem>{{ regionName }}</TagItem>
+	<TagItem v-tooltip="`Server hosted in ${regionName}`">{{ regionName }}</TagItem>
 </template>
diff --git a/packages/ui/src/utils/server-search.ts b/packages/ui/src/utils/server-search.ts
index 88ac2d8cd6..57d9f386e2 100644
--- a/packages/ui/src/utils/server-search.ts
+++ b/packages/ui/src/utils/server-search.ts
@@ -1,4 +1,4 @@
-import { getCategoryIcon } from '@modrinth/assets'
+import { getCategoryIcon, SERVER_CATEGORY_ICON_MAP } from '@modrinth/assets'
 import { computed, type Ref, ref } from 'vue'
 import { useRoute } from 'vue-router'
 
@@ -6,55 +6,6 @@ import { useVIntl } from '../composables/i18n'
 import type { FilterType, FilterValue, SortType, Tags } from './search'
 import { formatCategory, formatCategoryHeader } from './tag-messages'
 
-const SERVER_CATEGORY_ICON_MAP: Record<string, string> = {
-	'adventure-mode': 'compass',
-	anarchy: 'skull',
-	'battle-royale': 'target',
-	bedwars: 'bed-double',
-	bosses: 'crown',
-	classes: 'badge',
-	competitive: 'trophy',
-	'creative-mode': 'palette',
-	'creator-community': 'clapperboard',
-	crossplay: 'gamepad-2',
-	'custom-content': 'blocks',
-	dungeons: 'castle',
-	factions: 'flag',
-	gens: 'pickaxe',
-	'hardcore-mode': 'heart-crack',
-	'keep-inventory': 'backpack',
-	kitpvp: 'sword',
-	lifesteal: 'heart-pulse',
-	media: 'film',
-	microgames: 'grid-3x3',
-	minigames: 'dices',
-	mmo: 'globe',
-	network: 'network',
-	'offline-mode': 'wifi-off',
-	oneblock: 'square',
-	op: 'zap',
-	parkour: 'footprints',
-	'personal-worlds': 'house',
-	plots: 'map-pinned',
-	pokemon: 'paw-print',
-	prison: 'lock',
-	pve: 'shield',
-	pvp: 'swords',
-	questing: 'scroll-text',
-	racing: 'gauge',
-	'recording-smp': 'camera',
-	roleplay: 'theater',
-	rpg: 'wand-sparkles',
-	skyblock: 'cloud',
-	smp: 'users',
-	'survival-mode': 'tree-pine',
-	teams: 'handshake',
-	technical: 'terminal',
-	towns: 'building-2',
-	whitelisted: 'badge-check',
-	'world-resets': 'refresh-ccw',
-}
-
 export const SERVER_REGIONS = [
 	{ code: 'us_east', name: 'US East' },
 	{ code: 'us_west', name: 'US West' },
diff --git a/packages/utils/utils.ts b/packages/utils/utils.ts
index 372abb5ad0..d9b0adf770 100644
--- a/packages/utils/utils.ts
+++ b/packages/utils/utils.ts
@@ -60,8 +60,23 @@ export const computeVersions = (versions, members) => {
 		.sort((a, b) => dayjs(b.date_published) - dayjs(a.date_published))
 }
 
+const SERVER_HEADER_ORDER = [
+	'minecraft_server_features',
+	'minecraft_server_gameplay',
+	'minecraft_server_meta',
+	'minecraft_server_community',
+]
+
 export const sortedCategories = (tags, formatCategoryName, locale) => {
 	return tags.categories.slice().sort((a, b) => {
+		const aServerIdx = SERVER_HEADER_ORDER.indexOf(a.header)
+		const bServerIdx = SERVER_HEADER_ORDER.indexOf(b.header)
+		if (aServerIdx !== -1 || bServerIdx !== -1) {
+			return (
+				(aServerIdx === -1 ? Infinity : aServerIdx) - (bServerIdx === -1 ? Infinity : bServerIdx)
+			)
+		}
+
 		const headerCompare = a.header.localeCompare(b.header)
 		if (headerCompare !== 0) {
 			return headerCompare