diff --git a/backend/internal/compile/client.html b/backend/internal/compile/client.html
index b907cddb..b13b11ee 100644
--- a/backend/internal/compile/client.html
+++ b/backend/internal/compile/client.html
@@ -25,12 +25,44 @@
 			window.addEventListener('error', (event) => {
 				window.parent.postMessage(
 					{
+						source: 'robin-platform',
 						type: 'appError',
 						error: String(event.error?.stack || event.error),
 					},
 					'*',
 				);
 			});
+
+			(() => {
+				let lastLocation = null;
+				let lastTitle = null;
+
+				setInterval(() => {
+					if (lastLocation !== window.location.href) {
+						window.parent.postMessage(
+							{
+								source: 'robin-platform',
+								type: 'locationUpdate',
+								location: window.location.href,
+							},
+							'*',
+						);
+						lastLocation = window.location.href;
+					}
+
+					if (lastTitle !== document.title) {
+						window.parent.postMessage(
+							{
+								source: 'robin-platform',
+								type: 'titleUpdate',
+								title: document.title,
+							},
+							'*',
+						);
+						lastReportedTitle = document.title;
+					}
+				}, 250);
+			})();
 		</script>
 		<script>
 			{{.ScriptSource}}
diff --git a/example/my-ext/page.tsx b/example/my-ext/page.tsx
index 7b502139..051a57e6 100644
--- a/example/my-ext/page.tsx
+++ b/example/my-ext/page.tsx
@@ -2,7 +2,6 @@ import { getAppSettings } from '@robinplatform/toolkit';
 import { renderApp } from '@robinplatform/toolkit/react';
 import { useRpcQuery } from '@robinplatform/toolkit/react/rpc';
 import React from 'react';
-import { getSelfSource } from './page.server';
 import '@robinplatform/toolkit/styles.css';
 import './ext.scss';
 import { z } from 'zod';
@@ -12,29 +11,38 @@ function Page() {
 		getAppSettings,
 		z.object({ filename: z.string().optional() }),
 	);
-	const { data, error: errFetchingFile } = useRpcQuery(
-		getSelfSource,
-		{
-			filename: String(settings?.filename ?? './package.json'),
-		},
-		{
-			enabled: !!settings,
-		},
-	);
 
-	const error = errFetchingSettings || errFetchingFile;
+	const error = errFetchingSettings;
 
 	return (
-		<pre
-			style={{
-				margin: '1rem',
-				padding: '1rem',
-				background: '#e3e3e3',
-				borderRadius: 'var(--robin-border-radius)',
-			}}
-		>
-			<code>{error ? String(error) : data ? String(data) : 'Loading ...'}</code>
-		</pre>
+		<div>
+			<div>
+				LOCATION: {String(window.location.href)}
+				<a href="./blahblah">Link</a>
+				<button
+					onClick={() => window.history.pushState(null, '', './blahblah2')}
+				>
+					History Change
+				</button>
+			</div>
+
+			<pre
+				style={{
+					margin: '1rem',
+					padding: '1rem',
+					background: '#e3e3e3',
+					borderRadius: 'var(--robin-border-radius)',
+				}}
+			>
+				<code>
+					{error
+						? JSON.stringify(error)
+						: settings
+						? JSON.stringify(settings, undefined, 2)
+						: 'Loading ...'}
+				</code>
+			</pre>
+		</div>
 	);
 }
 
