From 8d6179f71fca52c4622b1ff540e1752a55fb9182 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Mon, 27 Apr 2026 14:10:10 +0100
Subject: [PATCH 1/3] feat: reshuffle layout for worlds

---
 apps/app-frontend/src/App.vue                 |  49 ++++
 .../src/pages/hosting/manage/Backups.vue      |   2 +-
 .../src/pages/hosting/manage/Content.vue      |   2 +-
 .../src/pages/hosting/manage/Index.vue        |   2 +-
 .../src/pages/hosting/manage/World.vue        |  16 ++
 .../src/pages/hosting/manage/index.js         |   3 +-
 .../providers/setup/server-install-content.ts |   9 +-
 apps/app-frontend/src/routes.js               |  34 +++
 .../middleware/server-world-tabs.global.ts    |  40 ++++
 .../src/pages/discover/[type]/index.vue       |  16 +-
 .../hosting/manage/[id]/worlds/[world_id].vue |  11 +
 .../[id]/{ => worlds/[world_id]}/backups.vue  |   2 +-
 .../[id]/{ => worlds/[world_id]}/files.vue    |   0
 .../[world_id]/index.vue}                     |   2 +-
 .../servers/ServerSettingsModal.vue           |   2 +-
 .../admonitions/ServerPanelAdmonitions.vue    |   6 +-
 .../servers/backups/BackupCreateModal.vue     |   4 +-
 .../servers/backups/BackupRenameModal.vue     |   4 +-
 .../servers/backups/BackupRestoreModal.vue    |   6 +-
 .../server-header/PanelServerActionButton.vue |  21 +-
 .../server-header/ServerManageHeader.vue      | 144 +++++-------
 .../src/composables/server-backups-queue.ts   |   2 +-
 .../server-settings/pages/installation.vue    |  11 +-
 .../server-settings/pages/properties.vue      |   6 +-
 .../hosting/manage/[id]/onboarding.vue        |   6 +-
 .../wrapped/hosting/manage/backups.vue        |   6 +-
 .../manage/components/ServerManageStats.vue   |   6 +-
 .../wrapped/hosting/manage/content.vue        |   8 +-
 .../layouts/wrapped/hosting/manage/root.vue   |  81 ++++---
 .../wrapped/hosting/manage/world-root.vue     | 213 ++++++++++++++++++
 .../layouts/wrapped/hosting/manage/worlds.vue |  12 +-
 packages/ui/src/layouts/wrapped/index.ts      |   1 +
 .../servers/ServerPanelAdmonitions.stories.ts |   2 +-
 33 files changed, 550 insertions(+), 179 deletions(-)
 create mode 100644 apps/app-frontend/src/pages/hosting/manage/World.vue
 create mode 100644 apps/frontend/src/middleware/server-world-tabs.global.ts
 create mode 100644 apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id].vue
 rename apps/frontend/src/pages/hosting/manage/[id]/{ => worlds/[world_id]}/backups.vue (93%)
 rename apps/frontend/src/pages/hosting/manage/[id]/{ => worlds/[world_id]}/files.vue (100%)
 rename apps/frontend/src/pages/hosting/manage/[id]/{content.vue => worlds/[world_id]/index.vue} (92%)
 create mode 100644 packages/ui/src/layouts/wrapped/hosting/manage/world-root.vue

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 5cb3b66d26..c51fc87cc2 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -439,6 +439,11 @@ const sidebarOverlayScrollbarsOptions = Object.freeze({
 	},
 })
 
