diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js
index 0f476c5c47..fc6ee9c1f1 100644
--- a/src/controllers/admin/uploads.js
+++ b/src/controllers/admin/uploads.js
@@ -68,14 +68,17 @@ function buildBreadcrumbs(currentFolder) {
 	const crumbs = [];
 	const parts = currentFolder.replace(nconf.get('upload_path'), '').split(path.sep);
 	let currentPath = '';
-	parts.forEach((part) => {
+	parts.forEach((part, i) => {
 		const dir = path.join(currentPath, part);
-		crumbs.push({
+		const crumb = {
 			text: part || 'Uploads',
-			url: part ?
+		};
+		if (i < parts.length - 1) {
+			crumb.url = part ?
 				(`${nconf.get('relative_path')}/admin/manage/uploads?dir=${dir}`) :
-				`${nconf.get('relative_path')}/admin/manage/uploads`,
-		});
+				`${nconf.get('relative_path')}/admin/manage/uploads`;
+		}
+		crumbs.push(crumb);
 		currentPath = dir;
 	});
 
diff --git a/src/views/admin/advanced/logs.tpl b/src/views/admin/advanced/logs.tpl
index 7184e4d98b..ee08a1a5ff 100644
--- a/src/views/admin/advanced/logs.tpl
+++ b/src/views/admin/advanced/logs.tpl
@@ -15,7 +15,7 @@
 
 	<div class="card">
 		<div class="card-body">
-			<pre style="height: 600px;">{data}</pre>
+			<pre style="height: 600px; white-space: break-spaces;">{data}</pre>
 		</div>
 	</div>
 </div>
diff --git a/src/views/admin/partials/breadcrumbs.tpl b/src/views/admin/partials/breadcrumbs.tpl
new file mode 100644
index 0000000000..506d7da541
--- /dev/null
+++ b/src/views/admin/partials/breadcrumbs.tpl
@@ -0,0 +1,12 @@
+{{{ if breadcrumbs.length }}}
+<ol class="breadcrumb mb-0" itemscope="itemscope" itemprop="breadcrumb" itemtype="http://schema.org/BreadcrumbList">
+	{{{ each breadcrumbs }}}
+	<li{{{ if @last }}} component="breadcrumb/current"{{{ end }}} itemscope="itemscope" itemprop="itemListElement" itemtype="http://schema.org/ListItem" class="breadcrumb-item {{{ if @last }}}active{{{ end }}}">
+		<meta itemprop="position" content="{@index}" />
+		{{{ if ./url }}}<a href="{./url}" itemprop="item">{{{ end }}}
+			<span class="fw-semibold" itemprop="name">{./text}</span>
+		{{{ if ./url }}}</a>{{{ end }}}
+	</li>
+	{{{ end }}}
+</ol>
+{{{ end }}}