diff --git a/src/ui/code-blocks/ShelfCodeBlockView.svelte b/src/ui/code-blocks/ShelfCodeBlockView.svelte
index 02a9971..f7ed2ea 100644
--- a/src/ui/code-blocks/ShelfCodeBlockView.svelte
+++ b/src/ui/code-blocks/ShelfCodeBlockView.svelte
@@ -15,12 +15,13 @@
 		setSettingsContext,
 	} from "@ui/stores/settings.svelte";
 	import { COLOR_NAMES, type ColorName } from "@utils/color";
-	import { randomElement, randomFloat, randomInt } from "@utils/rand";
+	import { randomElement, randomFloat } from "@utils/rand";
 	import { onDestroy } from "svelte";
 	import { ShelfSettingsSchema } from "./ShelfCodeBlock";
-	import { parseYaml, TFile } from "obsidian";
+	import { getLinkpath, parseYaml, TFile } from "obsidian";
 	import DateFilter from "@ui/components/DateFilter.svelte";
 	import Rating from "@ui/components/Rating.svelte";
+	import { v4 as uuidv4 } from "uuid";
 
 	interface Props {
 		plugin: BookTrackerPlugin;
@@ -28,6 +29,7 @@
 	}
 
 	interface BookData {
+		id: string;
 		title: string;
 		subtitle?: string;
 		author: string;
@@ -38,6 +40,11 @@
 		file: TFile;
 	}
 
+	interface BookStackData {
+		id: string;
+		books: BookData[];
+	}
+
 	const { plugin, source }: Props = $props();
 
 	const settings = ShelfSettingsSchema.parse(parseYaml(source));