+router.beforeEach(async (to) => {
+	const redirect = await resolveLegacyServerWorldTabRedirect(to)
+	if (redirect) return redirect
+})
+
 router.beforeEach(() => {
 	suspensePending = false
 	if (routerToken) loading.end(routerToken)
@@ -470,6 +475,50 @@ function onSuspensePending() {
 	suspenseToken = loading.begin()
 }
 
+async function resolveLegacyServerWorldTabRedirect(to) {
+	if (!['ServerManageContent', 'ServerManageFiles', 'ServerManageBackups'].includes(to.name)) {
+		return null
+	}
+
+	const serverId = getRouteParam(to.params.id)
+	if (!serverId) return null
+
+	const tabPath =
+		to.name === 'ServerManageFiles' ? '/files' : to.name === 'ServerManageBackups' ? '/backups' : ''
+	const worldsPath = `/hosting/manage/${encodeURIComponent(serverId)}/worlds`
+
+	try {
+		const serverFull = await tauriApiClient.archon.servers_v1.get(serverId)
+		const world = serverFull.worlds.find((item) => item.is_active) ?? serverFull.worlds[0]
+		if (world) {
+			return {
+				path: `${worldsPath}/${encodeURIComponent(world.id)}${tabPath}`,
+				query: to.query,
+				hash: to.hash,
+				replace: true,
+			}
+		}
+	} catch {
+		return {
+			path: worldsPath,
+			query: to.query,
+			hash: to.hash,
+			replace: true,
+		}
+	}
+
+	return {
+		path: worldsPath,
+		query: to.query,
+		hash: to.hash,
+		replace: true,
+	}
+}
+
+function getRouteParam(param) {
+	return Array.isArray(param) ? param[0] : param
+}
+
 function onSuspenseResolve() {
 	if (suspenseToken) {
 		loading.end(suspenseToken)
diff --git a/apps/app-frontend/src/pages/hosting/manage/Backups.vue b/apps/app-frontend/src/pages/hosting/manage/Backups.vue
index 0ebb7bd800..b62de2ba6d 100644
--- a/apps/app-frontend/src/pages/hosting/manage/Backups.vue
+++ b/apps/app-frontend/src/pages/hosting/manage/Backups.vue
@@ -13,7 +13,7 @@ const queryClient = useQueryClient()
 if (worldId.value) {
 	try {
 		await queryClient.ensureQueryData({
-			queryKey: ['backups', 'list', serverId],
+			queryKey: ['backups', 'list', serverId, worldId.value],
 			queryFn: () => client.archon.backups_v1.list(serverId, worldId.value!),
 			staleTime: 30_000,
 		})
diff --git a/apps/app-frontend/src/pages/hosting/manage/Content.vue b/apps/app-frontend/src/pages/hosting/manage/Content.vue
index ab7d242452..1306234cc3 100644
--- a/apps/app-frontend/src/pages/hosting/manage/Content.vue
+++ b/apps/app-frontend/src/pages/hosting/manage/Content.vue
@@ -13,7 +13,7 @@ const queryClient = useQueryClient()
 if (worldId.value) {
 	try {
 		await queryClient.ensureQueryData({
-			queryKey: ['content', 'list', 'v1', serverId],
+			queryKey: ['content', 'list', 'v1', serverId, worldId.value],
 			queryFn: () =>
 				client.archon.content_v1.getAddons(serverId, worldId.value!, { from_modpack: false }),
 			staleTime: 30_000,
diff --git a/apps/app-frontend/src/pages/hosting/manage/Index.vue b/apps/app-frontend/src/pages/hosting/manage/Index.vue
index f1e4388755..030f74a7e3 100644
--- a/apps/app-frontend/src/pages/hosting/manage/Index.vue
+++ b/apps/app-frontend/src/pages/hosting/manage/Index.vue
@@ -93,7 +93,7 @@ watch(
 			breadcrumbs.setName('Server', server.name)
 			breadcrumbs.setContext({
 				name: server.name,
-				link: `/hosting/manage/${serverId.value}/content`,
+				link: `/hosting/manage/${serverId.value}/worlds`,
 			})
 		}
 	},
diff --git a/apps/app-frontend/src/pages/hosting/manage/World.vue b/apps/app-frontend/src/pages/hosting/manage/World.vue
new file mode 100644
index 0000000000..fe52492c50
--- /dev/null
+++ b/apps/app-frontend/src/pages/hosting/manage/World.vue
@@ -0,0 +1,16 @@
+<template>
+	<ServersManageWorldRootLayout>
+		<RouterView v-slot="{ Component }">
+			<template v-if="Component">
+				<Suspense>
+					<component :is="Component" />
+				</Suspense>
+			</template>
+		</RouterView>
+	</ServersManageWorldRootLayout>
+</template>
+
+<script setup lang="ts">
+import { ServersManageWorldRootLayout } from '@modrinth/ui'
+import { RouterView } from 'vue-router'
+</script>
diff --git a/apps/app-frontend/src/pages/hosting/manage/index.js b/apps/app-frontend/src/pages/hosting/manage/index.js
index e06f46e2a2..6e77f9e638 100644
--- a/apps/app-frontend/src/pages/hosting/manage/index.js
+++ b/apps/app-frontend/src/pages/hosting/manage/index.js
@@ -3,6 +3,7 @@ import Content from './Content.vue'
 import Files from './Files.vue'
 import Index from './Index.vue'
 import Overview from './Overview.vue'
+import World from './World.vue'
 import Worlds from './Worlds.vue'
 
-export { Backups, Content, Files, Index, Overview, Worlds }
+export { Backups, Content, Files, Index, Overview, World, Worlds }
diff --git a/apps/app-frontend/src/providers/setup/server-install-content.ts b/apps/app-frontend/src/providers/setup/server-install-content.ts
index 35919d9d73..021d23b5d9 100644
--- a/apps/app-frontend/src/providers/setup/server-install-content.ts
+++ b/apps/app-frontend/src/providers/setup/server-install-content.ts
@@ -101,7 +101,7 @@ export function createServerInstallContent(opts: {
 		if (serverFlowFrom.value === 'reset-server') {
 			return `/hosting/manage/${sid}?openSettings=installation`
 		}
-		return `/hosting/manage/${sid}/content`
+		return getServerWorldContentPath(sid, effectiveServerWorldId.value)
 	})
 	const serverBackLabel = computed(() => {
 		if (serverFlowFrom.value === 'onboarding') return 'Back to setup'
@@ -351,7 +351,7 @@ export function createServerInstallContent(opts: {
 
 			if (serverFlowFrom.value === 'onboarding') {
 				await client.archon.servers_v1.endIntro(sid)
-				await router.push(`/hosting/manage/${sid}/content`)
+				await router.push(getServerWorldContentPath(sid, wid))
 				return
 			}
 
@@ -366,6 +366,11 @@ export function createServerInstallContent(opts: {
 		serverContentProjectIds.value = new Set([...serverContentProjectIds.value, id])
 	}
 
+	function getServerWorldContentPath(serverId: string, worldId: string | null) {
+		const base = `/hosting/manage/${encodeURIComponent(serverId)}/worlds`
+		return worldId ? `${base}/${encodeURIComponent(worldId)}` : base
+	}
+
 	return {
 		serverIdQuery,
 		worldIdQuery,
diff --git a/apps/app-frontend/src/routes.js b/apps/app-frontend/src/routes.js
index 410869c46a..e0b131f3d7 100644
--- a/apps/app-frontend/src/routes.js
+++ b/apps/app-frontend/src/routes.js
@@ -65,6 +65,40 @@ export default new createRouter({
 						breadcrumb: [{ name: '?Server' }],
 					},
 				},
+				{
+					path: 'worlds/:world_id',
+					name: 'ServerManageWorld',
+					component: Hosting.World,
+					meta: {
+						breadcrumb: [{ name: '?Server' }],
+					},
+					children: [
+						{
+							path: '',
+							name: 'ServerManageWorldContent',
+							component: Hosting.Content,
+							meta: {
+								breadcrumb: [{ name: '?Server' }],
+							},
+						},
+						{
+							path: 'files',
+							name: 'ServerManageWorldFiles',
+							component: Hosting.Files,
+							meta: {
+								breadcrumb: [{ name: '?Server' }],
+							},
+						},
+						{
+							path: 'backups',
+							name: 'ServerManageWorldBackups',
+							component: Hosting.Backups,
+							meta: {
+								breadcrumb: [{ name: '?Server' }],
+							},
+						},
+					],
+				},
 				{
 					path: 'files',
 					name: 'ServerManageFiles',
diff --git a/apps/frontend/src/middleware/server-world-tabs.global.ts b/apps/frontend/src/middleware/server-world-tabs.global.ts
new file mode 100644
index 0000000000..2a740b7dea
--- /dev/null
+++ b/apps/frontend/src/middleware/server-world-tabs.global.ts
@@ -0,0 +1,40 @@
+import { createModrinthClient } from '~/helpers/api.ts'
+
+export default defineNuxtRouteMiddleware(async (to) => {
+	const match = to.path.match(/^\/hosting\/manage\/([^/]+)\/(content|files|backups)\/?$/)
+	if (!match) return
+
+	const serverId = decodeURIComponent(match[1])
+	const tab = match[2]
+	const worldsPath = `/hosting/manage/${encodeURIComponent(serverId)}/worlds`
+	const tabPath = tab === 'content' ? '' : `/${tab}`
+	const auth = await useAuth()
+
+	if (auth.value.token) {
+		try {
+			const config = useRuntimeConfig()
+			const client = createModrinthClient(auth, {
+				apiBaseUrl: config.public.apiBaseUrl.replace('/v2/', '/'),
+				archonBaseUrl: config.public.pyroBaseUrl.replace('/v2/', '/'),
+				rateLimitKey: config.rateLimitKey,
+			})
+			const serverFull = await client.archon.servers_v1.get(serverId)
+			const world = serverFull.worlds.find((item) => item.is_active) ?? serverFull.worlds[0]
+
+			if (world) {
+				return navigateTo(
+					{
+						path: `${worldsPath}/${encodeURIComponent(world.id)}${tabPath}`,
+						query: to.query,
+						hash: to.hash,
+					},
+					{ replace: true },
+				)
+			}
+		} catch {
+			return navigateTo({ path: worldsPath, query: to.query, hash: to.hash }, { replace: true })
+		}
+	}
+
+	return navigateTo({ path: worldsPath, query: to.query, hash: to.hash }, { replace: true })
+})
diff --git a/apps/frontend/src/pages/discover/[type]/index.vue b/apps/frontend/src/pages/discover/[type]/index.vue
index 96985c19bd..8f041e1f3f 100644
--- a/apps/frontend/src/pages/discover/[type]/index.vue
+++ b/apps/frontend/src/pages/discover/[type]/index.vue
@@ -211,7 +211,10 @@ function syncHiddenInstalledProjectIds() {
 	hiddenInstalledProjectIdsInitialized.value = true
 }
 
-const contentQueryKey = computed(() => ['content', 'list', currentServerId.value ?? ''] as const)
+const contentQueryKey = computed(
+	() =>
+		['content', 'list', 'v1', currentServerId.value ?? '', currentWorldId.value ?? null] as const,
+)
 const { data: serverContentData, error: serverContentError } = useQuery({
 	queryKey: contentQueryKey,
 	queryFn: () => client.archon.content_v1.getAddons(currentServerId.value!, currentWorldId.value!),
@@ -252,7 +255,7 @@ const installContentMutation = useMutation({
 		}),
 	onSuccess: () => {
 		if (currentServerId.value) {
-			queryClient.refetchQueries({ queryKey: ['content', 'list', currentServerId.value] })
+			queryClient.refetchQueries({ queryKey: contentQueryKey.value })
 		}
 	},
 })
@@ -551,7 +554,7 @@ async function onModpackFlowCreate(config: CreationFlowContextValue) {
 		if (fromContext.value === 'onboarding') {
 			await client.archon.servers_v1.endIntro(currentServerId.value)
 			queryClient.invalidateQueries({ queryKey: ['servers', 'detail', currentServerId.value] })
-			navigateTo(`/hosting/manage/${currentServerId.value}/content`)
+			navigateTo(getServerWorldContentPath(currentServerId.value, currentWorldId.value ?? null))
 		} else {
 			navigateTo(`/hosting/manage/${currentServerId.value}?openSettings=installation`)
 		}
@@ -566,9 +569,14 @@ const serverBackUrl = computed(() => {
 	const id = serverData.value.server_id
 	if (fromContext.value === 'onboarding') return `/hosting/manage/${id}?resumeModal=setup-type`
 	if (fromContext.value === 'reset-server') return `/hosting/manage/${id}?openSettings=installation`
-	return `/hosting/manage/${id}/content`
+	return getServerWorldContentPath(id, currentWorldId.value ?? null)
 })
 
+function getServerWorldContentPath(serverId: string, worldId: string | null) {
+	const base = `/hosting/manage/${encodeURIComponent(serverId)}/worlds`
+	return worldId ? `${base}/${encodeURIComponent(worldId)}` : base
+}
+
 const serverBackLabel = computed(() => {
 	if (fromContext.value === 'onboarding') return 'Back to setup'
 	if (fromContext.value === 'reset-server') return 'Cancel reset'
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id].vue b/apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id].vue
new file mode 100644
index 0000000000..357dc14f4a
--- /dev/null
+++ b/apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id].vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+import { ServersManageWorldRootLayout } from '@modrinth/ui'
+
+const route = useNativeRoute()
+</script>
+
+<template>
+	<ServersManageWorldRootLayout>
+		<NuxtPage :route="route" />
+	</ServersManageWorldRootLayout>
+</template>
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/backups.vue b/apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id]/backups.vue
similarity index 93%
rename from apps/frontend/src/pages/hosting/manage/[id]/backups.vue
rename to apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id]/backups.vue
index 467662653f..ab36852f6a 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id]/backups.vue
@@ -14,7 +14,7 @@ const flags = useFeatureFlags()
 if (worldId.value) {
 	try {
 		await queryClient.ensureQueryData({
-			queryKey: ['backups', 'list', serverId],
+			queryKey: ['backups', 'list', serverId, worldId.value],
 			queryFn: () => client.archon.backups_v1.list(serverId, worldId.value!),
 			staleTime: 30_000,
 		})
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/files.vue b/apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id]/files.vue
similarity index 100%
rename from apps/frontend/src/pages/hosting/manage/[id]/files.vue
rename to apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id]/files.vue
diff --git a/apps/frontend/src/pages/hosting/manage/[id]/content.vue b/apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id]/index.vue
similarity index 92%
rename from apps/frontend/src/pages/hosting/manage/[id]/content.vue
rename to apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id]/index.vue
index 6e130515b0..a5cd8e6ae6 100644
--- a/apps/frontend/src/pages/hosting/manage/[id]/content.vue
+++ b/apps/frontend/src/pages/hosting/manage/[id]/worlds/[world_id]/index.vue
@@ -13,7 +13,7 @@ const queryClient = useQueryClient()
 if (worldId.value) {
 	try {
 		await queryClient.ensureQueryData({
-			queryKey: ['content', 'list', 'v1', serverId],
+			queryKey: ['content', 'list', 'v1', serverId, worldId.value],
 			queryFn: () =>
 				client.archon.content_v1.getAddons(serverId, worldId.value!, { from_modpack: false }),
 			staleTime: 30_000,
diff --git a/packages/ui/src/components/servers/ServerSettingsModal.vue b/packages/ui/src/components/servers/ServerSettingsModal.vue
index a72001c73b..6575ad2afa 100644
--- a/packages/ui/src/components/servers/ServerSettingsModal.vue
+++ b/packages/ui/src/components/servers/ServerSettingsModal.vue
@@ -186,7 +186,7 @@ async function show({ serverId, tabIndex, tabId }: ShowOptions) {
 				queryFn: () => client.archon.properties_v1.getProperties(targetServerId, worldId.value!),
 			})
 			queryClient.prefetchQuery({
-				queryKey: ['content', 'list', 'v1', targetServerId],
+				queryKey: ['content', 'list', 'v1', targetServerId, worldId.value],
 				queryFn: () =>
 					client.archon.content_v1.getAddons(targetServerId, worldId.value!, {
 						from_modpack: false,
diff --git a/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue b/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue
index e976f60685..8e0f4dcfa6 100644
--- a/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue
+++ b/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue
@@ -55,8 +55,12 @@ const messages = defineMessages({
 	},
 })
 
-const isOnContentTab = computed(() => route.path.includes('/content'))
 const isOnFilesTab = computed(() => route.path.includes('/files'))
+const isOnContentTab = computed(
+	() =>
+		route.path.includes('/content') ||
+		(!!route.params.world_id && !isOnFilesTab.value && !route.path.includes('/backups')),
+)
 
 const bannerCoversInstalling = computed(
 	() => ctx.server.value?.status === 'installing' || ctx.isSyncingContent.value,
diff --git a/packages/ui/src/components/servers/backups/BackupCreateModal.vue b/packages/ui/src/components/servers/backups/BackupCreateModal.vue
index ded244ba2e..e66d837218 100644
--- a/packages/ui/src/components/servers/backups/BackupCreateModal.vue
+++ b/packages/ui/src/components/servers/backups/BackupCreateModal.vue
@@ -87,12 +87,12 @@ const props = defineProps<{
 	backups?: Archon.BackupsQueue.v1.BackupQueueBackup[]
 }>()
 
-const backupsQueryKey = ['backups', 'queue', ctx.serverId]
+const backupsQueryKey = computed(() => ['backups', 'queue', ctx.serverId, ctx.worldId.value])
 
 const createMutation = useMutation({
 	mutationFn: (name: string) =>
 		client.archon.backups_queue_v1.create(ctx.serverId, ctx.worldId.value!, { name }),
-	onSuccess: () => queryClient.invalidateQueries({ queryKey: backupsQueryKey }),
+	onSuccess: () => queryClient.invalidateQueries({ queryKey: backupsQueryKey.value }),
 })
 
 const modal = ref<InstanceType<typeof NewModal>>()
diff --git a/packages/ui/src/components/servers/backups/BackupRenameModal.vue b/packages/ui/src/components/servers/backups/BackupRenameModal.vue
index b06ffc7c08..0c78de0fbc 100644
--- a/packages/ui/src/components/servers/backups/BackupRenameModal.vue
+++ b/packages/ui/src/components/servers/backups/BackupRenameModal.vue
@@ -69,12 +69,12 @@ const props = defineProps<{
 	backups?: Archon.BackupsQueue.v1.BackupQueueBackup[]
 }>()
 
-const backupsQueryKey = ['backups', 'queue', ctx.serverId]
+const backupsQueryKey = computed(() => ['backups', 'queue', ctx.serverId, ctx.worldId.value])
 
 const renameMutation = useMutation({
 	mutationFn: ({ backupId, name }: { backupId: string; name: string }) =>
 		client.archon.backups_v1.rename(ctx.serverId, ctx.worldId.value!, backupId, { name }),
-	onSuccess: () => queryClient.invalidateQueries({ queryKey: backupsQueryKey }),
+	onSuccess: () => queryClient.invalidateQueries({ queryKey: backupsQueryKey.value }),
 })
 
 const modal = ref<InstanceType<typeof NewModal>>()
diff --git a/packages/ui/src/components/servers/backups/BackupRestoreModal.vue b/packages/ui/src/components/servers/backups/BackupRestoreModal.vue
index 2892bbe066..9fb4e48a49 100644
--- a/packages/ui/src/components/servers/backups/BackupRestoreModal.vue
+++ b/packages/ui/src/components/servers/backups/BackupRestoreModal.vue
@@ -39,7 +39,7 @@
 import type { Archon } from '@modrinth/api-client'
 import { RotateCounterClockwiseIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
 import { useMutation, useQueryClient } from '@tanstack/vue-query'
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 
 import {
 	injectModrinthClient,
@@ -56,7 +56,7 @@ const client = injectModrinthClient()
 const queryClient = useQueryClient()
 const ctx = injectModrinthServerContext()
 
-const backupsQueryKey = ['backups', 'queue', ctx.serverId]
+const backupsQueryKey = computed(() => ['backups', 'queue', ctx.serverId, ctx.worldId.value])
 
 function safetyBackupName(backupName: string) {
 	const base = `Before restoring "${backupName}"`
@@ -66,7 +66,7 @@ function safetyBackupName(backupName: string) {
 const restoreMutation = useMutation({
 	mutationFn: ({ backupId, name }: { backupId: string; name: string }) =>
 		client.archon.backups_queue_v1.restore(ctx.serverId, ctx.worldId.value!, backupId, { name }),
-	onSuccess: () => queryClient.invalidateQueries({ queryKey: backupsQueryKey }),
+	onSuccess: () => queryClient.invalidateQueries({ queryKey: backupsQueryKey.value }),
 })
 
 const modal = ref<InstanceType<typeof NewModal>>()
diff --git a/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue b/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
index fd6cd6930d..256f98bf37 100644
--- a/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
+++ b/packages/ui/src/components/servers/server-header/PanelServerActionButton.vue
@@ -1,14 +1,14 @@
 <template>
 	<div class="contents">
 		<div class="flex flex-row items-center gap-2 rounded-lg">
-			<ButtonStyled v-if="isInstalling" type="standard" color="brand" size="large">
+			<ButtonStyled v-if="isInstalling" type="standard" color="brand" :size="size">
 				<button disabled class="flex-shrink-0">
 					<LoaderCircleIcon class="size-5 animate-spin" /> Installing...
 				</button>
 			</ButtonStyled>
 
 			<template v-else-if="showRestartButton">
-				<ButtonStyled type="standard" color="orange" size="large">
+				<ButtonStyled type="standard" color="orange" :size="size">
 					<button v-tooltip="busyTooltip" :disabled="!canTakeAction" @click="handlePrimaryAction">
 						<UpdatedIcon />
 						<span>{{ primaryActionText }}</span>
@@ -17,7 +17,7 @@
 
 				<JoinedButtons
 					color="red"
-					size="large"
+					:size="size"
 					:actions="stopSplitActions"
 					:primary-disabled="!canTakeAction"
 					:dropdown-disabled="!canKill"
@@ -32,7 +32,7 @@
 			<template v-else-if="isStopping">
 				<JoinedButtons
 					color="red"
-					size="large"
+					:size="size"
 					:actions="stopSplitActions"
 					:primary-disabled="true"
 					:dropdown-disabled="!canKill"
@@ -46,10 +46,10 @@
 			</template>
 
 			<template v-else>
-				<ButtonStyled type="standard" color="brand" size="large">
+				<ButtonStyled type="standard" color="brand" :size="size">
 					<button v-tooltip="busyTooltip" :disabled="!canTakeAction" @click="handlePrimaryAction">
 						<PlayIcon />
-						<span>{{ primaryActionText }}</span>
+						<span>{{ startActionText }}</span>
 					</button>
 				</ButtonStyled>
 			</template>
@@ -74,9 +74,13 @@ import { useServerPowerAction } from './use-server-power-action'
 const props = withDefaults(
 	defineProps<{
 		disabled?: boolean
+		size?: 'standard' | 'large' | 'small'
+		startLabel?: string
 	}>(),
 	{
 		disabled: false,
+		size: 'large',
+		startLabel: 'Start',
 	},
 )
 
@@ -94,6 +98,11 @@ const {
 	disabled: computed(() => props.disabled),
 })
 
+const size = computed(() => props.size)
+const startActionText = computed(() =>
+	primaryActionText.value === 'Start' ? props.startLabel : primaryActionText.value,
+)
+
 const stopSplitActions = computed<JoinedButtonAction[]>(() => [
 	{
 		id: 'stop',
diff --git a/packages/ui/src/components/servers/server-header/ServerManageHeader.vue b/packages/ui/src/components/servers/server-header/ServerManageHeader.vue
index 391546aecf..c6beb30622 100644
--- a/packages/ui/src/components/servers/server-header/ServerManageHeader.vue
+++ b/packages/ui/src/components/servers/server-header/ServerManageHeader.vue
@@ -18,57 +18,24 @@
 					<SettingsIcon />
 					Configuring server...
 				</div>
-				<div v-else class="flex flex-wrap items-center gap-2">
-					<div v-if="props.server?.loader" class="flex items-center gap-2 font-medium capitalize">
-						<LoaderIcon :loader="props.server.loader" class="flex shrink-0 [&&]:size-5" />
-						{{ props.server.loader }} {{ props.server.mc_version }}
-					</div>
-
-					<div
-						v-if="
-							props.server?.loader &&
-							props.server?.net?.domain &&
-							!userPreferences.hideSubdomainLabel
-						"
-						class="h-1.5 w-1.5 rounded-full bg-surface-5"
-					/>
-
-					<div
-						v-if="props.server?.net?.domain && !userPreferences.hideSubdomainLabel"
-						v-tooltip="'Copy server address'"
-						class="flex cursor-pointer items-center gap-2 font-medium hover:underline text-nowrap"
-						@click="copyServerAddress"
-					>
-						<LinkIcon class="flex size-5 shrink-0" />
-						{{ props.server.net.domain }}.modrinth.gg
-					</div>
-
-					<div v-if="showUptime" class="h-1.5 w-1.5 rounded-full bg-surface-5" />
-
-					<div v-if="showUptime" class="flex items-center gap-2 font-medium">
-						<TimerIcon class="flex size-5 shrink-0" />
-						{{ formattedUptime }}
-					</div>
-
-					<div
-						v-if="showProject && (props.server?.loader || props.server?.net?.domain || showUptime)"
-						class="h-1.5 w-1.5 rounded-full bg-surface-5"
-					/>
-
-					<div
-						v-if="showProject"
-						class="flex items-center gap-1.5 font-medium text-primary text-nowrap"
-					>
-						Linked to
-						<Avatar
-							:src="props.serverProject?.icon_url ?? undefined"
-							:alt="props.serverProject?.title ?? ''"
-							size="24px"
-						/>
-						<AutoLink :to="serverProjectLink" class="truncate text-primary hover:underline">
-							{{ props.serverProject?.title }}
-						</AutoLink>
-					</div>
+				<div v-else class="flex min-w-0 flex-wrap items-center gap-2">
+					<template v-for="(item, index) in headerStats" :key="item.id">
+						<div v-if="index > 0" class="h-1.5 w-1.5 rounded-full bg-surface-5" />
+						<button
+							v-if="item.copyable"
+							v-tooltip="'Copy server address'"
+							class="m-0 flex min-w-0 cursor-pointer items-center gap-2 border-0 bg-transparent p-0 font-medium text-secondary hover:underline text-nowrap"
+							type="button"
+							@click="copyServerAddress"
+						>
+							<component :is="item.icon" class="flex size-5 shrink-0" />
+							<span class="truncate">{{ item.label }}</span>
+						</button>
+						<div v-else class="flex min-w-0 items-center gap-2 font-medium text-secondary text-nowrap">
+							<component :is="item.icon" class="flex size-5 shrink-0" />
+							<span class="truncate">{{ item.label }}</span>
+						</div>
+					</template>
 				</div>
 			</template>
 			<template #actions>
@@ -81,16 +48,12 @@
 <script setup lang="ts">
 import type { Archon } from '@modrinth/api-client'
 import { NuxtModrinthClient } from '@modrinth/api-client'
-import { LinkIcon, LoaderIcon, SettingsIcon, TimerIcon } from '@modrinth/assets'
-import { useStorage } from '@vueuse/core'
+import { GlobeIcon, LinkIcon, SettingsIcon } from '@modrinth/assets'
+import type { Component } from 'vue'
 import { computed } from 'vue'
 
-import { AutoLink, Avatar, ContentPageHeader, ServerIcon } from '#ui/components'
-import {
-	injectModrinthClient,
-	injectModrinthServerContext,
-	injectNotificationManager,
-} from '#ui/providers'
+import { ContentPageHeader, ServerIcon } from '#ui/components'
+import { injectModrinthClient, injectNotificationManager } from '#ui/providers'
 
 type ServerProjectSummary = {
 	id: string
@@ -99,12 +62,20 @@ type ServerProjectSummary = {
 	icon_url?: string | null
 }
 
+type HeaderStat = {
+	id: string
+	label: string
+	icon: Component
+	copyable?: boolean
+}
+
 const props = withDefaults(
 	defineProps<{
 		server: Archon.Servers.v0.Server | null | undefined
 		serverImage?: string | null
 		serverProject?: ServerProjectSummary | null
 		serverProjectLink?: string
+		activeWorldName?: string | null
 		uptimeSeconds?: number
 		showUptime?: boolean
 		backHref?: string
@@ -115,6 +86,7 @@ const props = withDefaults(
 		serverImage: null,
 		serverProject: null,
 		serverProjectLink: '',
+		activeWorldName: null,
 		uptimeSeconds: 0,
 		showUptime: true,
 		backHref: '/hosting/manage',
@@ -125,13 +97,8 @@ const props = withDefaults(
 
 const client = injectModrinthClient()
 const { addNotification } = injectNotificationManager()
-const { serverId } = injectModrinthServerContext()
 const isNuxt = computed(() => client instanceof NuxtModrinthClient)
 
-const userPreferences = useStorage(`pyro-server-${serverId}-preferences`, {
-	hideSubdomainLabel: false,
-})
-
 const headerImage = computed(() => {
 	if (props.server?.is_medal) {
 		return 'https://cdn-raw.modrinth.com/medal_icon.webp'
@@ -139,37 +106,40 @@ const headerImage = computed(() => {
 	return props.serverImage ?? undefined
 })
 
-const showUptime = computed(() => props.showUptime && (props.uptimeSeconds ?? 0) > 0)
-
-const formattedUptime = computed(() => {
-	const uptime = props.uptimeSeconds ?? 0
-	const days = Math.floor(uptime / (24 * 3600))
-	const hours = Math.floor((uptime % (24 * 3600)) / 3600)
-	const minutes = Math.floor((uptime % 3600) / 60)
-	const seconds = uptime % 60
+const serverAddress = computed(() => {
+	const domain = props.server?.net?.domain
+	if (domain) return `${domain}.modrinth.gg`
 
-	let formatted = ''
-	if (days > 0) formatted += `${days}d `
-	if (hours > 0 || days > 0) formatted += `${hours}h `
-	formatted += `${minutes}m ${seconds}s`
-	return formatted.trim()
+	const ip = props.server?.net?.ip
+	if (!ip) return null
+	const port = props.server?.net?.port
+	return port ? `${ip}:${port}` : ip
 })
 
-const showProject = computed(() => !!props.serverProject)
-
-const serverProjectLink = computed(() => {
-	if (props.serverProjectLink) {
-		return props.serverProjectLink
+const headerStats = computed<HeaderStat[]>(() => {
+	const stats: HeaderStat[] = []
+	const worldName = props.activeWorldName
+	if (worldName) {
+		stats.push({
+			id: 'world',
+			label: worldName,
+			icon: GlobeIcon,
+		})
 	}
-	if (!props.serverProject) {
-		return ''
+	if (serverAddress.value) {
+		stats.push({
+			id: 'address',
+			label: serverAddress.value,
+			icon: LinkIcon,
+			copyable: true,
+		})
 	}
-	return `/project/${props.serverProject.slug ?? props.serverProject.id}`
+	return stats
 })
 
 function copyServerAddress() {
-	if (!props.server?.net?.domain) return
-	navigator.clipboard.writeText(`${props.server.net.domain}.modrinth.gg`)
+	if (!serverAddress.value) return
+	navigator.clipboard.writeText(serverAddress.value)
 	addNotification({
 		title: 'Server address copied',
 		text: "Your server's address has been copied to your clipboard.",
diff --git a/packages/ui/src/composables/server-backups-queue.ts b/packages/ui/src/composables/server-backups-queue.ts
index e05efdfe34..05984c14fa 100644
--- a/packages/ui/src/composables/server-backups-queue.ts
+++ b/packages/ui/src/composables/server-backups-queue.ts
@@ -12,7 +12,7 @@ export function useServerBackupsQueue(serverId: Ref<string>, worldId: Ref<string
 	const client = injectModrinthClient()
 	const queryClient = useQueryClient()
 
-	const queryKey = computed(() => ['backups', 'queue', serverId.value] as const)
+	const queryKey = computed(() => ['backups', 'queue', serverId.value, worldId.value] as const)
 
 	const progressOverlay = reactive(new Map<ProgressKey, number>())
 	const lastSeenState = new Map<ProgressKey, Archon.Websocket.v0.BackupState>()
diff --git a/packages/ui/src/layouts/shared/server-settings/pages/installation.vue b/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
index 0ac0551aaf..9076de8c6b 100644
--- a/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
+++ b/packages/ui/src/layouts/shared/server-settings/pages/installation.vue
@@ -206,18 +206,19 @@ const isInstalling = computed(() => {
 })
 const installationSettingsLayout = ref<InstanceType<typeof InstallationSettingsLayout>>()
 const setupModal = ref<InstanceType<typeof ServerSetupModal>>()
+const contentListQueryKey = computed(() => ['content', 'list', 'v1', serverId, worldId.value])
 
 async function invalidateServerState() {
 	debug('invalidateServerState: starting')
 	await Promise.all([
 		queryClient.invalidateQueries({ queryKey: ['servers', 'detail', serverId] }),
-		queryClient.invalidateQueries({ queryKey: ['content', 'list', 'v1', serverId] }),
+		queryClient.invalidateQueries({ queryKey: contentListQueryKey.value }),
 	])
 	debug('invalidateServerState: complete')
 }
 
 const addonsQuery = useQuery({
-	queryKey: computed(() => ['content', 'list', 'v1', serverId]),
+	queryKey: contentListQueryKey,
 	queryFn: () =>
 		client.archon.content_v1.getAddons(serverId, worldId.value!, { from_modpack: false }),
 	enabled: computed(() => worldId.value !== null),
@@ -627,7 +628,7 @@ provideInstallationSettings({
 		const previousData = addonsQuery.data.value
 		if (previousData) {
 			debug('unlinkModpack: optimistically removing modpack from cache')
-			queryClient.setQueryData(['content', 'list', 'v1', serverId], {
+			queryClient.setQueryData(contentListQueryKey.value, {
 				...previousData,
 				modpack: null,
 			})
@@ -639,7 +640,7 @@ provideInstallationSettings({
 		} catch (err) {
 			debug('unlinkModpack: failed, reverting cache', err)
 			if (previousData) {
-				queryClient.setQueryData(['content', 'list', 'v1', serverId], previousData)
+				queryClient.setQueryData(contentListQueryKey.value, previousData)
 			}
 			addNotification({
 				type: 'error',
@@ -652,7 +653,7 @@ provideInstallationSettings({
 					queryKey: ['servers', 'detail', serverId],
 				}),
 				queryClient.invalidateQueries({
-					queryKey: ['content', 'list', 'v1', serverId],
+					queryKey: contentListQueryKey.value,
 				}),
 			])
 			debug('unlinkModpack: invalidation complete')
diff --git a/packages/ui/src/layouts/shared/server-settings/pages/properties.vue b/packages/ui/src/layouts/shared/server-settings/pages/properties.vue
index 721d97fa22..086496ba14 100644
--- a/packages/ui/src/layouts/shared/server-settings/pages/properties.vue
+++ b/packages/ui/src/layouts/shared/server-settings/pages/properties.vue
@@ -284,8 +284,10 @@ const { addNotification } = injectNotificationManager()
 const client = injectModrinthClient()
 const { serverId, worldId, powerState, busyReasons } = injectModrinthServerContext()
 const queryClient = useQueryClient()
-const filesTabLink = computed(
-	() => `/hosting/manage/${encodeURIComponent(serverId)}/files?path=/&editing=server.properties`,
+const filesTabLink = computed(() =>
+	worldId.value
+		? `/hosting/manage/${encodeURIComponent(serverId)}/worlds/${encodeURIComponent(worldId.value)}/files?path=/&editing=server.properties`
+		: `/hosting/manage/${encodeURIComponent(serverId)}/worlds`,
 )
 const serverSettings = injectServerSettings(null)
 
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
index c1ad2947f1..1656c220a0 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/onboarding.vue
@@ -253,7 +253,11 @@ async function finalizeSetup() {
 	client.archon.servers_v1.endIntro(serverId).then(() => {
 		queryClient.invalidateQueries({ queryKey: ['servers', 'detail', serverId] })
 	})
-	await router.push(`/hosting/manage/${serverId}/`)
+	await router.push(
+		worldId.value
+			? `/hosting/manage/${encodeURIComponent(serverId)}/worlds/${encodeURIComponent(worldId.value)}`
+			: `/hosting/manage/${encodeURIComponent(serverId)}/worlds`,
+	)
 }
 
 /** Map UI loader names to API Modloader values */
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue b/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
index 8ee63deaf0..cadf38dcb8 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
@@ -244,7 +244,6 @@ import { useMutation, useQueryClient } from '@tanstack/vue-query'
 import dayjs from 'dayjs'
 import type { Component } from 'vue'
 import { computed, ref } from 'vue'
-import { useRoute } from 'vue-router'
 
 import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
 import Checkbox from '#ui/components/base/Checkbox.vue'
@@ -334,7 +333,7 @@ const filterPillOptions = computed<FilterPillOption[]>(() => [
 ])
 const client = injectModrinthClient()
 const queryClient = useQueryClient()
-const { server, worldId, busyReasons } = injectModrinthServerContext()
+const { server, serverId, worldId, busyReasons } = injectModrinthServerContext()
 
 const props = defineProps<{
 	isServerRunning: boolean
@@ -342,9 +341,6 @@ const props = defineProps<{
 	showDebugInfo?: boolean
 }>()
 
-const route = useRoute()
-const serverId = route.params.id as string
-
 defineEmits(['onDownload'])
 
 const { backups, invalidate, hasActiveCreate, hasActiveRestore, query } = useServerBackupsQueue(
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue b/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
index 04e4949440..a2ab860065 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
@@ -76,7 +76,7 @@ onMounted(() => {
 	isClient.value = true
 })
 
-const { serverId } = injectModrinthServerContext()
+const { serverId, worldId } = injectModrinthServerContext()
 const { featureFlags } = injectPageContext()
 
 const props = withDefaults(
@@ -198,7 +198,9 @@ const metrics = computed(() => {
 		showGraph: false,
 		chartOptions: null as ReturnType<typeof buildChartOptions> | null,
 		series: null as { name: string; data: number[] }[] | null,
-		link: `/hosting/manage/${encodeURIComponent(serverId)}/files`,
+		link: worldId.value
+			? `/hosting/manage/${encodeURIComponent(serverId)}/worlds/${encodeURIComponent(worldId.value)}/files`
+			: `/hosting/manage/${encodeURIComponent(serverId)}/worlds`,
 	}
 
 	if (props.loading) {
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue b/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
index cec7a66f1d..1667dafe47 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
@@ -3,7 +3,7 @@ import type { Archon, Labrinth } from '@modrinth/api-client'
 import { ClipboardCopyIcon } from '@modrinth/assets'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, nextTick, ref } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 
 import ReadyTransition from '#ui/components/base/ReadyTransition.vue'
 import { useReadyState } from '#ui/composables'
@@ -82,14 +82,12 @@ const messages = defineMessages({
 })
 
 const client = injectModrinthClient()
-const { server, worldId, busyReasons, isSyncingContent, uploadState, cancelUpload } =
+const { server, serverId, worldId, busyReasons, isSyncingContent, uploadState, cancelUpload } =
 	injectModrinthServerContext()
 const { addNotification } = injectNotificationManager()
 const { openServerSettings, browseServerContent } = injectServerSettingsModal()
-const route = useRoute()
 const router = useRouter()
 const queryClient = useQueryClient()
-const serverId = route.params.id as string
 
 const type = computed(() => {
 	const loader = server.value?.loader?.toLowerCase()
@@ -98,7 +96,7 @@ const type = computed(() => {
 	return 'mod'
 })
 
-const queryKey = computed(() => ['content', 'list', 'v1', serverId])
+const queryKey = computed(() => ['content', 'list', 'v1', serverId, worldId.value])
 
 const contentQuery = useQuery({
 	queryKey,
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
index 4eff631093..e44f895811 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
@@ -92,7 +92,17 @@
 			</template>
 		</ErrorInformationCard>
 	</div>
-	<!-- SERVER START -->
+	<div
+		v-else-if="serverData && isWorldDetailRoute"
+		data-pyro-world-manager-root
+		class="experimental-styles-within relative mx-auto box-border flex w-full min-w-0 flex-col px-6 transition-all duration-300"
+		:class="[
+			'server-panel-' + revealState,
+			isNuxt ? 'min-h-[100svh] max-w-[1280px] pb-16' : 'min-h-[calc(100svh-100px)] pb-6',
+		]"
+	>
+		<slot :on-reinstall="onReinstall" :on-reinstall-failed="onReinstallFailed" />
+	</div>
 	<div
 		v-else-if="serverData"
 		data-pyro-server-manager-root
@@ -115,6 +125,7 @@
 				:server="serverData"
 				:server-image="serverImage"
 				:server-project="serverProject"
+				:active-world-name="activeWorldName"
 				:uptime-seconds="showUptime ? uptimeSeconds : undefined"
 			>
 				<template #actions>
@@ -306,7 +317,7 @@
 		</template>
 	</div>
 	<div
-		v-if="showAdvancedDebugInfo"
+		v-if="showAdvancedDebugInfo && !isWorldDetailRoute"
 		class="experimental-styles-within relative mx-auto mt-6 box-border w-full min-w-0 max-w-[1280px] px-6"
 	>
 		<h2 class="m-0 text-lg font-extrabold text-contrast">
@@ -336,12 +347,9 @@ import { Intercom, shutdown } from '@intercom/messenger-js-sdk'
 import type { Archon, Labrinth } from '@modrinth/api-client'
 import { ModrinthApiError, NuxtModrinthClient } from '@modrinth/api-client'
 import {
-	BoxesIcon,
 	CheckIcon,
 	CopyIcon,
-	DatabaseBackupIcon,
 	FileIcon,
-	FolderOpenIcon,
 	IssuesIcon,
 	LayoutTemplateIcon,
 	LoaderCircleIcon,
@@ -619,22 +627,10 @@ const messages = defineMessages({
 		id: 'servers.manage.nav.overview',
 		defaultMessage: 'Overview',
 	},
-	contentNav: {
-		id: 'servers.manage.nav.content',
-		defaultMessage: 'Content',
-	},
 	worldsNav: {
 		id: 'servers.manage.nav.worlds',
 		defaultMessage: 'Worlds',
 	},
-	filesNav: {
-		id: 'servers.manage.nav.files',
-		defaultMessage: 'Files',
-	},
-	backupsNav: {
-		id: 'servers.manage.nav.backups',
-		defaultMessage: 'Backups',
-	},
 	errorDismissingNotice: {
 		id: 'servers.manage.notice.dismiss-error',
 		defaultMessage: 'Error dismissing notice',
@@ -768,11 +764,29 @@ const { data: serverFull } = useQuery({
 })
 
 const worldId = computed(() => {
+	const routeWorldId = getRouteParam(route.params.world_id)
+	if (routeWorldId) return routeWorldId
 	if (!serverFull.value) return null
 	const activeWorld = serverFull.value.worlds.find((w) => w.is_active)
 	return activeWorld?.id ?? serverFull.value.worlds[0]?.id ?? null
 })
 
+const isWorldDetailRoute = computed(() => !!getRouteParam(route.params.world_id))
+const activeWorldName = computed(() => {
+	if (!serverFull.value) return null
+	const activeWorld = serverFull.value.worlds.find((world) => world.is_active)
+	return activeWorld?.name ?? serverFull.value.worlds[0]?.name ?? null
+})
+
+function getRouteParam(param: string | string[] | undefined): string | null {
+	if (Array.isArray(param)) return param[0] ?? null
+	return param ?? null
+}
+
+function getWorldPath(targetWorldId: string) {
+	return `/hosting/manage/${encodeURIComponent(props.serverId)}/worlds/${encodeURIComponent(targetWorldId)}`
+}
+
 const { handleWsBackupProgress, busyReasons: backupsBusy } = useServerBackupsQueue(
 	computed(() => props.serverId),
 	worldId,
@@ -985,34 +999,16 @@ watch(serverData, (data) => {
 const navLinks = computed<Tab[]>(() => [
 	{
 		label: formatMessage(messages.overviewNav),
-		href: `/hosting/manage/${props.serverId}`,
+		href: `/hosting/manage/${encodeURIComponent(props.serverId)}`,
 		icon: LayoutTemplateIcon,
 		subpages: [],
 	},
-	{
-		label: formatMessage(messages.contentNav),
-		href: `/hosting/manage/${props.serverId}/content`,
-		icon: BoxesIcon,
-		subpages: ['mods', 'datapacks'],
-	},
 	{
 		label: formatMessage(messages.worldsNav),
-		href: `/hosting/manage/${props.serverId}/worlds`,
+		href: `/hosting/manage/${encodeURIComponent(props.serverId)}/worlds`,
 		icon: WorldIcon,
 		subpages: [],
 	},
-	{
-		label: formatMessage(messages.filesNav),
-		href: `/hosting/manage/${props.serverId}/files`,
-		icon: FolderOpenIcon,
-		subpages: [],
-	},
-	{
-		label: formatMessage(messages.backupsNav),
-		href: `/hosting/manage/${props.serverId}/backups`,
-		icon: DatabaseBackupIcon,
-		subpages: [],
-	},
 	...props.additionalTabs,
 ])
 
@@ -1159,7 +1155,7 @@ const handleFilesystemOps = (data: Archon.Websocket.v0.WSFilesystemOpsEvent) =>
 }
 
 const handleNewMod = () => {
-	queryClient.invalidateQueries({ queryKey: ['content', 'list'] })
+	queryClient.invalidateQueries({ queryKey: ['content', 'list', 'v1', props.serverId] })
 }
 
 const handleInstallationResult = async (data: Archon.Websocket.v0.WSInstallationResultEvent) => {
@@ -1245,7 +1241,7 @@ const onReinstall = async (
 
 	debug('[root.vue] onReinstall: triggering immediate invalidation')
 	queryClient.invalidateQueries({ queryKey: ['servers', 'detail', props.serverId] })
-	queryClient.invalidateQueries({ queryKey: ['content', 'list'] })
+	queryClient.invalidateQueries({ queryKey: ['content', 'list', 'v1', props.serverId] })
 }
 
 const onReinstallFailed = () => {
@@ -1294,7 +1290,7 @@ async function invalidateAfterInstall() {
 				queryClient.invalidateQueries({
 					queryKey: ['servers', 'startup', 'v1', props.serverId],
 				}),
-				queryClient.invalidateQueries({ queryKey: ['content', 'list'] }),
+				queryClient.invalidateQueries({ queryKey: ['content', 'list', 'v1', props.serverId] }),
 			])
 		} catch (err: unknown) {
 			console.error('Error refreshing data after installation:', err)
@@ -1418,7 +1414,10 @@ const copyServerDebugInfo = () => {
 }
 
 const openInstallLog = () => {
-	const url = `/hosting/manage/${props.serverId}/files?editing=${encodeURIComponent(errorLogFile.value)}`
+	const filesPath = worldId.value
+		? `${getWorldPath(worldId.value)}/files`
+		: `/hosting/manage/${encodeURIComponent(props.serverId)}/worlds`
+	const url = `${filesPath}?editing=${encodeURIComponent(errorLogFile.value)}`
 	window.history.pushState({}, '', url)
 	window.dispatchEvent(new PopStateEvent('popstate'))
 }
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/world-root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/world-root.vue
new file mode 100644
index 0000000000..cc05d2093b
--- /dev/null
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/world-root.vue
@@ -0,0 +1,213 @@
+<template>
+	<div class="flex min-h-[36rem] flex-col gap-6 text-primary">
+		<div class="flex flex-col gap-2">
+			<RouterLink
+				:to="worldsPath"
+				class="flex w-fit items-center gap-1 text-base font-medium text-blue hover:underline"
+			>
+				<ChevronLeftIcon class="size-4" aria-hidden="true" />
+				{{ formatMessage(messages.allWorlds) }}
+			</RouterLink>
+
+			<div class="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+				<div class="flex min-w-0 flex-col gap-1">
+					<h1 class="m-0 truncate text-2xl font-semibold leading-8 text-contrast">
+						{{ worldName }}
+					</h1>
+					<div class="flex flex-wrap items-center gap-2 text-base font-medium text-secondary">
+						<template v-for="(item, index) in worldMetadata" :key="item">
+							<span>{{ item }}</span>
+							<BulletDivider v-if="index < worldMetadata.length - 1" />
+						</template>
+					</div>
+				</div>
+
+				<div class="flex shrink-0 items-center gap-2">
+					<PanelServerActionButton size="standard" start-label="Start world" />
+					<ButtonStyled circular>
+						<button
+							v-tooltip="formatMessage(messages.worldSettings)"
+							@click="openServerSettings({ tabId: 'installation' })"
+						>
+							<SettingsIcon aria-hidden="true" />
+						</button>
+					</ButtonStyled>
+				</div>
+			</div>
+		</div>
+
+		<div class="h-px w-full bg-surface-5" />
+
+		<NavTabs :links="worldTabLinks" replace />
+
+		<slot />
+	</div>
+</template>
+
+<script setup lang="ts">
+import type { Archon } from '@modrinth/api-client'
+import {
+	BoxesIcon,
+	ChevronLeftIcon,
+	DatabaseBackupIcon,
+	FolderOpenIcon,
+	SettingsIcon,
+} from '@modrinth/assets'
+import { useQuery } from '@tanstack/vue-query'
+import { computed, watch } from 'vue'
+import { RouterLink, useRouter } from 'vue-router'
+
+import BulletDivider from '#ui/components/base/BulletDivider.vue'
+import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
+import NavTabs from '#ui/components/base/NavTabs.vue'
+import { PanelServerActionButton } from '#ui/components/servers/server-header'
+import { useRelativeTime } from '#ui/composables'
+import { defineMessages, useVIntl } from '#ui/composables/i18n'
+import {
+	injectModrinthClient,
+	injectModrinthServerContext,
+	injectServerSettingsModal,
+} from '#ui/providers'
+import { formatLoaderLabel } from '#ui/utils/loaders'
+
+interface Tab {
+	label: string
+	href: string
+	icon?: object
+	subpages?: string[]
+}
+
+const messages = defineMessages({
+	allWorlds: {
+		id: 'servers.manage.world.all-worlds',
+		defaultMessage: 'All worlds',
+	},
+	contentNav: {
+		id: 'servers.manage.nav.content',
+		defaultMessage: 'Content',
+	},
+	filesNav: {
+		id: 'servers.manage.nav.files',
+		defaultMessage: 'Files',
+	},
+	backupsNav: {
+		id: 'servers.manage.nav.backups',
+		defaultMessage: 'Backups',
+	},
+	worldFallbackName: {
+		id: 'servers.manage.world.fallback-name',
+		defaultMessage: 'World',
+	},
+	lastActive: {
+		id: 'servers.manage.world.last-active',
+		defaultMessage: 'Last active {time}',
+	},
+	worldSettings: {
+		id: 'servers.manage.world.settings',
+		defaultMessage: 'World settings',
+	},
+})
+
+const client = injectModrinthClient()
+const { serverId, server, worldId, isServerRunning } = injectModrinthServerContext()
+const { openServerSettings } = injectServerSettingsModal()
+const { formatMessage } = useVIntl()
+const formatRelativeTime = useRelativeTime()
+const router = useRouter()
+
+const { data: serverFull } = useQuery({
+	queryKey: computed(() => ['servers', 'v1', 'detail', serverId]),
+	queryFn: () => client.archon.servers_v1.get(serverId),
+	staleTime: 30_000,
+})
+
+const worldsPath = computed(() => `/hosting/manage/${encodeURIComponent(serverId)}/worlds`)
+const worldPath = computed(() =>
+	worldId.value ? `${worldsPath.value}/${encodeURIComponent(worldId.value)}` : worldsPath.value,
+)
+
+const currentWorld = computed(() => {
+	const id = worldId.value
+	if (!id) return null
+	return serverFull.value?.worlds.find((world) => world.id === id) ?? null
+})
+
+const worldName = computed(
+	() => currentWorld.value?.name ?? server.value?.name ?? formatMessage(messages.worldFallbackName),
+)
+
+const worldMetadata = computed(() =>
+	[gameVersionLabel.value, loaderLabel.value, lastActiveLabel.value].filter(
+		(item): item is string => !!item,
+	),
+)
+
+const gameVersionLabel = computed(() => {
+	const version = currentWorld.value?.content?.game_version ?? server.value?.mc_version
+	return version ? `MC ${version}` : null
+})
+
+const loaderLabel = computed(() => {
+	const loader = currentWorld.value?.content?.modloader ?? server.value?.loader?.toLowerCase()
+	if (!loader) return null
+	const loaderVersion =
+		currentWorld.value?.content?.modloader_version ?? server.value?.loader_version ?? null
+	return [formatLoaderLabel(loader), loaderVersion].filter(Boolean).join(' ')
+})
+
+const lastActiveLabel = computed(() => {
+	const latestBackup = currentWorld.value ? latestDate(currentWorld.value.backups) : null
+	const lastActiveAt =
+		latestBackup ??
+		(currentWorld.value?.is_active && isServerRunning.value
+			? new Date().toISOString()
+			: currentWorld.value?.created_at)
+
+	return lastActiveAt
+		? formatMessage(messages.lastActive, { time: formatRelativeTime(lastActiveAt) })
+		: null
+})
+
+const worldTabLinks = computed<Tab[]>(() => [
+	{
+		label: formatMessage(messages.contentNav),
+		href: worldPath.value,
+		icon: BoxesIcon,
+		subpages: [],
+	},
+	{
+		label: formatMessage(messages.filesNav),
+		href: `${worldPath.value}/files`,
+		icon: FolderOpenIcon,
+		subpages: [],
+	},
+	{
+		label: formatMessage(messages.backupsNav),
+		href: `${worldPath.value}/backups`,
+		icon: DatabaseBackupIcon,
+		subpages: [],
+	},
+])
+
+watch(
+	() => [serverFull.value, currentWorld.value, worldId.value] as const,
+	([full, world, id]) => {
+		if (full && id && !world) {
+			router.replace(worldsPath.value)
+		}
+	},
+	{ immediate: true },
+)
+
+function latestDate(backups: Archon.Servers.v1.WorldFull['backups']): string | null {
+	let latest = 0
+	let latestIso: string | null = null
+	for (const backup of backups) {
+		const timestamp = new Date(backup.created_at).getTime()
+		if (!Number.isFinite(timestamp) || timestamp <= latest) continue
+		latest = timestamp
+		latestIso = backup.created_at
+	}
+	return latestIso
+}
+</script>
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/worlds.vue b/packages/ui/src/layouts/wrapped/hosting/manage/worlds.vue
index 2e6b9a70d2..60e858210a 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/worlds.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/worlds.vue
@@ -17,7 +17,7 @@
 				:world="world"
 				@create="handleCreateWorld"
 				@edit="handleEditWorld"
-				@settings="handleEditWorld"
+				@settings="handleWorldSettings"
 			/>
 		</div>
 	</div>
@@ -27,6 +27,7 @@
 import type { Archon } from '@modrinth/api-client'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
+import { useRouter } from 'vue-router'
 
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import {
@@ -84,6 +85,7 @@ const client = injectModrinthClient()
 const { serverId, server, isServerRunning } = injectModrinthServerContext()
 const { openServerSettings } = injectServerSettingsModal()
 const { formatMessage } = useVIntl()
+const router = useRouter()
 
 const worldsQuery = useQuery({
 	queryKey: computed(() => ['servers', 'worlds', 'summary', 'v1', serverId]),
@@ -272,7 +274,13 @@ function createDummyWorldSlots(): WorldSlot[] {
 	]
 }
 
-function handleEditWorld() {
+function handleEditWorld(worldId: string) {
+	router.push(
+		`/hosting/manage/${encodeURIComponent(serverId)}/worlds/${encodeURIComponent(worldId)}`,
+	)
+}
+
+function handleWorldSettings() {
 	openServerSettings({ tabId: 'installation' })
 }
 
diff --git a/packages/ui/src/layouts/wrapped/index.ts b/packages/ui/src/layouts/wrapped/index.ts
index 4916f26783..e7acbeb820 100644
--- a/packages/ui/src/layouts/wrapped/index.ts
+++ b/packages/ui/src/layouts/wrapped/index.ts
@@ -5,4 +5,5 @@ export { default as ServersManageFilesPage } from './hosting/manage/files.vue'
 export { default as ServersManagePageIndex } from './hosting/manage/index.vue'
 export { default as ServersManageOverviewPage } from './hosting/manage/overview.vue'
 export { default as ServersManageRootLayout } from './hosting/manage/root.vue'
+export { default as ServersManageWorldRootLayout } from './hosting/manage/world-root.vue'
 export { default as ServersManageWorldsPage } from './hosting/manage/worlds.vue'
diff --git a/packages/ui/src/stories/servers/ServerPanelAdmonitions.stories.ts b/packages/ui/src/stories/servers/ServerPanelAdmonitions.stories.ts
index 9afdf5b429..9915f1da93 100644
--- a/packages/ui/src/stories/servers/ServerPanelAdmonitions.stories.ts
+++ b/packages/ui/src/stories/servers/ServerPanelAdmonitions.stories.ts
@@ -22,7 +22,7 @@ const meta = {
 			setup() {
 				const router = useRouter()
 				onMounted(() => {
-					router.replace('/hosting/manage/demo-server/content')
+					router.replace('/hosting/manage/demo-server/worlds/demo-world')
 				})
 
 				const server = ref({

From 34858f99d5582a2f0fe2817586ba42ff6ba338b2 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Mon, 27 Apr 2026 14:28:06 +0100
Subject: [PATCH 2/3] chore: clean up wrapped layout folder structure

---
 .../servers}/ServerManageStats.vue             |  0
 .../admonitions/ServerPanelAdmonitions.vue     |  2 +-
 .../servers/worlds}/WorldCard.vue              |  0
 packages/ui/src/composables/index.ts           | 10 +++++-----
 .../servers}/backups-selection.ts              |  0
 .../composables/{ => servers}/server-backup.ts |  4 ++--
 .../{ => servers}/server-backups-queue.ts      |  2 +-
 .../{ => servers}/server-console.ts            |  4 ++--
 .../server-manage-core-runtime.ts              |  8 ++++----
 .../{ => servers}/use-server-image.ts          | 18 +++++++++++++-----
 .../src/layouts/shared/browse-tab/header.vue   |  2 +-
 .../composables/use-inline-backup.ts           |  2 +-
 .../manage/{root.vue => [id]/index.vue}        |  7 +++----
 .../hosting/manage/{ => [id]}/overview.vue     |  2 +-
 .../{ => [id]/worlds/[world-id]}/backups.vue   |  4 ++--
 .../{ => [id]/worlds/[world-id]}/content.vue   | 16 ++++++++--------
 .../{ => [id]/worlds/[world-id]}/files.vue     |  5 ++---
 .../worlds/[world-id]/index.vue}               |  0
 .../{worlds.vue => [id]/worlds/index.vue}      |  2 +-
 packages/ui/src/layouts/wrapped/index.ts       | 14 +++++++-------
 20 files changed, 54 insertions(+), 48 deletions(-)
 rename packages/ui/src/{layouts/wrapped/hosting/manage/components => components/servers}/ServerManageStats.vue (100%)
 rename packages/ui/src/{layouts/wrapped/hosting/manage/components => components/servers/worlds}/WorldCard.vue (100%)
 rename packages/ui/src/{layouts/wrapped/hosting/manage => composables/servers}/backups-selection.ts (100%)
 rename packages/ui/src/composables/{ => servers}/server-backup.ts (91%)
 rename packages/ui/src/composables/{ => servers}/server-backups-queue.ts (98%)
 rename packages/ui/src/composables/{ => servers}/server-console.ts (98%)
 rename packages/ui/src/composables/{ => servers}/server-manage-core-runtime.ts (98%)
 rename packages/ui/src/composables/{ => servers}/use-server-image.ts (86%)
 rename packages/ui/src/layouts/wrapped/hosting/manage/{root.vue => [id]/index.vue} (99%)
 rename packages/ui/src/layouts/wrapped/hosting/manage/{ => [id]}/overview.vue (98%)
 rename packages/ui/src/layouts/wrapped/hosting/manage/{ => [id]/worlds/[world-id]}/backups.vue (99%)
 rename packages/ui/src/layouts/wrapped/hosting/manage/{ => [id]/worlds/[world-id]}/content.vue (97%)
 rename packages/ui/src/layouts/wrapped/hosting/manage/{ => [id]/worlds/[world-id]}/files.vue (98%)
 rename packages/ui/src/layouts/wrapped/hosting/manage/{world-root.vue => [id]/worlds/[world-id]/index.vue} (100%)
 rename packages/ui/src/layouts/wrapped/hosting/manage/{worlds.vue => [id]/worlds/index.vue} (99%)

diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue b/packages/ui/src/components/servers/ServerManageStats.vue
similarity index 100%
rename from packages/ui/src/layouts/wrapped/hosting/manage/components/ServerManageStats.vue
rename to packages/ui/src/components/servers/ServerManageStats.vue
diff --git a/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue b/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue
index 8e0f4dcfa6..8b4a8c9283 100644
--- a/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue
+++ b/packages/ui/src/components/servers/admonitions/ServerPanelAdmonitions.vue
@@ -12,7 +12,7 @@ import InstallingBanner, {
 	type SyncProgress,
 } from '#ui/components/servers/InstallingBanner.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
-import { useServerBackupsQueue } from '#ui/composables/server-backups-queue'
+import { useServerBackupsQueue } from '#ui/composables/servers/server-backups-queue.ts'
 import type { FileOperation } from '#ui/layouts/shared/files-tab/types'
 import { injectModrinthClient, injectModrinthServerContext } from '#ui/providers'
 
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/components/WorldCard.vue b/packages/ui/src/components/servers/worlds/WorldCard.vue
similarity index 100%
rename from packages/ui/src/layouts/wrapped/hosting/manage/components/WorldCard.vue
rename to packages/ui/src/components/servers/worlds/WorldCard.vue
diff --git a/packages/ui/src/composables/index.ts b/packages/ui/src/composables/index.ts
index 404b157361..b67036418f 100644
--- a/packages/ui/src/composables/index.ts
+++ b/packages/ui/src/composables/index.ts
@@ -8,15 +8,15 @@ export * from './i18n'
 export * from './i18n-debug'
 export * from './page-leave-safety'
 export * from './scroll-indicator'
-export * from './server-backup'
-export * from './server-backups-queue'
-export * from './server-console'
-export * from './server-manage-core-runtime'
+export * from './servers/server-backup'
+export * from './servers/server-backups-queue'
+export * from './servers/server-console'
+export * from './servers/server-manage-core-runtime'
+export * from './servers/use-server-image'
 export * from './sticky-observer'
 export * from './terminal'
 export * from './use-loading-bar-token'
 export * from './use-loading-state-core'
 export * from './use-ready-state'
-export * from './use-server-image'
 export * from './use-server-project'
 export * from './virtual-scroll'
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/backups-selection.ts b/packages/ui/src/composables/servers/backups-selection.ts
similarity index 100%
rename from packages/ui/src/layouts/wrapped/hosting/manage/backups-selection.ts
rename to packages/ui/src/composables/servers/backups-selection.ts
diff --git a/packages/ui/src/composables/server-backup.ts b/packages/ui/src/composables/servers/server-backup.ts
similarity index 91%
rename from packages/ui/src/composables/server-backup.ts
rename to packages/ui/src/composables/servers/server-backup.ts
index 4dd75a5467..fe986568a6 100644
--- a/packages/ui/src/composables/server-backup.ts
+++ b/packages/ui/src/composables/servers/server-backup.ts
@@ -1,7 +1,7 @@
 import type { Archon } from '@modrinth/api-client'
 
-import { injectModrinthClient } from '../providers/api-client'
-import { injectNotificationManager } from '../providers/web-notifications'
+import { injectModrinthClient } from '../../providers/api-client'
+import { injectNotificationManager } from '../../providers/web-notifications'
 
 export function useServerBackupDownload() {
 	const client = injectModrinthClient()
diff --git a/packages/ui/src/composables/server-backups-queue.ts b/packages/ui/src/composables/servers/server-backups-queue.ts
similarity index 98%
rename from packages/ui/src/composables/server-backups-queue.ts
rename to packages/ui/src/composables/servers/server-backups-queue.ts
index 05984c14fa..b28e8b3fbf 100644
--- a/packages/ui/src/composables/server-backups-queue.ts
+++ b/packages/ui/src/composables/servers/server-backups-queue.ts
@@ -4,7 +4,7 @@ import { computed, reactive, type Ref } from 'vue'
 
 import { type BusyReason, injectModrinthClient } from '#ui/providers'
 
-import { defineMessage } from './i18n'
+import { defineMessage } from '../i18n'
 
 type ProgressKey = `${string}:${'create' | 'restore'}`
 
diff --git a/packages/ui/src/composables/server-console.ts b/packages/ui/src/composables/servers/server-console.ts
similarity index 98%
rename from packages/ui/src/composables/server-console.ts
rename to packages/ui/src/composables/servers/server-console.ts
index f2675d89d2..45014b646f 100644
--- a/packages/ui/src/composables/server-console.ts
+++ b/packages/ui/src/composables/servers/server-console.ts
@@ -1,8 +1,8 @@
 import { createGlobalState } from '@vueuse/core'
 import { type Ref, ref, shallowRef, triggerRef } from 'vue'
 
-import { detectLogLevel } from '../layouts/shared/console/composables/log-level'
-import type { Log4jEvent, LogLevel, LogLine } from '../layouts/shared/console/types'
+import { detectLogLevel } from '../../layouts/shared/console/composables/log-level'
+import type { Log4jEvent, LogLevel, LogLine } from '../../layouts/shared/console/types'
 
 // Flip to true during development to enable console perf logging.
 // Uses a plain constant to avoid turbo env-var declarations.
diff --git a/packages/ui/src/composables/server-manage-core-runtime.ts b/packages/ui/src/composables/servers/server-manage-core-runtime.ts
similarity index 98%
rename from packages/ui/src/composables/server-manage-core-runtime.ts
rename to packages/ui/src/composables/servers/server-manage-core-runtime.ts
index 4d6665ac40..84fbef90bf 100644
--- a/packages/ui/src/composables/server-manage-core-runtime.ts
+++ b/packages/ui/src/composables/servers/server-manage-core-runtime.ts
@@ -8,10 +8,10 @@ import type { Stats } from '@modrinth/utils'
 import type { ComputedRef, Ref } from 'vue'
 import { computed, ref } from 'vue'
 
-import type { FileOperation } from '../layouts/shared/files-tab/types'
-import { injectModrinthClient, provideModrinthServerContext } from '../providers'
-import type { BusyReason } from '../providers/server-context'
-import { defineMessage } from './i18n'
+import type { FileOperation } from '../../layouts/shared/files-tab/types'
+import { injectModrinthClient, provideModrinthServerContext } from '../../providers'
+import type { BusyReason } from '../../providers/server-context'
+import { defineMessage } from '../i18n'
 import { useModrinthServersConsole } from './server-console'
 
 type ReadableRef<T> = Ref<T> | ComputedRef<T>
diff --git a/packages/ui/src/composables/use-server-image.ts b/packages/ui/src/composables/servers/use-server-image.ts
similarity index 86%
rename from packages/ui/src/composables/use-server-image.ts
rename to packages/ui/src/composables/servers/use-server-image.ts
index c33018ff5e..40cc38a020 100644
--- a/packages/ui/src/composables/use-server-image.ts
+++ b/packages/ui/src/composables/servers/use-server-image.ts
@@ -5,6 +5,7 @@ import { computed, type ComputedRef, ref } from 'vue'
 import { injectModrinthClient } from '#ui/providers'
 
 type UpstreamRef = ComputedRef<Archon.Servers.v0.Server['upstream'] | null | undefined>
+type ServerIdSource = string | { readonly value: string }
 
 type UseServerImageOptions = {
 	enabled?: ComputedRef<boolean> | boolean
@@ -39,7 +40,7 @@ function isNotFound(error: unknown): boolean {
 }
 
 export function useServerImage(
-	serverId: string,
+	serverId: ServerIdSource,
 	upstream: UpstreamRef,
 	options: UseServerImageOptions = {},
 ) {
@@ -47,24 +48,27 @@ export function useServerImage(
 	const localImage = ref<string | null | undefined>(undefined)
 	const iconSize = options.size ?? 512
 	const includeProjectFallback = options.includeProjectFallback ?? false
+	const resolvedServerId = computed(() => resolveServerId(serverId))
 
 	const queryKey = computed(
-		() => ['servers', 'detail', serverId, 'icon', upstream.value?.project_id ?? null] as const,
+		() =>
+			['servers', 'detail', resolvedServerId.value, 'icon', upstream.value?.project_id ?? null] as const,
 	)
 
 	const isEnabled = computed(() => {
 		const explicitEnabled =
 			typeof options.enabled === 'boolean' ? options.enabled : options.enabled?.value
-		return !!serverId && (explicitEnabled ?? true)
+		return !!resolvedServerId.value && (explicitEnabled ?? true)
 	})
 
 	const { data: remoteImage, refetch } = useQuery({
 		queryKey,
 		queryFn: async (): Promise<string | null> => {
-			if (!serverId) return null
+			const id = resolvedServerId.value
+			if (!id) return null
 
 			try {
-				const fsAuth = await client.archon.servers_v0.getFilesystemAuth(serverId)
+				const fsAuth = await client.archon.servers_v0.getFilesystemAuth(id)
 
 				try {
 					const blob = await client.kyros.files_v0.downloadFileWithAuth(fsAuth, '/server-icon.png')
@@ -132,3 +136,7 @@ export function useServerImage(
 		resetLocalOverride,
 	}
 }
+
+function resolveServerId(serverId: ServerIdSource): string {
+	return typeof serverId === 'string' ? serverId : serverId.value
+}
diff --git a/packages/ui/src/layouts/shared/browse-tab/header.vue b/packages/ui/src/layouts/shared/browse-tab/header.vue
index 0ac04ea3c0..18ba88a526 100644
--- a/packages/ui/src/layouts/shared/browse-tab/header.vue
+++ b/packages/ui/src/layouts/shared/browse-tab/header.vue
@@ -7,7 +7,7 @@ import Admonition from '#ui/components/base/Admonition.vue'
 import Avatar from '#ui/components/base/Avatar.vue'
 import ButtonStyled from '#ui/components/base/ButtonStyled.vue'
 import ContentPageHeader from '#ui/components/base/ContentPageHeader.vue'
-import { useServerImage } from '#ui/composables/use-server-image'
+import { useServerImage } from '#ui/composables/servers/use-server-image.ts'
 import { formatLoaderLabel } from '#ui/utils/loaders'
 
 import { injectBrowseManager } from './providers/browse-manager'
diff --git a/packages/ui/src/layouts/shared/content-tab/composables/use-inline-backup.ts b/packages/ui/src/layouts/shared/content-tab/composables/use-inline-backup.ts
index 7123f91d38..700b7962d8 100644
--- a/packages/ui/src/layouts/shared/content-tab/composables/use-inline-backup.ts
+++ b/packages/ui/src/layouts/shared/content-tab/composables/use-inline-backup.ts
@@ -1,7 +1,7 @@
 import { computed, onBeforeUnmount, ref, watch } from 'vue'
 import { onBeforeRouteLeave } from 'vue-router'
 
-import { useServerBackupsQueue } from '#ui/composables/server-backups-queue'
+import { useServerBackupsQueue } from '#ui/composables/servers/server-backups-queue.ts'
 import {
 	injectAppBackup,
 	injectModrinthClient,
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
similarity index 99%
rename from packages/ui/src/layouts/wrapped/hosting/manage/root.vue
rename to packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
index e44f895811..a23b96fcbb 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/root.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
@@ -391,8 +391,8 @@ import {
 	useServerProject,
 } from '#ui/composables'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
-import { useServerBackupsQueue } from '#ui/composables/server-backups-queue'
-import { useServerManageCoreRuntime } from '#ui/composables/server-manage-core-runtime'
+import { useServerBackupsQueue } from '#ui/composables/servers/server-backups-queue.ts'
+import { useServerManageCoreRuntime } from '#ui/composables/servers/server-manage-core-runtime.ts'
 import type { LogLine } from '#ui/layouts/shared/console'
 import type { ServerSettingsTabId } from '#ui/layouts/shared/server-settings'
 import {
@@ -401,8 +401,7 @@ import {
 	provideServerSettingsModal,
 } from '#ui/providers'
 import { formatLoaderLabel } from '#ui/utils/loaders'
-
-import ServerOnboardingPanelPage from './[id]/onboarding.vue'
+import ServerOnboardingPanelPage from './onboarding.vue'
 
 interface Tab {
 	label: string
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/overview.vue
similarity index 98%
rename from packages/ui/src/layouts/wrapped/hosting/manage/overview.vue
rename to packages/ui/src/layouts/wrapped/hosting/manage/[id]/overview.vue
index 0985b699d3..90dada0d76 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/overview.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/overview.vue
@@ -44,7 +44,7 @@ import { useModrinthServersConsole } from '#ui/composables'
 import { ConsolePageLayout, provideConsoleManager } from '#ui/layouts/shared/console'
 import { injectModrinthClient, injectModrinthServerContext } from '#ui/providers'
 
-import ServerManageStats from './components/ServerManageStats.vue'
+import ServerManageStats from '#ui/components/servers/ServerManageStats.vue'
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/backups.vue
similarity index 99%
rename from packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
rename to packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/backups.vue
index cadf38dcb8..3a78b6ad37 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/backups.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/backups.vue
@@ -257,7 +257,7 @@ import BackupItem from '#ui/components/servers/backups/BackupItem.vue'
 import BackupRenameModal from '#ui/components/servers/backups/BackupRenameModal.vue'
 import BackupRestoreModal from '#ui/components/servers/backups/BackupRestoreModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
-import { useServerBackupsQueue } from '#ui/composables/server-backups-queue'
+import { useServerBackupsQueue } from '#ui/composables/servers/server-backups-queue.ts'
 import { useBulkOperation } from '#ui/layouts/shared/content-tab/composables/bulk-operations'
 import {
 	injectModrinthClient,
@@ -266,7 +266,7 @@ import {
 } from '#ui/providers'
 import { commonMessages } from '#ui/utils/common-messages'
 
-import { useBackupsSelection } from './backups-selection'
+import { useBackupsSelection } from '#ui/composables/servers/backups-selection'
 
 const messages = defineMessages({
 	selectAll: {
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/content.vue
similarity index 97%
rename from packages/ui/src/layouts/wrapped/hosting/manage/content.vue
rename to packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/content.vue
index 1667dafe47..4f9d06b609 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/content.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/content.vue
@@ -16,19 +16,19 @@ import {
 } from '#ui/providers'
 import { commonMessages } from '#ui/utils/common-messages'
 
-import ConfirmModpackUpdateModal from '../../../shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue'
-import ConfirmUnlinkModal from '../../../shared/content-tab/components/modals/ConfirmUnlinkModal.vue'
-import ContentUpdaterModal from '../../../shared/content-tab/components/modals/ContentUpdaterModal.vue'
-import ModpackContentModal from '../../../shared/content-tab/components/modals/ModpackContentModal.vue'
-import ContentPageLayout from '../../../shared/content-tab/layout.vue'
-import type { ContentModpackData } from '../../../shared/content-tab/providers/content-manager'
-import { provideContentManager } from '../../../shared/content-tab/providers/content-manager'
+import ConfirmModpackUpdateModal from '#ui/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue'
+import ConfirmUnlinkModal from '#ui/layouts/shared/content-tab/components/modals/ConfirmUnlinkModal.vue'
+import ContentUpdaterModal from '#ui/layouts/shared/content-tab/components/modals/ContentUpdaterModal.vue'
+import ModpackContentModal from '#ui/layouts/shared/content-tab/components/modals/ModpackContentModal.vue'
+import ContentPageLayout from '#ui/layouts/shared/content-tab/layout.vue'
+import type { ContentModpackData } from '#ui/layouts/shared/content-tab/providers/content-manager'
+import { provideContentManager } from '#ui/layouts/shared/content-tab/providers/content-manager'
 import type {
 	ContentItem,
 	ContentModpackCardCategory,
 	ContentModpackCardProject,
 	ContentModpackCardVersion,
-} from '../../../shared/content-tab/types'
+} from '#ui/layouts/shared/content-tab/types'
 
 type AddonWithUiState = Archon.Content.v1.Addon & { installing?: boolean }
 
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/files.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/files.vue
similarity index 98%
rename from packages/ui/src/layouts/wrapped/hosting/manage/files.vue
rename to packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/files.vue
index 3ade290d9a..4ca5681cb7 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/files.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/files.vue
@@ -14,9 +14,8 @@ import {
 } from '#ui/providers'
 import { commonMessages } from '#ui/utils/common-messages'
 
-import FilePageLayout from '../../../shared/files-tab/layout.vue'
-import { provideFileManager } from '../../../shared/files-tab/providers/file-manager'
-import type { EditingFile, FileItem } from '../../../shared/files-tab/types'
+import type { EditingFile, FileItem } from '#ui/layouts/shared/files-tab/index.ts'
+import { FilePageLayout, provideFileManager } from '#ui/layouts/shared/files-tab/index.ts'
 
 const props = defineProps<{
 	showDebugInfo?: boolean
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/world-root.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/index.vue
similarity index 100%
rename from packages/ui/src/layouts/wrapped/hosting/manage/world-root.vue
rename to packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/index.vue
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/worlds.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/index.vue
similarity index 99%
rename from packages/ui/src/layouts/wrapped/hosting/manage/worlds.vue
rename to packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/index.vue
index 60e858210a..4991d1778b 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/worlds.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/index.vue
@@ -37,7 +37,7 @@ import {
 } from '#ui/providers'
 import { formatLoaderLabel } from '#ui/utils/loaders'
 
-import WorldCard from './components/WorldCard.vue'
+import WorldCard from '#ui/components/servers/worlds/WorldCard.vue'
 
 const messages = defineMessages({
 	worldSlotName: {
diff --git a/packages/ui/src/layouts/wrapped/index.ts b/packages/ui/src/layouts/wrapped/index.ts
index e7acbeb820..a56c0400fb 100644
--- a/packages/ui/src/layouts/wrapped/index.ts
+++ b/packages/ui/src/layouts/wrapped/index.ts
@@ -1,9 +1,9 @@
+export { default as ServersManageRootLayout } from './hosting/manage/[id]/index.vue'
 export { default as ServerOnboardingPanelPage } from './hosting/manage/[id]/onboarding.vue'
-export { default as ServersManageBackupsPage } from './hosting/manage/backups.vue'
-export { default as ServersManageContentPage } from './hosting/manage/content.vue'
-export { default as ServersManageFilesPage } from './hosting/manage/files.vue'
+export { default as ServersManageOverviewPage } from './hosting/manage/[id]/overview.vue'
+export { default as ServersManageBackupsPage } from './hosting/manage/[id]/worlds/[world-id]/backups.vue'
+export { default as ServersManageContentPage } from './hosting/manage/[id]/worlds/[world-id]/content.vue'
+export { default as ServersManageFilesPage } from './hosting/manage/[id]/worlds/[world-id]/files.vue'
+export { default as ServersManageWorldRootLayout } from './hosting/manage/[id]/worlds/[world-id]/index.vue'
+export { default as ServersManageWorldsPage } from './hosting/manage/[id]/worlds/index.vue'
 export { default as ServersManagePageIndex } from './hosting/manage/index.vue'
-export { default as ServersManageOverviewPage } from './hosting/manage/overview.vue'
-export { default as ServersManageRootLayout } from './hosting/manage/root.vue'
-export { default as ServersManageWorldRootLayout } from './hosting/manage/world-root.vue'
-export { default as ServersManageWorldsPage } from './hosting/manage/worlds.vue'

From f5f41862b9878296cb3b5d24ebd610f54ae5a78c Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Mon, 27 Apr 2026 14:52:09 +0100
Subject: [PATCH 3/3] fix: lint

---
 .../servers/server-header/ServerManageHeader.vue  |  5 ++++-
 .../src/composables/servers/use-server-image.ts   |  8 +++++++-
 .../layouts/wrapped/hosting/manage/[id]/index.vue |  1 +
 .../wrapped/hosting/manage/[id]/overview.vue      |  3 +--
 .../manage/[id]/worlds/[world-id]/backups.vue     |  3 +--
 .../manage/[id]/worlds/[world-id]/content.vue     | 15 +++++++--------
 .../manage/[id]/worlds/[world-id]/files.vue       |  5 ++---
 .../wrapped/hosting/manage/[id]/worlds/index.vue  |  3 +--
 packages/ui/src/locales/en-US/index.json          | 12 ++++++++++++
 9 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/packages/ui/src/components/servers/server-header/ServerManageHeader.vue b/packages/ui/src/components/servers/server-header/ServerManageHeader.vue
index c6beb30622..ee7846a5ac 100644
--- a/packages/ui/src/components/servers/server-header/ServerManageHeader.vue
+++ b/packages/ui/src/components/servers/server-header/ServerManageHeader.vue
@@ -31,7 +31,10 @@
 							<component :is="item.icon" class="flex size-5 shrink-0" />
 							<span class="truncate">{{ item.label }}</span>
 						</button>
-						<div v-else class="flex min-w-0 items-center gap-2 font-medium text-secondary text-nowrap">
+						<div
+							v-else
+							class="flex min-w-0 items-center gap-2 font-medium text-secondary text-nowrap"
+						>
 							<component :is="item.icon" class="flex size-5 shrink-0" />
 							<span class="truncate">{{ item.label }}</span>
 						</div>
diff --git a/packages/ui/src/composables/servers/use-server-image.ts b/packages/ui/src/composables/servers/use-server-image.ts
index 40cc38a020..9722f1c306 100644
--- a/packages/ui/src/composables/servers/use-server-image.ts
+++ b/packages/ui/src/composables/servers/use-server-image.ts
@@ -52,7 +52,13 @@ export function useServerImage(
 
 	const queryKey = computed(
 		() =>
-			['servers', 'detail', resolvedServerId.value, 'icon', upstream.value?.project_id ?? null] as const,
+			[
+				'servers',
+				'detail',
+				resolvedServerId.value,
+				'icon',
+				upstream.value?.project_id ?? null,
+			] as const,
 	)
 
 	const isEnabled = computed(() => {
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
index a23b96fcbb..763ca2bafb 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/index.vue
@@ -401,6 +401,7 @@ import {
 	provideServerSettingsModal,
 } from '#ui/providers'
 import { formatLoaderLabel } from '#ui/utils/loaders'
+
 import ServerOnboardingPanelPage from './onboarding.vue'
 
 interface Tab {
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/overview.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/overview.vue
index 90dada0d76..0d1b955359 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/overview.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/overview.vue
@@ -40,12 +40,11 @@ import type { Mclogs } from '@modrinth/api-client'
 import { useStorage } from '@vueuse/core'
 import { computed, ref, watch } from 'vue'
 
+import ServerManageStats from '#ui/components/servers/ServerManageStats.vue'
 import { useModrinthServersConsole } from '#ui/composables'
 import { ConsolePageLayout, provideConsoleManager } from '#ui/layouts/shared/console'
 import { injectModrinthClient, injectModrinthServerContext } from '#ui/providers'
 
-import ServerManageStats from '#ui/components/servers/ServerManageStats.vue'
-
 const props = withDefaults(
 	defineProps<{
 		showAdvancedDebugInfo?: boolean
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/backups.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/backups.vue
index 3a78b6ad37..ce696eefe7 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/backups.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/backups.vue
@@ -257,6 +257,7 @@ import BackupItem from '#ui/components/servers/backups/BackupItem.vue'
 import BackupRenameModal from '#ui/components/servers/backups/BackupRenameModal.vue'
 import BackupRestoreModal from '#ui/components/servers/backups/BackupRestoreModal.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
+import { useBackupsSelection } from '#ui/composables/servers/backups-selection'
 import { useServerBackupsQueue } from '#ui/composables/servers/server-backups-queue.ts'
 import { useBulkOperation } from '#ui/layouts/shared/content-tab/composables/bulk-operations'
 import {
@@ -266,8 +267,6 @@ import {
 } from '#ui/providers'
 import { commonMessages } from '#ui/utils/common-messages'
 
-import { useBackupsSelection } from '#ui/composables/servers/backups-selection'
-
 const messages = defineMessages({
 	selectAll: {
 		id: 'servers.backups.toolbar.select-all',
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/content.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/content.vue
index 4f9d06b609..816ffe5b73 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/content.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/content.vue
@@ -8,14 +8,6 @@ import { useRouter } from 'vue-router'
 import ReadyTransition from '#ui/components/base/ReadyTransition.vue'
 import { useReadyState } from '#ui/composables'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
-import {
-	injectModrinthClient,
-	injectModrinthServerContext,
-	injectNotificationManager,
-	injectServerSettingsModal,
-} from '#ui/providers'
-import { commonMessages } from '#ui/utils/common-messages'
-
 import ConfirmModpackUpdateModal from '#ui/layouts/shared/content-tab/components/modals/ConfirmModpackUpdateModal.vue'
 import ConfirmUnlinkModal from '#ui/layouts/shared/content-tab/components/modals/ConfirmUnlinkModal.vue'
 import ContentUpdaterModal from '#ui/layouts/shared/content-tab/components/modals/ContentUpdaterModal.vue'
@@ -29,6 +21,13 @@ import type {
 	ContentModpackCardProject,
 	ContentModpackCardVersion,
 } from '#ui/layouts/shared/content-tab/types'
+import {
+	injectModrinthClient,
+	injectModrinthServerContext,
+	injectNotificationManager,
+	injectServerSettingsModal,
+} from '#ui/providers'
+import { commonMessages } from '#ui/utils/common-messages'
 
 type AddonWithUiState = Archon.Content.v1.Addon & { installing?: boolean }
 
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/files.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/files.vue
index 4ca5681cb7..987d6d1d17 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/files.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/[world-id]/files.vue
@@ -7,6 +7,8 @@ import { useRoute, useRouter } from 'vue-router'
 import ReadyTransition from '#ui/components/base/ReadyTransition.vue'
 import { useReadyState } from '#ui/composables'
 import { useVIntl } from '#ui/composables/i18n'
+import type { EditingFile, FileItem } from '#ui/layouts/shared/files-tab/index.ts'
+import { FilePageLayout, provideFileManager } from '#ui/layouts/shared/files-tab/index.ts'
 import {
 	injectModrinthClient,
 	injectModrinthServerContext,
@@ -14,9 +16,6 @@ import {
 } from '#ui/providers'
 import { commonMessages } from '#ui/utils/common-messages'
 
-import type { EditingFile, FileItem } from '#ui/layouts/shared/files-tab/index.ts'
-import { FilePageLayout, provideFileManager } from '#ui/layouts/shared/files-tab/index.ts'
-
 const props = defineProps<{
 	showDebugInfo?: boolean
 	showRefreshButton?: boolean
diff --git a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/index.vue b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/index.vue
index 4991d1778b..44d8f787ec 100644
--- a/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/index.vue
+++ b/packages/ui/src/layouts/wrapped/hosting/manage/[id]/worlds/index.vue
@@ -29,6 +29,7 @@ import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 
+import WorldCard from '#ui/components/servers/worlds/WorldCard.vue'
 import { defineMessages, useVIntl } from '#ui/composables/i18n'
 import {
 	injectModrinthClient,
@@ -37,8 +38,6 @@ import {
 } from '#ui/providers'
 import { formatLoaderLabel } from '#ui/utils/loaders'
 
-import WorldCard from '#ui/components/servers/worlds/WorldCard.vue'
-
 const messages = defineMessages({
 	worldSlotName: {
 		id: 'servers.manage.worlds.slot-name',
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 626d889c12..34bc39fd29 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -3425,6 +3425,18 @@
   "servers.manage.websocket.reconnecting": {
     "defaultMessage": "Hang on, we're reconnecting to your server."
   },
+  "servers.manage.world.all-worlds": {
+    "defaultMessage": "All worlds"
+  },
+  "servers.manage.world.fallback-name": {
+    "defaultMessage": "World"
+  },
+  "servers.manage.world.last-active": {
+    "defaultMessage": "Last active {time}"
+  },
+  "servers.manage.world.settings": {
+    "defaultMessage": "World settings"
+  },
   "servers.manage.worlds.card.active": {
     "defaultMessage": "Active"
   },