diff --git a/app/Http/Controllers/Admin/Maintenance/FullTree.php b/app/Http/Controllers/Admin/Maintenance/FullTree.php
new file mode 100644
index 00000000000..2d3b444662f
--- /dev/null
+++ b/app/Http/Controllers/Admin/Maintenance/FullTree.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Maintenance;
+
+use App\Http\Controllers\Admin\Maintenance\Model\Album;
+use App\Http\Requests\Maintenance\FullTreeUpdateRequest;
+use App\Http\Requests\Maintenance\MaintenanceRequest;
+use App\Http\Resources\Diagnostics\AlbumTree;
+use Illuminate\Routing\Controller;
+use Illuminate\Support\Collection;
+
+/**
+ * Maybe the album tree is broken.
+ * We fix it here.
+ */
+class FullTree extends Controller
+{
+	/**
+	 * Clean the path from all files excluding $this->skip.
+	 *
+	 * @return void
+	 */
+	public function do(FullTreeUpdateRequest $request): void
+	{
+		$keyName = 'id';
+		$albumInstance = new Album();
+		batch()->update($albumInstance, $request->albums(), $keyName);
+	}
+
+	/**
+	 * Check whether there are files to be removed.
+	 * If not, we will not display the module to reduce complexity.
+	 *
+	 * @return Collection<int,AlbumTree>
+	 */
+	public function check(MaintenanceRequest $request): Collection
+	{
+		$albums = Album::query()->join('base_albums', 'base_albums.id', '=', 'albums.id')->select(['albums.id', 'title', 'parent_id', '_lft', '_rgt'])->orderBy('_lft', 'asc')->toBase()->get();
+
+		return AlbumTree::collect($albums);
+	}
+}
diff --git a/app/Http/Requests/Maintenance/FullTreeUpdateRequest.php b/app/Http/Requests/Maintenance/FullTreeUpdateRequest.php
new file mode 100644
index 00000000000..968510ee706
--- /dev/null
+++ b/app/Http/Requests/Maintenance/FullTreeUpdateRequest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Requests\Maintenance;
+
+use App\Http\Requests\BaseApiRequest;
+use App\Models\Configs;
+use App\Policies\SettingsPolicy;
+use App\Rules\AlbumIDRule;
+use Illuminate\Support\Facades\Gate;
+
+class FullTreeUpdateRequest extends BaseApiRequest
+{
+	/**
+	 * @var array<int,array{id:string,_lft:int,_rgt:int,parent_id:string|null}>
+	 */
+	private array $albums;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function authorize(): bool
+	{
+		return Gate::check(SettingsPolicy::CAN_EDIT, Configs::class);
+	}
+
+	public function rules(): array
+	{
+		return [
+			'albums' => 'required|array|min:1',
+			'albums.*' => 'required|array',
+			'albums.*.id' => ['required', new AlbumIDRule(false)],
+			'albums.*._lft' => 'required|integer|min:1',
+			'albums.*._rgt' => 'required|integer|min:1',
+			'albums.*.parent_id' => [new AlbumIDRule(true)],
+		];
+	}
+
+	protected function processValidatedValues(
+		array $values,
+		array $files,
+	): void {
+		$this->albums = $values['albums'];
+	}
+
+	/**
+	 * @return array<int,array{id:string,_lft:int,_rgt:int}>
+	 */
+	public function albums(): array
+	{
+		return $this->albums;
+	}
+}
diff --git a/app/Http/Resources/Diagnostics/AlbumTree.php b/app/Http/Resources/Diagnostics/AlbumTree.php
new file mode 100644
index 00000000000..ce8062d7d70
--- /dev/null
+++ b/app/Http/Resources/Diagnostics/AlbumTree.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources\Diagnostics;
+
+use App\Models\Album;
+use Spatie\LaravelData\Data;
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript()]
+class AlbumTree extends Data
+{
+	public function __construct(
+		public string $id,
+		public string $title,
+		public ?string $parent_id,
+		public int $_lft,
+		public int $_rgt,
+	) {
+	}
+
+	public static function FromModel(Album $album): AlbumTree
+	{
+		return new self(
+			$album->id,
+			$album->title,
+			$album->parent_id,
+			$album->_lft,
+			$album->_rgt
+		);
+	}
+}
diff --git a/composer.json b/composer.json
index f1a147e5d39..7d35b243896 100644
--- a/composer.json
+++ b/composer.json
@@ -63,6 +63,7 @@
         "lychee-org/nestedset": "^9.0",
         "lychee-org/php-exif": "^1.0.4",
         "maennchen/zipstream-php": "^3.1",
+        "mavinoo/laravel-batch": "^2.4",
         "opcodesio/log-viewer": "dev-lycheeOrg",
         "php-ffmpeg/php-ffmpeg": "^1.0",
         "php-http/guzzle7-adapter": "^1.0",