diff --git a/example/robin.json b/example/robin.json
index fb70095d..fcf7699b 100644
--- a/example/robin.json
+++ b/example/robin.json
@@ -1,8 +1,9 @@
 {
+	"name": "example",
 	"apps": [
 		"./my-ext/robin.app.json",
 		"./bad-js-ext/robin.app.json",
 		"./failing-ext/robin.app.json",
 		"https://esm.sh/@robinplatform/app-example@0.0.11"
 	]
-}
\ No newline at end of file
+}
diff --git a/frontend/components/AppToolbar.module.scss b/frontend/components/AppToolbar.module.scss
index 7e02dc13..dfaa6f97 100644
--- a/frontend/components/AppToolbar.module.scss
+++ b/frontend/components/AppToolbar.module.scss
@@ -2,10 +2,7 @@
 
 .toolbar {
 	padding: 0.5rem;
-	margin: 1.25rem;
-	margin-bottom: 0;
 
-	border-radius: 0.25rem;
 	background: $dark-blue;
 
 	display: flex;
diff --git a/frontend/components/AppWindow.tsx b/frontend/components/AppWindow.tsx
index 0a593c26..61af39f0 100644
--- a/frontend/components/AppWindow.tsx
+++ b/frontend/components/AppWindow.tsx
@@ -15,6 +15,8 @@ import styles from './AppToolbar.module.scss';
 type AppWindowProps = {
 	id: string;
 	setTitle: React.Dispatch<React.SetStateAction<string>>;
+	route: string;
+	setRoute: (route: string) => void;
 };
 
 const RestartAppButton: React.FC = () => {
@@ -54,50 +56,99 @@ const RestartAppButton: React.FC = () => {
 	);
 };
 
-function AppWindowContent({ id, setTitle }: AppWindowProps) {
-	const router = useRouter();
-
+// NOTE: Changes to the route here will create an additional history entry.
+function AppWindowContent({ id, setTitle, route, setRoute }: AppWindowProps) {
 	const iframeRef = React.useRef<HTMLIFrameElement | null>(null);
 	const [error, setError] = React.useState<string | null>(null);
-	const subRoute = React.useMemo(
-		() =>
-			router.isReady
-				? router.asPath.substring('/app/'.length + id.length)
-				: null,
-		[router.isReady, router.asPath, id],
-	);
+	const mostCurrentRouteRef = React.useRef<string>(route);
+	const mostCurrentLocationUpdateRef = React.useRef<string | null>(null);
+
+	React.useEffect(() => {
+		mostCurrentRouteRef.current = route;
+	}, [route]);
+
+	React.useEffect(() => {
+		if (!iframeRef.current) {
+			return;
+		}
+
+		const target = `http://localhost:9010/api/app-resources/${id}/base${route}`;
+		if (target === mostCurrentLocationUpdateRef.current) {
+			return;
+		}
+
+		if (iframeRef.current.src !== target) {
+			console.log('switching to', target, 'from', iframeRef.current.src);
+			iframeRef.current.src = target;
+		}
+	}, [id, route]);
 
 	React.useEffect(() => {
 		const onMessage = (message: MessageEvent) => {
 			try {
+				if (message.data.source !== 'robin-platform') {
+					// e.g. react-dev-tools uses iframe messages, so we shouldn't
+					// handle them.
+					return;
+				}
+
 				switch (message.data.type) {
 					case 'locationUpdate': {
-						const location = {
-							pathname: window.location.pathname,
-							search: new URL(message.data.location).search,
-						};
-						router.push(location, undefined, { shallow: true });
+						const location = message.data.location;
+						if (!location || typeof location !== 'string') {
+							break;
+						}
+
+						console.log('received location update', location);
+
+						const url = new URL(location);
+						const newRoute = url.pathname.substring(
+							`/api/app-resources/${id}/base`.length,
+						);
+
+						const currentRoute = mostCurrentRouteRef.current;
+						if (newRoute !== currentRoute) {
+							setRoute(newRoute);
+							mostCurrentLocationUpdateRef.current = url.href;
+						}
 						break;
 					}
 
 					case 'titleUpdate':
-						setTitle((title) => message.data.title || title);
+						if (message.data.title) {
+							setTitle(message.data.title);
+						}
 						break;
 
 					case 'appError':
 						setError(message.data.error);
 						break;
+
+					default:
+						// toast.error(`Unknown app message type: ${message.data.type}`, {
+						// 	id: 'unknown-message-type',
+						// });
+						console.warn(
+							`Unknown app message type on message: ${JSON.stringify(
+								message.data,
+							)}`,
+						);
 				}
-			} catch {}
+			} catch (e: any) {
+				toast.error(
+					`Error when receiving app message: ${String(e)}\ndata:\n${
+						message.data
+					}`,
+					{ id: 'unknown-message-type' },
+				);
+			}
 		};
 
 		window.addEventListener('message', onMessage);
 		return () => window.removeEventListener('message', onMessage);
-	}, [router, setTitle]);
+	}, [id, setTitle, setRoute]);
 
 	React.useEffect(() => {
-		setTitle(id);
-
 		if (!iframeRef.current) return;
 		const iframe = iframeRef.current;
 
@@ -150,7 +201,6 @@ function AppWindowContent({ id, setTitle }: AppWindowProps) {
 
 					<iframe
 						ref={iframeRef}
-						src={`http://localhost:9010/api/app-resources/${id}/base${subRoute}`}
 						style={{ border: '0', flexGrow: 1, width: '100%', height: '100%' }}
 					/>
 				</>
@@ -162,5 +212,11 @@ function AppWindowContent({ id, setTitle }: AppWindowProps) {
 export function AppWindow(props: AppWindowProps) {
 	const numRestarts = useIsMutating({ mutationKey: ['RestartApp'] });
 
-	return <AppWindowContent key={String(props.id) + numRestarts} {...props} />;
+	return (
+		<AppWindowContent
+			key={String(props.id) + numRestarts}
+			{...props}
+			route={!!props.route ? props.route : '/'}
+		/>
+	);
 }
diff --git a/frontend/pages/app-settings/[id]/settings.tsx b/frontend/pages/app-settings/[id]/settings.tsx
new file mode 100644
index 00000000..65f53a11
--- /dev/null
+++ b/frontend/pages/app-settings/[id]/settings.tsx
@@ -0,0 +1,114 @@
+import { useRouter } from 'next/router';
+import { AppToolbar } from '../../../components/AppToolbar';
+import { Settings } from '../../../components/Settings';
+import { z } from 'zod';
+import { useRpcMutation, useRpcQuery } from '../../../hooks/useRpcQuery';
+import { Button } from '../../../components/Button';
+import { ArrowLeftIcon } from '@primer/octicons-react';
+import { toast } from 'react-hot-toast';
+import { Alert } from '../../../components/Alert';
+import { Spinner } from '../../../components/Spinner';
+import { useQueryClient } from '@tanstack/react-query';
+import Head from 'next/head';
+
+export default function AppSettings() {
+	const router = useRouter();
+	const id = typeof router.query.id === 'string' ? router.query.id : null;
+
+	const {
+		data: appSettings,
+		error: errLoadingAppSettings,
+		isLoading,
+	} = useRpcQuery({
+		method: 'GetAppSettingsById',
+		pathPrefix: '/api/apps/rpc',
+		data: { appId: id },
+		result: z.record(z.string(), z.unknown()),
+	});
+
+	const queryClient = useQueryClient();
+	const { mutate: updateAppSettings } = useRpcMutation({
+		method: 'UpdateAppSettings',
+		pathPrefix: '/api/apps/rpc',
+		result: z.record(z.string(), z.unknown()),
+
+		onSuccess: () => {
+			toast.success('Updated app settings');
+			router.push(`/app/${id}`);
+			queryClient.invalidateQueries(['GetAppSettingsById']);
+		},
+		onError: (err) => {
+			toast.error(`Failed to update app settings: ${String(err)}`);
+		},
+	});
+
+	if (!id) {
+		return null;
+	}
+	return (
+		<>
+			<Head>
+				<title>{id} Settings</title>
+			</Head>
+
+			<div className="full">
+				<AppToolbar
+					appId={id}
+					actions={
+						<>
+							<Button
+								size="sm"
+								variant="primary"
+								onClick={() => router.push(`/app/${id}`)}
+							>
+								<span style={{ marginRight: '.5rem' }}>
+									<ArrowLeftIcon />
+								</span>
+								Back
+							</Button>
+						</>
+					}
+				/>
+
+				<div className={'full robin-pad'}>
+					<>
+						{isLoading && (
+							<div
+								className="full"
+								style={{
+									display: 'flex',
+									alignItems: 'center',
+									justifyContent: 'center',
+								}}
+							>
+								<p style={{ display: 'flex', alignItems: 'center' }}>
+									<Spinner />
+									<span style={{ marginLeft: '.5rem' }}>Loading...</span>
+								</p>
+							</div>
+						)}
+						{errLoadingAppSettings && (
+							<Alert variant="error" title={'Failed to load app settings'}>
+								{String(errLoadingAppSettings)}
+							</Alert>
+						)}
+						{appSettings && (
+							<Settings
+								schema={z.unknown()}
+								isLoading={false}
+								error={undefined}
+								value={appSettings}
+								onChange={(value) =>
+									updateAppSettings({
+										appId: id,
+										settings: value,
+									})
+								}
+							/>
+						)}
+					</>
+				</div>
+			</div>
+		</>
+	);
+}
diff --git a/frontend/pages/app/[id]/[[...appRoute]].tsx b/frontend/pages/app/[id]/[[...appRoute]].tsx
deleted file mode 100644
index 6b92cee1..00000000
--- a/frontend/pages/app/[id]/[[...appRoute]].tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import Head from 'next/head';
-import { useRouter } from 'next/router';
-import React from 'react';
-import { AppWindow } from '../../../components/AppWindow';
-
-export default function Page() {
-	const router = useRouter();
-
-	const id = typeof router.query.id === 'string' ? router.query.id : null;
-	const [title, setTitle] = React.useState<string>(id ?? 'Loading');
-
-	return (
-		<div className={'full col'}>
-			<Head>
-				<title>{title || 'Error'} | Robin</title>
-			</Head>
-
-			{id && <AppWindow id={String(id)} setTitle={setTitle} />}
-		</div>
-	);
-}
diff --git a/frontend/pages/app/[id]/[[...route]].tsx b/frontend/pages/app/[id]/[[...route]].tsx
new file mode 100644
index 00000000..c2e8f18f
--- /dev/null
+++ b/frontend/pages/app/[id]/[[...route]].tsx
@@ -0,0 +1,63 @@
+import Head from 'next/head';
+import Router, { useRouter } from 'next/router';
+import React from 'react';
+import { AppWindow } from '../../../components/AppWindow';
+
+export default function Page() {
+	const router = useRouter();
+
+	const id = typeof router.query.id === 'string' ? router.query.id : null;
+
+	const [title, setTitle] = React.useState<string>(id ?? 'Loading');
+	const [route, setRoute] = React.useState<string>('');
+
+	React.useEffect(() => {
+		if (!Router.isReady || id === null) {
+			return;
+		}
+
+		const route = Router.asPath.substring('/app/'.length + (id ?? '').length);
+		setRoute(route === '' ? '/' : route);
+	}, [id, router.isReady]);
+
+	React.useEffect(() => {
+		if (id === null || route === '') {
+			return;
+		}
+
+		if (Router.asPath.substring('/app/'.length + (id ?? '').length) === route) {
+			return;
+		}
+
+		// TODO: Weird behavior with history on refresh, because the iframe history gets replaced
+		// with the new route, but the iframe history seems to get deleted upon refresh.
+		Router.replace('/app/' + id + route, undefined, { shallow: true });
+	}, [id, route]);
+
+	return (
+		<div className={'full col'}>
+			<Head>
+				<title>{`${title || 'Error'} | Robin`}</title>
+			</Head>
+
+			<div>{router.asPath}</div>
+			<input
+				type="text"
+				value={route}
+				onChange={(evt) => {
+					console.log('changing route', evt.target.value);
+					setRoute(evt.target.value);
+				}}
+			/>
+
+			{id && !!route && (
+				<AppWindow
+					id={String(id)}
+					setTitle={setTitle}
+					route={route}
+					setRoute={setRoute}
+				/>
+			)}
+		</div>
+	);
+}