diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 9e87dd2..bde8a6a 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -12,6 +12,7 @@ import { SearchImageContextProvider } from "@contexts/SearchImageContext";
 import { WithNotifications } from "@contexts/Notifications";
 import { ProtectedRoute } from "@components/protected-route";
 import { AppWrapper } from "@components/app-wrapper";
+import { WithTopbarAndDock } from "@components/app-wrapper/with-topbar-and-dock";
 
 export const App = () => {
 	onAndroidMount();
@@ -24,10 +25,12 @@ export const App = () => {
 
 					<Route path="/" component={ProtectedRoute}>
 						<Route path="/" component={WithNotifications}>
-							<Route path="/" component={FrontPage} />
-							<Route path="/image/:imageId" component={ImagePage} />
-							<Route path="/entity/:entityId" component={Entity} />
-							<Route path="/gallery/:entity" component={Gallery} />
+							<Route path="/" component={WithTopbarAndDock}>
+								<Route path="/" component={FrontPage} />
+								<Route path="/image/:imageId" component={ImagePage} />
+								<Route path="/entity/:entityId" component={Entity} />
+								<Route path="/gallery/:entity" component={Gallery} />
+							</Route>
 						</Route>
 						<Route path="/settings" component={Settings} />
 					</Route>
diff --git a/frontend/src/components/app-wrapper/dock.tsx b/frontend/src/components/app-wrapper/dock.tsx
index 61a23db..ad0a3be 100644
--- a/frontend/src/components/app-wrapper/dock.tsx
+++ b/frontend/src/components/app-wrapper/dock.tsx
@@ -4,7 +4,7 @@ import { Component } from "solid-js";
 
 export const Dock: Component = () => {
 	return (
-		<div class="w-full mt-auto h-16 bg-white flex justify-between m-4 rounded-xl">
+		<div class="w-full mt-auto h-16 bg-white flex justify-between rounded-xl">
 			<A href="/" class="w-full flex justify-center items-center">
 				<IconHome />
 			</A>
diff --git a/frontend/src/components/app-wrapper/index.tsx b/frontend/src/components/app-wrapper/index.tsx
index 3d742e2..bca6dde 100644
--- a/frontend/src/components/app-wrapper/index.tsx
+++ b/frontend/src/components/app-wrapper/index.tsx
@@ -1,14 +1,10 @@
 import { Component, ParentProps } from "solid-js";
-import { Topbar } from "./topbar";
-import { Dock } from "./dock";
 
 export const AppWrapper: Component<ParentProps> = (props) => {
 	return (
 		<div class="w-full flex flex-col items-center h-screen">
-			<div class="container flex flex-col w-full h-full">
-				<Topbar />
+			<div class="container flex flex-col w-full h-full gap-4 m-4">
 				{props.children}
-				<Dock />
 			</div>
 		</div>
 	);
diff --git a/frontend/src/components/app-wrapper/topbar.tsx b/frontend/src/components/app-wrapper/topbar.tsx
index 0e2b889..d45f1a2 100644
--- a/frontend/src/components/app-wrapper/topbar.tsx
+++ b/frontend/src/components/app-wrapper/topbar.tsx
@@ -1,16 +1,23 @@
-import { useNavigate } from "@solidjs/router";
+import { ProcessingImages } from "@components/notifications/ProcessingImage";
+import { useLocation, useNavigate } from "@solidjs/router";
 import { IconArrowLeft } from "@tabler/icons-solidjs";
-import { Component } from "solid-js";
+import { Component, Show } from "solid-js";
 
 export const Topbar: Component = () => {
 	const nav = useNavigate();
+	const location = useLocation();
 
 	return (
-		<div class="w-full flex items-center bg-white rounded-xl h-16">
-			<div class="cursor-pointer" onClick={() => nav(-1)}>
-				<IconArrowLeft />
-			</div>
+		<div class="w-full flex items-center bg-white rounded-xl h-16 px-4 gap-4">
+			<Show when={location.pathname !== "/"}>
+				<div class="cursor-pointer" onClick={() => nav(-1)}>
+					<IconArrowLeft />
+				</div>
+			</Show>
 			<h1 class="font-bold text-2xl">Haystack</h1>
+			<div class="ml-auto">
+				<ProcessingImages />
+			</div>
 		</div>
 	);
 };
diff --git a/frontend/src/components/app-wrapper/with-topbar-and-dock.tsx b/frontend/src/components/app-wrapper/with-topbar-and-dock.tsx
new file mode 100644
index 0000000..e1923e5
--- /dev/null
+++ b/frontend/src/components/app-wrapper/with-topbar-and-dock.tsx
@@ -0,0 +1,13 @@
+import { Component, ParentProps } from "solid-js";
+import { Topbar } from "./topbar";
+import { Dock } from "./dock";
+
+export const WithTopbarAndDock: Component<ParentProps> = (props) => {
+	return (
+		<>
+			<Topbar />
+			{props.children}
+			<Dock />
+		</>
+	);
+};
diff --git a/frontend/src/components/notifications/ProcessingImage.tsx b/frontend/src/components/notifications/ProcessingImage.tsx
index 1bfa294..6e28daa 100644
--- a/frontend/src/components/notifications/ProcessingImage.tsx
+++ b/frontend/src/components/notifications/ProcessingImage.tsx
@@ -11,27 +11,29 @@ export const ProcessingImages: Component = () => {
 		Object.keys(notifications.state.ProcessingImages).length;
 
 	return (
-		<Show when={processingNumber() > 0}>
-			<Popover sameWidth gutter={4}>
-				<Popover.Trigger class="w-full flex justify-between rounded-xl bg-slate-800 text-gray-100 px-4 py-2">
+		<Popover sameWidth gutter={4}>
+			<Popover.Trigger class="w-full flex justify-between rounded-xl px-4 py-2">
+				<Show when={processingNumber() > 0}>
+					<p class="text-md">
+						Processing {processingNumber()}{" "}
+						{processingNumber() === 1 ? "image" : "images"}
+					</p>
+				</Show>
+				<Show
+					when={processingNumber() === 0}
+					fallback={<LoadingCircle status="loading" />}
+				>
+					<LoadingCircle status="complete" />
+				</Show>
+			</Popover.Trigger>
+			<Popover.Portal>
+				<Popover.Content class="shadow-2xl flex flex-col gap-2 bg-white rounded-xl p-2">
 					<Show
-						when={processingNumber() > 0}
-						fallback={<p class="text-md">No images to process</p>}
+						when={
+							Object.entries(notifications.state.ProcessingImages).length > 0
+						}
+						fallback={<p>No images to process</p>}
 					>
-						<p class="text-md">
-							Processing {processingNumber()}{" "}
-							{processingNumber() === 1 ? "image" : "images"}
-						</p>
-					</Show>
-					<Show
-						when={processingNumber() === 0}
-						fallback={<LoadingCircle status="loading" />}
-					>
-						<LoadingCircle status="complete" />
-					</Show>
-				</Popover.Trigger>
-				<Popover.Portal>
-					<Popover.Content class="shadow-2xl flex flex-col gap-2 bg-slate-800 rounded-xl p-2">
 						<For each={Object.entries(notifications.state.ProcessingImages)}>
 							{([id, _image]) => (
 								<Show when={_image}>
@@ -54,9 +56,9 @@ export const ProcessingImages: Component = () => {
 								</Show>
 							)}
 						</For>
-					</Popover.Content>
-				</Popover.Portal>
-			</Popover>
-		</Show>
+					</Show>
+				</Popover.Content>
+			</Popover.Portal>
+		</Popover>
 	);
 };