diff --git a/composer.lock b/composer.lock
index 2dd859beef8..57939fc60fd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "24b4c68e469e17a8ca89078b6976dbf3",
+    "content-hash": "3ce0219be0ac8430114dab3f0dacbd00",
     "packages": [
         {
             "name": "amphp/amp",
@@ -4987,6 +4987,62 @@
             ],
             "time": "2024-10-10T12:33:01+00:00"
         },
+        {
+            "name": "mavinoo/laravel-batch",
+            "version": "v2.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mavinoo/laravelBatch.git",
+                "reference": "8f85ba2923b63bfad8b9181ef210094eba47b5ec"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mavinoo/laravelBatch/zipball/8f85ba2923b63bfad8b9181ef210094eba47b5ec",
+                "reference": "8f85ba2923b63bfad8b9181ef210094eba47b5ec",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3@dev"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Mavinoo\\Batch\\BatchServiceProvider"
+                    ],
+                    "aliases": {
+                        "Batch": "Mavinoo\\Batch\\BatchFacade"
+                    }
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Common/Helpers.php"
+                ],
+                "psr-4": {
+                    "Mavinoo\\Batch\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mohammad Ghanbari",
+                    "email": "mavin.developer@gmail.com"
+                }
+            ],
+            "description": "Insert and update batch (bulk) in laravel",
+            "support": {
+                "issues": "https://github.com/mavinoo/laravelBatch/issues",
+                "source": "https://github.com/mavinoo/laravelBatch/tree/v2.4.1"
+            },
+            "time": "2024-09-17T11:09:20+00:00"
+        },
         {
             "name": "monolog/monolog",
             "version": "3.8.0",
diff --git a/config/app.php b/config/app.php
index 62ff18af14f..8900e974ab2 100644
--- a/config/app.php
+++ b/config/app.php
@@ -229,6 +229,7 @@ function renv(string $cst, ?string $default = null): string
 
 		\SocialiteProviders\Manager\ServiceProvider::class,
 		// Barryvdh\Debugbar\ServiceProvider::class,
+		Mavinoo\Batch\BatchServiceProvider::class,
 
 		/*
 		 * Application Service Providers...
diff --git a/phpstan.neon b/phpstan.neon
index 3ea78e8580e..61da8eac1f3 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -166,3 +166,6 @@ parameters:
 
 		-
 			message: '#Dynamic call to static method Illuminate\\Session\\Store::(has|get|now|forget)\(\).#'
+
+		-
+			message: '#Dynamic call to static method Kalnoy\\Nestedset\\QueryBuilder<.*>::(join|select|orderBy)\(\)#'	
\ No newline at end of file
diff --git a/resources/js/components/maintenance/FixTreeLine.vue b/resources/js/components/maintenance/FixTreeLine.vue
new file mode 100644
index 00000000000..38518f825a6
--- /dev/null
+++ b/resources/js/components/maintenance/FixTreeLine.vue
@@ -0,0 +1,177 @@
+<template>
+	<div class="flex justify-between hover:bg-primary-emphasis/5 gap-8 items-center md:max-w-3xl lg:max-w-5xl xl:max-w-7xl mx-auto">
+		<div class="w-1/2" @mouseenter="setHoverId">
+			<span v-if="props.album.prefix.length > 4" class="font-mono" v-html="props.album.prefix.slice(0, -2)" />
+			<span
+				:class="{
+					'font-bold text-primary-emphasis': isHoverParent || isHoverId,
+				}"
+				v-if="props.album.prefix.length > 0"
+			>
+				└
+			</span>
+			<span
+				:class="{
+					'font-bold text-primary-emphasis': isHoverParent || isHoverId,
+				}"
+				>{{ props.album.title }}</span
+			>
+		</div>
+		<div class="flex w-1/4 gap-4">
+			<div class="flex">
+				<InputNumber
+					class="border-0 w-full px-2"
+					pt:pcInputText:root:class="w-full border-0 px-3 py-1.5 w-full border-b hover:border-b-primary-400 focus:border-b-primary-400"
+					v-model="lft"
+					:invalid="lft === null || lft === undefined || lft === 0 || props.album.isDuplicate_lft"
+					mode="decimal"
+					:step="1"
+					placeholder="_lft"
+					@update:modelValue="console.log($event)"
+				/>
+				<Button text severity="secondary" icon="pi pi-angle-up" class="py-0.5" @click="incrementLft" />
+				<Button text severity="secondary" icon="pi pi-angle-down" class="py-0.5" @click="decrementLft" />
+			</div>
+			<div class="flex">
+				<InputNumber
+					class="border-0 w-full px-2"
+					pt:pcInputText:root:class="w-full border-0 px-3 py-1.5 w-full border-b hover:border-b-primary-400 focus:border-b-primary-400"
+					v-model="rgt"
+					:invalid="rgt === null || rgt === undefined || rgt === 0 || props.album.isDuplicate_rgt"
+					mode="decimal"
+					:step="1"
+					placeholder="_rgt"
+				/>
+				<Button text severity="secondary" icon="pi pi-angle-up" class="py-0.5" @click="incrementRgt" />
+				<Button text severity="secondary" icon="pi pi-angle-down" class="py-0.5" @click="decrementRgt" />
+			</div>
+		</div>
+		<div class="flex w-1/4 justify-between items-center">
+			<div
+				@mouseenter="setHoverId"
+				:class="{
+					'font-bold text-primary-emphasis': isHoverId,
+				}"
+			>
+				{{ props.album.trimmedId }}
+				<LeftWarn v-if="props.album.isDuplicate_lft" class="ml-2" />
+				<RightWarn v-if="props.album.isDuplicate_rgt" class="ml-2" />
+			</div>
+			<Inplace ref="inplace">
+				<template #display>
+					<span
+						@mouseenter="setHoverParent"
+						:class="{
+							' text-muted-color-emphasis': props.album.trimmedParentId === 'root',
+							'!text-danger-600 font-bold': !props.album.isExpectedParentId,
+							'font-bold text-primary-emphasis': isHoverParent,
+						}"
+						>{{ (parentId ?? "root").slice(0, 6) }}</span
+					>
+				</template>
+				<template #content>
+					<Select
+						class="border-none"
+						v-model="parentId"
+						filter
+						resetFilterOnHide
+						showClear
+						:options="props.parentIdOptions"
+						@update:modelValue="updateParentId"
+						@hide="close"
+					>
+						<template #value="slotProps">
+							<div v-if="slotProps.value">
+								{{ slotProps.value.slice(0, 6) }}
+							</div>
+							<span v-else>
+								{{ "root" }}
+							</span>
+						</template>
+						<template #option="slotProps">
+							<div>
+								{{ slotProps.option.slice(0, 6) }}
+							</div>
+						</template>
+					</Select>
+				</template>
+			</Inplace>
+		</div>
+	</div>
+</template>
+<script setup lang="ts">
+import { ref, type Ref, watch } from "vue";
+import { AugmentedAlbum } from "@/composables/album/treeOperations";
+import InputNumber from "primevue/inputnumber";
+import Button from "primevue/button";
+import LeftWarn from "./mini/LeftWarn.vue";
+import RightWarn from "./mini/RightWarn.vue";
+import Inplace from "primevue/inplace";
+import Select from "primevue/select";
+
+const props = defineProps<{
+	album: AugmentedAlbum;
+	isHoverId: boolean;
+	isHoverParent: boolean;
+	parentIdOptions: string[];
+}>();
+
+const inplace = ref();
+
+const lft = defineModel("lft") as Ref<number>;
+const rgt = defineModel("rgt") as Ref<number>;
+const parentId = defineModel("parentId") as Ref<string | null | undefined>;
+
+const isHoverId = ref<boolean>(props.isHoverId);
+const isHoverParent = ref<boolean>(props.isHoverParent);
+
+const emits = defineEmits<{
+	hoverId: [id: string];
+	incrementLft: [];
+	decrementLft: [];
+	incrementRgt: [];
+	decrementRgt: [];
+}>();
+
+function setHoverId() {
+	emits("hoverId", props.album.trimmedId);
+}
+
+function setHoverParent() {
+	emits("hoverId", props.album.trimmedParentId);
+}
+
+function incrementLft() {
+	emits("incrementLft");
+}
+
+function decrementLft() {
+	emits("decrementLft");
+}
+
+function incrementRgt() {
+	emits("incrementRgt");
+}
+
+function decrementRgt() {
+	emits("decrementRgt");
+}
+
+function updateParentId(val: string) {
+	// guarantee we never have undefined.
+	parentId.value = val ?? null;
+	close();
+}
+
+function close() {
+	inplace.value.close();
+}
+
+watch(
+	() => [props.isHoverId, props.isHoverParent],
+	([newIsHoverId, newIsHoverParent]) => {
+		isHoverId.value = newIsHoverId;
+		isHoverParent.value = newIsHoverParent;
+	},
+);
+</script>
diff --git a/resources/js/components/maintenance/MaintenanceFixTree.vue b/resources/js/components/maintenance/MaintenanceFixTree.vue
index 94dd152c907..52a3032cef7 100644
--- a/resources/js/components/maintenance/MaintenanceFixTree.vue
+++ b/resources/js/components/maintenance/MaintenanceFixTree.vue
@@ -15,27 +15,25 @@
 				</div>
 				<ProgressSpinner v-if="loading" class="w-full"></ProgressSpinner>
 			</ScrollPanel>
-			<!-- <div class="flex gap-4 mt-1">
-				<Button v-if="fixable && !loading" severity="primary" class="w-full border-none" @click="exec">{{
+			<div class="flex gap-4 mt-1">
+				<Button as="router-link" to="/fixTree" v-if="fixable && !loading" severity="primary" class="w-full border-none">{{
 					$t("maintenance.fix-tree.button")
 				}}</Button>
-			</div> -->
+			</div>
 		</template>
 	</Card>
 </template>
 
 <script setup lang="ts">
 import { computed, ref } from "vue";
-// import Button from "primevue/button";
 import Card from "primevue/card";
-import { useToast } from "primevue/usetoast";
 import ProgressSpinner from "primevue/progressspinner";
 import ScrollPanel from "primevue/scrollpanel";
 import MaintenanceService from "@/services/maintenance-service";
+import Button from "primevue/button";
 
 const data = ref<App.Http.Resources.Diagnostics.TreeState | undefined>(undefined);
 const loading = ref(false);
-const toast = useToast();
 
 const fixable = computed(() => {
 	return data.value && (data.value.oddness > 0 || data.value.duplicates > 0 || data.value.wrong_parent > 0 || data.value.missing_parent > 0);
@@ -46,17 +44,6 @@ function load() {
 	});
 }
 
-// function exec() {
-// 	loading.value = true;
-// 	MaintenanceService.treeDo().then((response) => {
-// 		toast.add({ severity: "success", summary: "Success", life: 3000 });
-// 		loading.value = false;
-// 	}).catch((e) => {
-// 		toast.add({ severity: "error", summary: "Error", detail: e.response.data.message,  life: 3000 });
-// 		loading.value = false;
-// 	});
-// }
-
 load();
 </script>
 
diff --git a/resources/js/components/maintenance/mini/Left.vue b/resources/js/components/maintenance/mini/Left.vue
new file mode 100644
index 00000000000..cd6923a7219
--- /dev/null
+++ b/resources/js/components/maintenance/mini/Left.vue
@@ -0,0 +1,3 @@
+<template>
+	<span class="text-muted-color-emphasis font-bold capitalize">left</span>
+</template>
diff --git a/resources/js/components/maintenance/mini/LeftWarn.vue b/resources/js/components/maintenance/mini/LeftWarn.vue
new file mode 100644
index 00000000000..fd47d15522f
--- /dev/null
+++ b/resources/js/components/maintenance/mini/LeftWarn.vue
@@ -0,0 +1,3 @@
+<template>
+	<i class="text-warning-600 pi pi-chevron-circle-left" />
+</template>
diff --git a/resources/js/components/maintenance/mini/Right.vue b/resources/js/components/maintenance/mini/Right.vue
new file mode 100644
index 00000000000..73a1afdbfcb
--- /dev/null
+++ b/resources/js/components/maintenance/mini/Right.vue
@@ -0,0 +1,3 @@
+<template>
+	<span class="text-muted-color-emphasis font-bold capitalize">right</span>
+</template>
diff --git a/resources/js/components/maintenance/mini/RightWarn.vue b/resources/js/components/maintenance/mini/RightWarn.vue
new file mode 100644
index 00000000000..7acacbe2cbf
--- /dev/null
+++ b/resources/js/components/maintenance/mini/RightWarn.vue
@@ -0,0 +1,3 @@
+<template>
+	<i class="text-warning-600 pi pi-chevron-circle-right" />
+</template>
diff --git a/resources/js/composables/album/treeOperations.ts b/resources/js/composables/album/treeOperations.ts
new file mode 100644
index 00000000000..3b8cc7fb684
--- /dev/null
+++ b/resources/js/composables/album/treeOperations.ts
@@ -0,0 +1,244 @@
+import { set } from "@vueuse/core";
+import { ToastServiceMethods } from "primevue/toastservice";
+import { computed, ref, Ref } from "vue";
+
+export type Augmented = {
+	prefix: string;
+	trimmedId: string;
+	trimmedParentId: string;
+	isDuplicate_rgt: boolean;
+	isDuplicate_lft: boolean;
+	isExpectedParentId: boolean;
+};
+
+export type AlbumPile = {
+	parentId: string;
+	rgt: number;
+};
+
+export type AugmentedAlbum = App.Http.Resources.Diagnostics.AlbumTree & Augmented;
+
+export function useTreeOperations(
+	originalAlbums: Ref<App.Http.Resources.Diagnostics.AlbumTree[] | undefined>,
+	albums: Ref<AugmentedAlbum[] | undefined>,
+	toast: ToastServiceMethods,
+) {
+	const isValidated = ref(false);
+	const errors = ref<string[]>([]);
+
+	function isError(album: AugmentedAlbum): boolean {
+		return (
+			album._lft === null ||
+			album._rgt === null ||
+			album._lft === 0 ||
+			album._rgt === 0 ||
+			album.isDuplicate_lft ||
+			album.isDuplicate_rgt ||
+			!album.isExpectedParentId
+		);
+	}
+
+	function setErrors(): void {
+		if (albums.value === undefined) {
+			errors.value = [];
+			return;
+		}
+
+		errors.value = albums.value.filter(isError).map((a) => {
+			if (a._lft === null || a._lft === 0) {
+				return `Album ${a.id.slice(0, 6)} has an invalid left value.`;
+			}
+			if (a._rgt === null || a._rgt === 0) {
+				return `Album ${a.id.slice(0, 6)} has an invalid right value.`;
+			}
+			if (a._lft >= a._rgt) {
+				return `Album ${a.id.slice(0, 6)} has an invalid left/right values. Left should be strictly smaller than right: ${a._lft} < ${a._rgt}.`;
+			}
+			if (a.isDuplicate_lft) {
+				return `Album ${a.id.slice(0, 6)} has a duplicate left value ${a._lft}.`;
+			}
+			if (a.isDuplicate_rgt) {
+				return `Album ${a.id.slice(0, 6)} has a duplicate right value  ${a._rgt}.`;
+			}
+			if (!a.isExpectedParentId) {
+				return `Album ${a.id.slice(0, 6)} has an unexpected parent id ${a.parent_id ?? "root"}.`;
+			}
+			return `Album ${a.id.slice(0, 6)} has an unknown error.`;
+		});
+	}
+
+	function validate() {
+		setErrors();
+
+		return errors.value.length === 0;
+	}
+
+	function prepareAlbums() {
+		if (originalAlbums.value === undefined) {
+			return;
+		}
+
+		albums.value = [];
+
+		let pile = [] as AlbumPile[];
+		for (let index = 0; index < originalAlbums.value.length; index++) {
+			const album = originalAlbums.value[index];
+
+			const trimmedId = album.id.slice(0, 6);
+			const trimmedParentId = (album.parent_id ?? "root").slice(0, 6);
+			const isDuplicate_lft = hasDuplicateLft(album);
+			const isDuplicate_rgt = hasDuplicateRgt(album);
+
+			let isExpectedParentId = true;
+			// If current lft is greater than the last rgt,
+			// we are no longer a child of the last album. We pop out the pile until we are smaller than _rgt of the pile.
+			while (pile.length > 0 && (album._lft > pile[pile.length - 1].rgt || album._rgt > pile[pile.length - 1].rgt)) {
+				pile.pop();
+			}
+
+			if (pile.length > 0) {
+				// We are inside an album
+				const last = pile[pile.length - 1];
+				isExpectedParentId = last.parentId === album.parent_id;
+			} else {
+				// We are at the root
+				isExpectedParentId = album.parent_id === null;
+			}
+
+			albums.value.push({
+				...album,
+				prefix: "  │ ".repeat(pile.length),
+				trimmedId,
+				trimmedParentId,
+				isDuplicate_lft,
+				isDuplicate_rgt,
+				isExpectedParentId,
+			});
+
+			if (album._rgt > album._lft + 1) {
+				// We are a parent
+				pile.push({ parentId: album.id, rgt: album._rgt });
+			}
+		}
+
+		isValidated.value = validate();
+	}
+
+	function hasDuplicateLft(album: App.Http.Resources.Diagnostics.AlbumTree): boolean {
+		if (originalAlbums.value === undefined) {
+			return false;
+		}
+
+		return originalAlbums.value.filter((a) => a._lft === album._lft || a._rgt === album._lft).length > 1;
+	}
+
+	function hasDuplicateRgt(album: App.Http.Resources.Diagnostics.AlbumTree): boolean {
+		if (originalAlbums.value === undefined) {
+			return false;
+		}
+
+		return originalAlbums.value.filter((a) => a._lft === album._rgt || a._rgt === album._rgt).length > 1;
+	}
+
+	function check() {
+		originalAlbums.value = albums.value?.sort((a, b) => a._lft - b._lft);
+		prepareAlbums();
+		errors.value.forEach((e) => toast.add({ severity: "error", summary: "Error", detail: e, life: 3000 }));
+	}
+
+	// We increment all the nodes' (>= lft) left and right by 1.
+	function incrementLft(id: string) {
+		if (albums.value === undefined) {
+			return;
+		}
+
+		const lft = albums.value.find((a) => a.id === id)?._lft as number;
+
+		albums.value = albums.value.map((a) => {
+			if (a._lft < lft) {
+				return a;
+			}
+			a._lft += 1;
+			a._rgt += 1;
+			return a;
+		});
+	}
+
+	// We increment all the nodes above rgt by 1 and increment rgt by 1.
+	function incrementRgt(id: string) {
+		if (albums.value === undefined) {
+			return;
+		}
+
+		const rgt = albums.value.find((a) => a.id === id)?._rgt as number;
+
+		albums.value = albums.value.map((a) => {
+			if (a._rgt < rgt) {
+				return a;
+			}
+			if (a._rgt === rgt) {
+				a._rgt += 1;
+			} else {
+				a._lft += 1;
+				a._rgt += 1;
+			}
+			return a;
+		});
+	}
+
+	// We decrement all the nodes above lft by 1.
+	function decrementLft(id: string) {
+		if (albums.value === undefined) {
+			return;
+		}
+
+		const lft = albums.value.find((a) => a.id === id)?._lft as number;
+
+		albums.value = albums.value.map((a) => {
+			if (a._lft < lft) {
+				return a;
+			}
+			a._lft -= 1;
+			a._rgt -= 1;
+			return a;
+		});
+	}
+
+	// We decrement all the nodes above rgt by 1 and decrement rgt by 1 IF lft > rgt - 1.
+	function decrementRgt(id: string) {
+		if (albums.value === undefined) {
+			return;
+		}
+
+		const rgt = albums.value.find((a) => a.id === id)?._rgt as number;
+
+		albums.value = albums.value.map((a) => {
+			if (a._rgt < rgt) {
+				return a;
+			}
+			// safety check
+			if (a._lft === rgt - 1) {
+				return a;
+			}
+			if (a._rgt === rgt) {
+				a._rgt -= 1;
+			} else {
+				a._lft += 1;
+				a._rgt += 1;
+			}
+			return a;
+		});
+	}
+
+	return {
+		isValidated,
+		setErrors,
+		validate,
+		prepareAlbums,
+		check,
+		incrementLft,
+		incrementRgt,
+		decrementLft,
+		decrementRgt,
+	};
+}
diff --git a/resources/js/lychee.d.ts b/resources/js/lychee.d.ts
index 5417f0ec659..183290e9da1 100644
--- a/resources/js/lychee.d.ts
+++ b/resources/js/lychee.d.ts
@@ -116,6 +116,13 @@ declare namespace App.Http.Resources.Collections {
 	};
 }
 declare namespace App.Http.Resources.Diagnostics {
+	export type AlbumTree = {
+		id: string;
+		title: string;
+		parent_id: string | null;
+		_lft: number;
+		_rgt: number;
+	};
 	export type CleaningState = {
 		path: string;
 		base: string;
diff --git a/resources/js/router/routes.ts b/resources/js/router/routes.ts
index b67a32d06f1..45382059464 100644
--- a/resources/js/router/routes.ts
+++ b/resources/js/router/routes.ts
@@ -15,6 +15,7 @@ const Maintenance = () => import("@/views/Maintenance.vue");
 const Diagnostics = () => import("@/views/Diagnostics.vue");
 const Statistics = () => import("@/views/Statistics.vue");
 const Jobs = () => import("@/views/Jobs.vue");
+const FixTree = () => import("@/views/FixTree.vue");
 
 const routes_ = [
 	{
@@ -98,6 +99,11 @@ const routes_ = [
 		path: "/maintenance",
 		component: Maintenance,
 	},
+	{
+		name: "tree",
+		path: "/fixTree",
+		component: FixTree,
+	},
 	{
 		name: "profile",
 		path: "/profile",
diff --git a/resources/js/services/maintenance-service.ts b/resources/js/services/maintenance-service.ts
index 8b122909b08..b4b3ddd66f6 100644
--- a/resources/js/services/maintenance-service.ts
+++ b/resources/js/services/maintenance-service.ts
@@ -1,6 +1,12 @@
 import axios, { type AxiosResponse } from "axios";
 import Constants from "./constants";
 
+export type UpdateTreeData = {
+	id: string;
+	_lft: number;
+	_rgt: number;
+};
+
 const MaintenanceService = {
 	updateGet(): Promise<AxiosResponse<App.Http.Resources.Diagnostics.UpdateInfo>> {
 		return axios.get(`${Constants.getApiUrl()}Maintenance::update`, { data: {} });
@@ -51,6 +57,14 @@ const MaintenanceService = {
 	register(key: string): Promise<AxiosResponse<App.Http.Resources.GalleryConfigs.RegisterData>> {
 		return axios.post(`${Constants.getApiUrl()}Maintenance::register`, { key: key });
 	},
+
+	fullTreeGet(): Promise<AxiosResponse<App.Http.Resources.Diagnostics.AlbumTree[]>> {
+		return axios.get(`${Constants.getApiUrl()}Maintenance::fullTree`, { data: {} });
+	},
+
+	updateFullTree(albums: UpdateTreeData[]): Promise<AxiosResponse> {
+		return axios.post(`${Constants.getApiUrl()}Maintenance::fullTree`, { albums: albums });
+	},
 };
 
 export default MaintenanceService;
diff --git a/resources/js/style/preset.ts b/resources/js/style/preset.ts
index b8cc55cb838..473f3470947 100644
--- a/resources/js/style/preset.ts
+++ b/resources/js/style/preset.ts
@@ -786,6 +786,16 @@ const LycheePrimeVueConfig = {
 				},
 			},
 		},
+		inplace: {
+			colorScheme: {
+				light: {
+					displayHoverBackground: "transparent",
+				},
+				dark: {
+					displayHoverBackground: "transparent",
+				},
+			},
+		},
 		inputtext: {
 			background: "transparent",
 			padding: {
diff --git a/resources/js/views/FixTree.vue b/resources/js/views/FixTree.vue
new file mode 100644
index 00000000000..6406f2303a7
--- /dev/null
+++ b/resources/js/views/FixTree.vue
@@ -0,0 +1,168 @@
+<template>
+	<ProgressBar v-if="albums === undefined" mode="indeterminate" class="rounded-none absolute w-full" :pt:value:class="'rounded-none'" />
+	<Toolbar class="w-full border-0 h-14">
+		<template #start>
+			<OpenLeftMenu />
+		</template>
+
+		<template #center>
+			{{ $t("maintenance.title") }}
+		</template>
+
+		<template #end> </template>
+	</Toolbar>
+	<div class="text-muted-color">
+		<div class="text-center mt-2 p-2">
+			This page allows you to re-order and fix your albums manually.<br />
+			Before any modifications, we strongly recommend you to read about Nested Set tree structures.<br />
+			<span class="text-danger-700 text-lg font-bold"
+				><i class="pi text-danger-700 pi-exclamation-triangle mr-2" />You can really break your Lychee installation here, modify values at
+				your own risks.</span
+			>
+		</div>
+		<div class="md:max-w-3xl lg:max-w-5xl xl:max-w-7xl mt-9 mx-auto">
+			<h2 class="text-muted-color-emphasis text-lg font-bold"><i class="pi pi-question-circle mr-2" />Help</h2>
+			<ul>
+				<li>Hover ids or titles to highlight related albums.</li>
+				<li>
+					For your convenience, the <i class="pi pi-angle-up" /> and <i class="pi pi-angle-down" /> buttons allow you to change the values
+					of <Left /> and <Right /> by respectively +1 and -1 with propagation.
+				</li>
+				<li>The <LeftWarn /> and <RightWarn /> indicates that the value of <Left /> (and respectively <Right />) is duplicated somewhere.</li>
+				<li>
+					Marked <span class="font-bold text-danger-600">Parent Id</span> indicates that the <Left /> and <Right /> do not satisfy the Nest
+					Set tree structures. Edit either the <span class="font-bold text-danger-600">Parent Id</span> or the <Left />/<Right /> values.
+				</li>
+				<li><i class="pi pi-exclamation-triangle mr-2 text-orange-500" />This page will be slow with a large number of albums.</li>
+			</ul>
+		</div>
+
+		<div
+			class="md:max-w-3xl lg:max-w-5xl xl:max-w-7xl mt-9 mx-auto sticky z-30 w-full top-0 flex h-11 justify-center"
+			v-if="albums !== undefined"
+		>
+			<Button text severity="secondary" class="border-none px-8 font-bold" @click="fetch">Reset</Button>
+			<Button severity="warn" class="border-none px-8 font-bold" @click="check">Check</Button>
+			<Button severity="danger" class="border-none px-8 font-bold" @click="apply">
+				<i class="pi pi-exclamation-triangle" v-if="!isValidated" />Apply
+			</Button>
+		</div>
+		<VirtualScroller :items="albums" :itemSize="50" class="h-screen">
+			<template v-slot:item="{ item, options }">
+				<template v-if="options.first">
+					<div
+						class="mt-16 pb-2 flex justify-between md:max-w-3xl lg:max-w-5xl xl:max-w-7xl mx-auto hover:bg-primary-emphasis/5 gap-8 items-center font-bold text-lg text-color-emphasis border-b border-b-white/50"
+					>
+						<div class="w-1/2">Title</div>
+						<div class="flex w-1/4 gap-4">
+							<div class="w-full pl-4">Left</div>
+							<div class="w-full pl-4">Right</div>
+						</div>
+						<div class="flex w-1/4 justify-between">
+							<div class="w-full">Id</div>
+							<div class="w-full text-right">Parent Id</div>
+						</div>
+					</div>
+				</template>
+				<FixTreeLine
+					v-model:lft="item._lft"
+					v-model:rgt="item._rgt"
+					v-model:parent-id="item.parent_id"
+					:parent-id-options="albumIds"
+					:album="item"
+					:is-hover-id="hoverId === item.trimmedId"
+					:is-hover-parent="hoverId === item.trimmedParentId"
+					@hover-id="setHoverId"
+					@decrement-lft="decrementLft(item.id)"
+					@increment-lft="incrementLft(item.id)"
+					@decrement-rgt="decrementRgt(item.id)"
+					@increment-rgt="incrementRgt(item.id)"
+				/>
+			</template>
+		</VirtualScroller>
+	</div>
+	<ScrollTop />
+</template>
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import MaintenanceService from "@/services/maintenance-service";
+import Toolbar from "primevue/toolbar";
+import OpenLeftMenu from "@/components/headers/OpenLeftMenu.vue";
+import ProgressBar from "primevue/progressbar";
+import Button from "primevue/button";
+import AlbumService from "@/services/album-service";
+import { AugmentedAlbum, useTreeOperations } from "@/composables/album/treeOperations";
+import { useToast } from "primevue/usetoast";
+import FixTreeLine from "@/components/maintenance/FixTreeLine.vue";
+import Left from "@/components/maintenance/mini/Left.vue";
+import Right from "@/components/maintenance/mini/Right.vue";
+import LeftWarn from "@/components/maintenance/mini/LeftWarn.vue";
+import RightWarn from "@/components/maintenance/mini/RightWarn.vue";
+import ScrollTop from "primevue/scrolltop";
+import VirtualScroller from "primevue/virtualscroller";
+
+const albums = ref<AugmentedAlbum[] | undefined>(undefined);
+const originalAlbums = ref<App.Http.Resources.Diagnostics.AlbumTree[] | undefined>(undefined);
+const hoverId = ref<string | undefined>(undefined);
+const toast = useToast();
+const albumIds = ref<string[]>([]);
+
+const { isValidated, validate, prepareAlbums, check, incrementLft, incrementRgt, decrementLft, decrementRgt } = useTreeOperations(
+	originalAlbums,
+	albums,
+	toast,
+);
+
+function fetch() {
+	albums.value = undefined;
+	MaintenanceService.fullTreeGet().then((data) => {
+		originalAlbums.value = data.data;
+		albumIds.value = originalAlbums.value.map((a) => a.id);
+		prepareAlbums();
+	});
+}
+
+function setHoverId(id: string) {
+	hoverId.value = id;
+}
+
+function apply() {
+	if (albums.value === undefined) {
+		return;
+	}
+
+	if (!validate()) {
+		toast.add({
+			severity: "error",
+			summary: "Invalid tree!",
+			detail: "We are not applying this as it is guaranteed to be a broken state.",
+			life: 3000,
+		});
+		return;
+	}
+
+	const data = albums.value.map((a) => {
+		return {
+			id: a.id,
+			_lft: a._lft,
+			_rgt: a._rgt,
+			parent_id: a.parent_id,
+		};
+	});
+
+	MaintenanceService.updateFullTree(data).then(() => {
+		AlbumService.clearCache();
+		fetch();
+	});
+}
+
+onMounted(() => {
+	fetch();
+});
+</script>
+<style lang="css">
+/* Kill the border of ScrollTop */
+.p-scrolltop {
+	border: none;
+}
+</style>
diff --git a/routes/api_v2.php b/routes/api_v2.php
index 0dfd606b1cf..b80336d734e 100644
--- a/routes/api_v2.php
+++ b/routes/api_v2.php
@@ -208,6 +208,8 @@
 Route::post('/Maintenance::missingFileSize', [Admin\Maintenance\MissingFileSizes::class, 'do']);
 Route::post('/Maintenance::optimize', [Admin\Maintenance\Optimize::class, 'do']);
 Route::post('/Maintenance::register', Admin\Maintenance\RegisterController::class);
+Route::get('/Maintenance::fullTree', [Admin\Maintenance\FullTree::class, 'check']);
+Route::post('/Maintenance::fullTree', [Admin\Maintenance\FullTree::class, 'do']);
 
 /**
  * STATISTICS.
diff --git a/routes/web_v2.php b/routes/web_v2.php
index 9548f70e505..387ee645428 100644
--- a/routes/web_v2.php
+++ b/routes/web_v2.php
@@ -45,6 +45,7 @@
 Route::get('/users', [VueController::class, 'view'])->middleware(['migration:complete']);
 Route::get('/settings', [VueController::class, 'view'])->middleware(['migration:complete']);
 Route::get('/permissions', [VueController::class, 'view'])->middleware(['migration:complete']);
+Route::get('/fixTree', [VueController::class, 'view'])->middleware(['migration:complete']);
 
 Route::match(['get', 'post'], '/migrate', [Admin\UpdateController::class, 'migrate'])
 	->name('migrate')