@@ -71,13 +78,13 @@
 	const randomStackChance = () => randomFloat() > 0.9;
 	function randomStackSize() {
 		const n = randomFloat();
-		if (n < 0.2) {
+		if (n < 0.15) {
 			return 5;
-		} else if (n < 0.5) {
+		} else if (n < 0.3) {
 			return 4;
-		} else if (n < 0.8) {
+		} else if (n < 0.5) {
 			return 3;
-		} else if (n < 0.98) {
+		} else if (n < 0.8) {
 			return 2;
 		} else {
 			return 1;
@@ -86,6 +93,7 @@
 
 	function getBookData(metadata: FileMetadata): BookData {
 		return {
+			id: metadata.file.path,
 			title: metadata.frontmatter[settings.titleProperty],
 			subtitle: settings.subtitleProperty
 				? metadata.frontmatter[settings.subtitleProperty]
@@ -102,29 +110,29 @@
 	}
 
 	let view = $state(settings.defaultView);
-	const books = $derived.by(() => {
-		let books: (BookData | BookData[])[] = [];
+	let books: (BookData | BookStackData)[] = $state([]);
+
+	$effect(() => {
+		let newBooks: (BookData | BookStackData)[] = [];
 
 		for (let i = 0; i < metadataStore.metadata.length; i++) {
 			if (randomStackChance()) {
 				const booksRemaining = metadataStore.metadata.length - i;
-				const stackSize = randomInt(
-					1,
-					Math.min(booksRemaining, randomStackSize()),
-				);
+				const stackSize = Math.min(booksRemaining, randomStackSize());
 
-				books.push(
-					metadataStore.metadata
+				newBooks.push({
+					id: uuidv4(),
+					books: metadataStore.metadata
 						.slice(i, i + stackSize)
 						.map(getBookData),
-				);
+				});
 				i += stackSize - 1;
 			} else {
-				books.push(getBookData(metadataStore.metadata[i]));
+				newBooks.push(getBookData(metadataStore.metadata[i]));
 			}
 		}
 
-		return books;
+		books = newBooks;
 	});
 
 	onDestroy(() => metadataStore.destroy());
@@ -146,21 +154,19 @@
 	</div>
 	{#if view === "bookshelf"}
 		<Bookshelf>
-			{#each books as book}
-				{#if Array.isArray(book)}
-					<BookStack totalChildren={book.length}>
-						{#each book as bookData}
+			{#each books as book (book.id)}
+				{#if "books" in book}
+					<BookStack totalChildren={book.books.length}>
+						{#each book.books as bookData (bookData.id)}
 							<BookStackElement
 								title={bookData.title}
 								subtitle={bookData.subtitle}
 								color={bookData.color}
 								design={bookData.design}
 								onClick={() =>
-									plugin.app.workspace.openLinkText(
-										bookData.file.path,
-										"",
-										true,
-									)}
+									plugin.app.workspace
+										.getLeaf("tab")
+										.openFile(bookData.file)}
 							/>
 						{/each}
 					</BookStack>
@@ -174,11 +180,9 @@
 						design={book.design}
 						orientation={book.orientation}
 						onClick={() =>
-							plugin.app.workspace.openLinkText(
-								book.file.path,
-								"",
-								true,
-							)}
+							plugin.app.workspace
+								.getLeaf("tab")
+								.openFile(book.file)}
 					/>
 				{/if}
 			{/each}
@@ -221,7 +225,11 @@
 								width="50"
 							/>
 						</td>
-						<td>{book.frontmatter[settings.titleProperty]}</td>
+						<td>
+							<a href={getLinkpath(book.file.path)}>
+								{book.frontmatter[settings.titleProperty]}
+							</a>
+						</td>
 						<td>
 							{book.frontmatter[settings.authorsProperty].join(
 								", ",
diff --git a/src/ui/components/bookshelf/Book.svelte b/src/ui/components/bookshelf/Book.svelte
index d0b8858..4a4ff38 100644
--- a/src/ui/components/bookshelf/Book.svelte
+++ b/src/ui/components/bookshelf/Book.svelte
@@ -151,7 +151,8 @@
 				z-index: 2;
 			}
 
-			:global(.bookshelf__book-content) {
+			:global(.bookshelf__book-content),
+			:global(.fit-text) {
 				height: calc(var(--book-width));
 			}
 		}
@@ -167,8 +168,12 @@
 				top: 26px;
 			}
 
-			:global(.bookshelf__book-content) {
+			:global(.bookshelf__book-content),
+			:global(.fit-text) {
 				width: calc(200px - 61px) !important;
+			}
+
+			:global(.bookshelf__book-content) {
 				margin: 40px var(--book-width);
 			}
 		}
@@ -187,8 +192,12 @@
 				bottom: 10px;
 			}
 
-			:global(.bookshelf__book-content) {
+			:global(.bookshelf__book-content),
+			:global(.fit-text) {
 				width: calc(200px - 62px) !important;
+			}
+
+			:global(.bookshelf__book-content) {
 				margin: 30px var(--book-width);
 			}
 		}
diff --git a/src/ui/components/bookshelf/BookStackElement.svelte b/src/ui/components/bookshelf/BookStackElement.svelte
index c604195..f2cdb0c 100644
--- a/src/ui/components/bookshelf/BookStackElement.svelte
+++ b/src/ui/components/bookshelf/BookStackElement.svelte
@@ -107,8 +107,12 @@
 				right: 10px;
 			}
 
-			:global(.bookshelf__book-content) {
+			:global(.bookshelf__book-content),
+			:global(.fit-text) {
 				width: calc(200px - 60px) !important;
+			}
+
+			:global(.bookshelf__book-content) {
 				margin: 0 30px;
 			}
 		}
@@ -125,8 +129,12 @@
 				z-index: 2;
 			}
 
-			:global(.bookshelf__book-content) {
+			:global(.bookshelf__book-content),
+			:global(.fit-text) {
 				width: calc(200px - 31px) !important;
+			}
+
+			:global(.bookshelf__book-content) {
 				margin: 0 31px;
 			}
 		}
diff --git a/src/ui/components/bookshelf/BookText.svelte b/src/ui/components/bookshelf/BookText.svelte
index 143ab13..80fbc2e 100644
--- a/src/ui/components/bookshelf/BookText.svelte
+++ b/src/ui/components/bookshelf/BookText.svelte
@@ -17,12 +17,13 @@
 >
 	{#if title}
 		<h2
-			class="bookshelf__book-title"
+			class="bookshelf__book-title fit-text"
 			class:wrap={allowWrap}
 			use:fitText={{
 				minFontSize: 12,
 				maxFontSize: 16,
 				multiLine: allowWrap,
+				detectMultiLine: false,
 			}}
 		>
 			{title}
@@ -30,11 +31,12 @@
 	{/if}
 	{#if subtitle}
 		<h4
-			class="bookshelf__book-subtitle"
+			class="bookshelf__book-subtitle fit-text"
 			use:fitText={{
 				minFontSize: 10,
 				maxFontSize: 14,
 				multiLine: allowWrap,
+				detectMultiLine: false,
 			}}
 		>
 			{subtitle}
diff --git a/src/ui/components/bookshelf/BookTilted.svelte b/src/ui/components/bookshelf/BookTilted.svelte
index 590de09..b430ebe 100644
--- a/src/ui/components/bookshelf/BookTilted.svelte
+++ b/src/ui/components/bookshelf/BookTilted.svelte
@@ -38,9 +38,13 @@
 
 <style lang="scss">
 	div {
-		:global(.bookshelf__book-content) {
+		:global(.bookshelf__book-content),
+		:global(.fit-text) {
 			height: calc(var(--book-tilted-width));
 			width: calc(200px - 60px);
+		}
+
+		:global(.bookshelf__book-content) {
 			margin: var(--book-tilted-top-margin) var(--book-tilted-width);
 		}
 	}