diff --git a/app/client/components/file-browsers/file-browser.tsx b/app/client/components/file-browsers/file-browser.tsx
index 771a1e7d..ec4dc347 100644
--- a/app/client/components/file-browsers/file-browser.tsx
+++ b/app/client/components/file-browsers/file-browser.tsx
@@ -134,15 +134,10 @@ export const FileBrowser = (props: FileBrowserProps) => {
 	}
 
 	const bodyWithScroll = useScrollArea ? <ScrollArea className={scrollAreaClassName}>{body}</ScrollArea> : body;
-	const wrappedBody = treeContainerClassName ? (
-		<div className={treeContainerClassName}>{bodyWithScroll}</div>
-	) : (
-		bodyWithScroll
-	);
 
 	return (
 		<div className={className}>
-			{wrappedBody}
+			<div className={treeContainerClassName}>{bodyWithScroll}</div>
 			{showSelectedPathFooter && resolvedSelectedPath && (
 				<div className="bg-muted/50 border-t p-2 text-sm">
 					<div className="font-medium text-muted-foreground">{selectedPathLabel}</div>
diff --git a/app/client/components/file-browsers/local-file-browser.tsx b/app/client/components/file-browsers/local-file-browser.tsx
index 920ed891..a7cfae7e 100644
--- a/app/client/components/file-browsers/local-file-browser.tsx
+++ b/app/client/components/file-browsers/local-file-browser.tsx
@@ -30,13 +30,6 @@ export const LocalFileBrowser = ({ initialPath = "/", enabled = true, ...uiProps
 		},
 	});
 
-	const errorDetails = parseError(error)?.message;
-	const errorMessage = errorDetails
-		? `Failed to load directories: ${errorDetails}`
-		: error
-			? "Failed to load directories"
-			: undefined;
-
 	return (
 		<FileBrowser
 			{...uiProps}
@@ -49,7 +42,7 @@ export const LocalFileBrowser = ({ initialPath = "/", enabled = true, ...uiProps
 			getFolderPagination={fileBrowser.getFolderPagination}
 			isLoading={fileBrowser.isLoading}
 			isEmpty={fileBrowser.isEmpty}
-			errorMessage={errorMessage}
+			errorMessage={parseError(error)?.message}
 			loadingMessage={uiProps.loadingMessage ?? "Loading directories..."}
 			emptyMessage={uiProps.emptyMessage ?? "No subdirectories found"}
 		/>
diff --git a/app/client/components/file-browsers/snapshot-tree-browser.tsx b/app/client/components/file-browsers/snapshot-tree-browser.tsx
index 6bc178da..f9983dfd 100644
--- a/app/client/components/file-browsers/snapshot-tree-browser.tsx
+++ b/app/client/components/file-browsers/snapshot-tree-browser.tsx
@@ -135,13 +135,6 @@ export const SnapshotTreeBrowser = ({
 		[onSelectionChange, addBasePath, onSingleSelectionKindChange, displayPathKinds],
 	);
 
-	const errorDetails = parseError(error)?.message;
-	const errorMessage = errorDetails
-		? `Failed to load files: ${errorDetails}`
-		: error
-			? "Failed to load files"
-			: undefined;
-
 	return (
 		<FileBrowser
 			{...fileBrowserUiProps}
@@ -154,7 +147,7 @@ export const SnapshotTreeBrowser = ({
 			getFolderPagination={fileBrowser.getFolderPagination}
 			isLoading={fileBrowser.isLoading}
 			isEmpty={fileBrowser.isEmpty}
-			errorMessage={errorMessage}
+			errorMessage={parseError(error)?.message}
 			loadingMessage={fileBrowserUiProps.loadingMessage ?? "Loading files..."}
 			selectedPaths={displaySelectedPaths}
 			onSelectionChange={onSelectionChange ? handleSelectionChange : undefined}
diff --git a/app/client/components/file-browsers/volume-file-browser.tsx b/app/client/components/file-browsers/volume-file-browser.tsx
index 338f362d..2b39d03f 100644
--- a/app/client/components/file-browsers/volume-file-browser.tsx
+++ b/app/client/components/file-browsers/volume-file-browser.tsx
@@ -38,13 +38,6 @@ export const VolumeFileBrowser = ({ volumeId, enabled = true, ...uiProps }: Volu
 		},
 	});
 
-	const errorDetails = parseError(error)?.message;
-	const errorMessage = errorDetails
-		? `Failed to load files: ${errorDetails}`
-		: error
-			? "Failed to load files"
-			: undefined;
-
 	return (
 		<FileBrowser
 			{...uiProps}
@@ -57,7 +50,7 @@ export const VolumeFileBrowser = ({ volumeId, enabled = true, ...uiProps }: Volu
 			getFolderPagination={fileBrowser.getFolderPagination}
 			isLoading={fileBrowser.isLoading}
 			isEmpty={fileBrowser.isEmpty}
-			errorMessage={errorMessage}
+			errorMessage={parseError(error)?.message}
 			loadingMessage={uiProps.loadingMessage ?? "Loading files..."}
 			emptyMessage={uiProps.emptyMessage ?? "This volume appears to be empty."}
 		/>
diff --git a/app/client/components/restore-form.tsx b/app/client/components/restore-form.tsx
index 44536073..40573ebd 100644
--- a/app/client/components/restore-form.tsx
+++ b/app/client/components/restore-form.tsx
@@ -150,30 +150,22 @@ export function RestoreForm({ repository, snapshotId, returnPath, basePath }: Re
 	]);
 
 	const handleDownload = useCallback(() => {
-		if (selectedPaths.size > 1) {
-			return;
-		}
+		if (selectedPaths.size > 1) return;
 
-		const dumpUrl = new URL(
+		const url = new URL(
 			`/api/v1/repositories/${repository.shortId}/snapshots/${snapshotId}/dump`,
 			window.location.origin,
 		);
 
-		if (selectedPaths.size === 1) {
-			const [selectedPath] = selectedPaths;
-			if (selectedPath) {
-				dumpUrl.searchParams.set("path", selectedPath);
-				if (selectedPathKind) {
-					dumpUrl.searchParams.set("kind", selectedPathKind);
-				}
+		const [selectedPath] = selectedPaths;
+		if (selectedPath) {
+			url.searchParams.set("path", selectedPath);
+			if (selectedPathKind) {
+				url.searchParams.set("kind", selectedPathKind);
 			}
 		}
 
-		const link = document.createElement("a");
-		link.href = dumpUrl.toString();
-		document.body.appendChild(link);
-		link.click();
-		document.body.removeChild(link);
+		window.location.assign(url.toString());
 	}, [repository.shortId, snapshotId, selectedPathKind, selectedPaths]);
 
 	const acknowledgeRestoreResult = useCallback(() => {
diff --git a/app/client/modules/repositories/tabs/info.tsx b/app/client/modules/repositories/tabs/info.tsx
index 2d11ac23..f8567a7b 100644
--- a/app/client/modules/repositories/tabs/info.tsx
+++ b/app/client/modules/repositories/tabs/info.tsx
@@ -26,6 +26,7 @@ import { DoctorReport } from "../components/doctor-report";
 import { parseError } from "~/client/lib/errors";
 import { useNavigate } from "@tanstack/react-router";
 import { CompressionStatsChart } from "../components/compression-stats-chart";
+import { cn } from "~/client/lib/utils";
 
 type Props = {
 	repository: Repository;
@@ -94,6 +95,12 @@ export const RepositoryInfoTabContent = ({ repository }: Props) => {
 	};
 
 	const config = repository.config as RepositoryConfig;
+	const isDoctorRunning = repository.status === "doctor";
+	const hasLocalPath = Boolean(effectiveLocalPath);
+	const hasCaCert = Boolean(config.cacert);
+	const hasLastError = Boolean(repository.lastError);
+	const hasInsecureTlsConfig = config.insecureTls !== undefined;
+	const isTlsValidationDisabled = config.insecureTls === true;
 
 	return (
 		<>
@@ -112,26 +119,25 @@ export const RepositoryInfoTabContent = ({ repository }: Props) => {
 								<Pencil className="h-4 w-4 mr-2" />
 								Edit
 							</Button>
-							{repository.status === "doctor" ? (
-								<Button
-									type="button"
-									variant="destructive"
-									loading={cancelDoctor.isPending}
-									onClick={() => cancelDoctor.mutate({ path: { shortId: repository.shortId } })}
-								>
-									<Square className="h-4 w-4 mr-2" />
-									<span>Cancel doctor</span>
-								</Button>
-							) : (
-								<Button
-									type="button"
-									onClick={() => startDoctor.mutate({ path: { shortId: repository.shortId } })}
-									disabled={startDoctor.isPending}
-								>
-									<Stethoscope className="h-4 w-4 mr-2" />
-									Run doctor
-								</Button>
-							)}
+							<Button
+								type="button"
+								variant="destructive"
+								loading={cancelDoctor.isPending}
+								onClick={() => cancelDoctor.mutate({ path: { shortId: repository.shortId } })}
+								className={cn({ hidden: !isDoctorRunning })}
+							>
+								<Square className="h-4 w-4 mr-2" />
+								<span>Cancel doctor</span>
+							</Button>
+							<Button
+								type="button"
+								onClick={() => startDoctor.mutate({ path: { shortId: repository.shortId } })}
+								disabled={startDoctor.isPending}
+								className={cn({ hidden: isDoctorRunning })}
+							>
+								<Stethoscope className="h-4 w-4 mr-2" />
+								Run doctor
+							</Button>
 							<Button
 								type="button"
 								variant="outline"
@@ -178,12 +184,10 @@ export const RepositoryInfoTabContent = ({ repository }: Props) => {
 								<div className="text-sm font-medium text-muted-foreground">Status</div>
 								<p className="mt-1 text-sm">{repository.status || "unknown"}</p>
 							</div>
-							{effectiveLocalPath && (
-								<div>
-									<div className="text-sm font-medium text-muted-foreground">Local path</div>
-									<p className="mt-1 text-sm font-mono">{effectiveLocalPath}</p>
-								</div>
-							)}
+							<div className={cn({ hidden: !hasLocalPath })}>
+								<div className="text-sm font-medium text-muted-foreground">Local path</div>
+								<p className="mt-1 text-sm font-mono">{effectiveLocalPath}</p>
+							</div>
 							<div>
 								<div className="text-sm font-medium text-muted-foreground">Created at</div>
 								<p className="mt-1 text-sm">{formatDateTime(repository.createdAt)}</p>
@@ -192,40 +196,31 @@ export const RepositoryInfoTabContent = ({ repository }: Props) => {
 								<div className="text-sm font-medium text-muted-foreground">Last checked</div>
 								<p className="mt-1 text-sm">{formatTimeAgo(repository.lastChecked)}</p>
 							</div>
-							{config.cacert && (
-								<div>
-									<div className="text-sm font-medium text-muted-foreground">CA Certificate</div>
-									<p className="mt-1 text-sm">
-										<span className="text-green-500">configured</span>
-									</p>
-								</div>
-							)}
-							{"insecureTls" in config && (
-								<div>
-									<div className="text-sm font-medium text-muted-foreground">TLS Certificate Validation</div>
-									<p className="mt-1 text-sm">
-										{config.insecureTls ? (
-											<span className="text-red-500">disabled</span>
-										) : (
-											<span className="text-green-500">enabled</span>
-										)}
-									</p>
-								</div>
-							)}
+							<div className={cn({ hidden: !hasCaCert })}>
+								<div className="text-sm font-medium text-muted-foreground">CA Certificate</div>
+								<p className="mt-1 text-sm">
+									<span className="text-green-500">configured</span>
+								</p>
+							</div>
+							<div className={cn({ hidden: !hasInsecureTlsConfig })}>
+								<div className="text-sm font-medium text-muted-foreground">TLS Certificate Validation</div>
+								<p className="mt-1 text-sm">
+									<span className={cn("text-red-500", { hidden: !isTlsValidationDisabled })}>disabled</span>
+									<span className={cn("text-green-500", { hidden: isTlsValidationDisabled })}>enabled</span>
+								</p>
+							</div>
 						</div>
 					</div>
 
 					<div>
-						{repository.lastError && (
-							<div>
-								<div className="flex items-center justify-between mb-4">
-									<h3 className="text-lg font-semibold text-red-500">Last Error</h3>
-								</div>
-								<div className="bg-red-500/10 border border-red-500/20 rounded-md p-4">
-									<p className="text-sm text-red-500 wrap-break-word">{repository.lastError}</p>
-								</div>
+						<div className={cn({ hidden: !hasLastError })}>
+							<div className="flex items-center justify-between mb-4">
+								<h3 className="text-lg font-semibold text-red-500">Last Error</h3>
 							</div>
-						)}
+							<div className="bg-red-500/10 border border-red-500/20 rounded-md p-4">
+								<p className="text-sm text-red-500 wrap-break-word">{repository.lastError}</p>
+							</div>
+						</div>
 
 						<div>
 							<h3 className="text-lg font-semibold mb-4">Configuration</h3>