diff --git a/src/elements/common/navbar.scss b/src/elements/common/navbar.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/elements/common/navbar.ts b/src/elements/common/rvt-nav.ts
similarity index 97%
rename from src/elements/common/navbar.ts
rename to src/elements/common/rvt-nav.ts
index d49aded5..e3d60ec6 100644
--- a/src/elements/common/navbar.ts
+++ b/src/elements/common/rvt-nav.ts
@@ -2,13 +2,11 @@ import { html, LitElement, PropertyValues, TemplateResult } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { cssify } from '../../utils/css';
 import global from '../../utils/global';
-import cloud from '@rivet-gg/cloud';
-import styles from './navbar.scss';
+import cloud, { GameFull } from '@rivet-gg/cloud';
 import routes from '../../routes';
 import * as api from '../../utils/api';
 import { when } from 'lit/directives/when.js';
 import logging from '../../utils/logging';
-import { GameFull } from '@rivet-gg/cloud';
 import assets from '../../data/assets';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { CloudGameCache, GroupProfileCache } from '../../data/cache';
@@ -31,13 +29,13 @@ interface CrumbDisplay {
 	component?: TemplateResult;
 }
 
-@customElement('nav-bar')
-export default class NavBar extends LitElement {
+@customElement('rvt-nav')
+export default class RvtNav extends LitElement {
 	// Required since Tailwind styles get applied within 'cssify'
-	static styles = cssify(styles);
+	static styles = cssify();
 
 	@property({ type: String })
-	routeTitle: string = '';
+	routeTitle = '';
 
 	@property({ type: Object })
 	breadcrumbs: Breadcrumb = undefined;
@@ -364,7 +362,7 @@ export default class NavBar extends LitElement {
 	render() {
 		return html`
 			<nav
-				class="gap-10 px-6 lg:z-30 pointer-events-auto fixed inset-x-0 top-0 z-50 flex flex-col transition md:divide-white/15 backdrop-blur  bg-zinc-900/[.8]"
+				class="gap-10 px-6 lg:z-30 pointer-events-auto fixed inset-x-0 top-0 flex flex-col transition md:divide-white/15 backdrop-blur  bg-zinc-900/[.8]"
 			>
 				<div class="h-14 flex items-center justify-between ">
 					<div class="absolute inset-x-0 top-full h-px transition bg-[#29292c]"></div>
diff --git a/src/elements/context-menu/context-menu.ts b/src/elements/context-menu/context-menu.ts
index d417776a..7719e57f 100644
--- a/src/elements/context-menu/context-menu.ts
+++ b/src/elements/context-menu/context-menu.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, PropertyValues } from 'lit';
+import { html, LitElement, PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { when } from 'lit/directives/when.js';
@@ -11,7 +11,7 @@ import global from '../../utils/global';
 import logging from '../../utils/logging';
 import routes from '../../routes';
 import { globalEventGroups } from '../../utils/global-events';
-import UIRoot from '../root/ui-root';
+import RvtRoot from '../root/rvt-root';
 import utils from '../../utils/utils';
 
 export interface Context {
@@ -54,7 +54,7 @@ export default class ContextMenu extends LitElement {
 	@property({ type: Object })
 	identitySummary: api.identity.IdentitySummary = null;
 
-	isFetching: boolean = false;
+	isFetching = false;
 
 	@property({ type: Boolean, attribute: 'wide' })
 	wide = false;
@@ -176,7 +176,7 @@ export default class ContextMenu extends LitElement {
 	}
 
 	onActionClick() {
-		UIRoot.shared.hideContextMenu();
+		RvtRoot.shared.hideContextMenu();
 	}
 
 	render() {
diff --git a/src/elements/dev/drop-down-list.ts b/src/elements/dev/drop-down-list.ts
index 4499bfeb..cfe69da3 100644
--- a/src/elements/dev/drop-down-list.ts
+++ b/src/elements/dev/drop-down-list.ts
@@ -1,13 +1,12 @@
 import {
-	LitElement,
-	html,
 	customElement,
+	html,
+	LitElement,
 	property,
-	query,
-	css,
 	PropertyValues,
-	TemplateResult,
-	queryAll
+	query,
+	queryAll,
+	TemplateResult
 } from 'lit-element';
 import { cssify } from '../../utils/css';
 import styles from './drop-down-list.scss';
@@ -16,7 +15,7 @@ import { classMap } from 'lit-html/directives/class-map.js';
 import { when } from 'lit-html/directives/when.js';
 import { repeat } from 'lit-html/directives/repeat.js';
 import { Orientation } from '../common/overlay-positioning';
-import UIRoot from '../root/ui-root';
+import RvtRoot from '../root/rvt-root';
 
 // TODO: Implement arrow key movement and enter key to complete
 
@@ -86,13 +85,13 @@ export default class DropDownList<T> extends LitElement {
 
 	recentClick: number = performance.now();
 	@property({ type: Number })
-	filterSelection: number = 0;
+	filterSelection = 0;
 	@property({ type: String })
-	filterString: string = '';
+	filterString = '';
 
 	// === GET HEIGHT OF SELECTION ===
 	@property({ type: Number })
-	maxHeight: number = 0;
+	maxHeight = 0;
 
 	updated(changedProperties: PropertyValues) {
 		super.updated(changedProperties);
@@ -115,7 +114,7 @@ export default class DropDownList<T> extends LitElement {
 		} else {
 			let style = window.getComputedStyle(this.shadowRoot.host as HTMLElement);
 
-			UIRoot.shared.openDropDownList({
+			RvtRoot.shared.openDropDownList({
 				contextElement: this,
 				active: true,
 				fixed: this.isFixed,
diff --git a/src/elements/mod.ts b/src/elements/mod.ts
index 14af7afd..bff10f6f 100644
--- a/src/elements/mod.ts
+++ b/src/elements/mod.ts
@@ -1,6 +1,5 @@
 import './common/copy-area';
 import './common/date-display';
-import './common/date-display';
 import './common/embedded-svg';
 import './common/file-upload-list';
 import './common/file-uploader';
@@ -10,7 +9,7 @@ import './common/loading-placeholder';
 import './common/loading-placeholder-text';
 import './common/loading-wheel';
 import './common/namespace-dropdown';
-import './common/navbar';
+import './common/rvt-nav';
 import './common/overlay-positioning';
 import './common/stylized-button';
 import './common/toggle-switch';
@@ -60,6 +59,6 @@ import './overlay/register-panel';
 import './pages/module';
 import './profile/graph-view';
 import './profile/user-banner';
-import './root/ui-root';
-import './root/ui-router';
+import './root/rvt-root';
+import './root/rvt-router';
 import './tiles/group-handle-tile';
diff --git a/src/elements/overlay/alert-panel.ts b/src/elements/overlay/alert-panel.ts
index e1127f00..192640ab 100644
--- a/src/elements/overlay/alert-panel.ts
+++ b/src/elements/overlay/alert-panel.ts
@@ -1,8 +1,8 @@
-import { LitElement, html } from 'lit';
+import { html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { cssify } from '../../utils/css';
 import styles from './alert-panel.scss';
-import { AlertPanelData } from '../root/ui-root';
+import { AlertPanelData } from '../root/rvt-root';
 
 export class SelectOptionEvent extends Event {
 	constructor(public index: number) {
diff --git a/src/elements/overlay/identity-notification.ts b/src/elements/overlay/identity-notification.ts
index 608b0498..7050d460 100644
--- a/src/elements/overlay/identity-notification.ts
+++ b/src/elements/overlay/identity-notification.ts
@@ -1,4 +1,4 @@
-import { LitElement, html } from 'lit';
+import { html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { cssify } from '../../utils/css';
 import styles from './identity-notification.scss';
@@ -6,8 +6,7 @@ import { classMap } from 'lit/directives/class-map.js';
 
 import { styleMap } from 'lit/directives/style-map.js';
 import utils, { SwipeDirection } from '../../utils/utils';
-import { MIN_SWIPE_THRESHOLD } from '../root/ui-root';
-import * as api from '../../utils/api';
+import { MIN_SWIPE_THRESHOLD } from '../root/rvt-root';
 
 type TriggerResult = Promise<any> | void;
 
diff --git a/src/elements/overlay/register-panel.ts b/src/elements/overlay/register-panel.ts
index d471788a..fb524521 100644
--- a/src/elements/overlay/register-panel.ts
+++ b/src/elements/overlay/register-panel.ts
@@ -1,4 +1,5 @@
-import { LitElement, html } from 'lit';
+/* eslint-disable no-mixed-spaces-and-tabs */
+import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { cssify } from '../../utils/css';
 import styles from './register-panel.scss';
@@ -6,12 +7,11 @@ import global from '../../utils/global';
 import { classMap } from 'lit/directives/class-map.js';
 import { responses } from '../../routes';
 import logging from '../../utils/logging';
-import { default as timing, wait } from '../../utils/timing';
 import TextInput from '../dev/text-input';
 import { clearCache } from '../../utils/cache';
 import * as api from '../../utils/api';
 import * as broadcast from '../../data/broadcast';
-import UIRoot from '../root/ui-root';
+import RvtRoot from '../root/rvt-root';
 import { globalEventGroups, IdentityChangeEvent } from '../../utils/global-events';
 
 export const VALIDATE_EMAIL =
@@ -31,25 +31,25 @@ export default class RegisterPanel extends LitElement {
 	verificationId: string = null;
 
 	@property({ type: String })
-	emailError: string = '';
+	emailError = '';
 
 	@property({ type: String })
 	codeError = '';
 
 	@property({ type: String })
-	loadingMessage: string = '';
+	loadingMessage = '';
 
 	@property({ type: Boolean })
 	isCompleting = false;
 
 	@property({ type: Boolean })
-	codeAreaActive: boolean = false;
+	codeAreaActive = false;
 
 	@property({ type: Boolean })
 	wait = false;
 
 	@property({ type: Boolean, attribute: 'light' })
-	light: boolean = false;
+	light = false;
 
 	@property({ type: String, attribute: 'title' })
 	title: string;
@@ -58,7 +58,7 @@ export default class RegisterPanel extends LitElement {
 	description: string;
 
 	@property({ type: Boolean, attribute: 'no-back' })
-	noBackButton: boolean = false;
+	noBackButton = false;
 
 	// Used for customizing the email
 	@property({ type: String })
@@ -101,7 +101,7 @@ export default class RegisterPanel extends LitElement {
 	emailKeyPress(event: KeyboardEvent) {
 		// Enter is pressed
 		if (this.emailError == null && event.key == 'Enter') {
-			this.startEmailVerificatoin();
+			this.startEmailVerification();
 			this.emailInput.blur();
 		}
 	}
@@ -121,13 +121,12 @@ export default class RegisterPanel extends LitElement {
 		if (this.codeError == null && event.key == 'Enter') this.completeEmailVerification();
 	}
 
-	async startEmailVerificatoin() {
+	async startEmailVerification() {
 		// Wait for captcha
 		let captchaToken = null;
 		if (global.bootstrapData.captcha.turnstile) {
-			captchaToken = await UIRoot.shared.promptCaptcha();
+			captchaToken = await RvtRoot.shared.promptCaptcha();
 		}
-
 		this.wait = true;
 		this.codeError = null;
 
@@ -314,7 +313,7 @@ export default class RegisterPanel extends LitElement {
 								  >`}
 							<stylized-button
 								?disabled=${this.emailError != null}
-								.trigger=${this.startEmailVerificatoin.bind(this)}
+								.trigger=${this.startEmailVerification.bind(this)}
 								>Continue</stylized-button
 							>
 						</div>
diff --git a/src/elements/pages/dev-dash.ts b/src/elements/pages/dev-dash.ts
deleted file mode 100644
index 1bfb637a..00000000
--- a/src/elements/pages/dev-dash.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { LitElement, html } from 'lit';
-import { customElement, property } from 'lit/decorators.js';
-import { cssify } from '../../utils/css';
-import styles from './dev-dash.scss';
-import global from '../../utils/global';
-import { when } from 'lit/directives/when.js';
-import { IdentityChangeEvent, globalEventGroups } from '../../utils/global-events';
-import { isDeveloper } from '../../utils/identity';
-import routes from '../../routes';
-import UIRouter from '../root/ui-router';
-import UIRoot from '../root/ui-root';
-import clsx from 'clsx';
-@customElement('dev-dash')
-export default class DeveloperDash extends LitElement {
-	static styles = cssify(styles);
-
-	@property({ type: Object })
-	loadError?: any;
-
-	/// === EVENTS ===
-	handleIdentityChange: (e: IdentityChangeEvent) => void;
-
-	connectedCallback() {
-		super.connectedCallback();
-
-		this.handleIdentityChange = this.onIdentityChange.bind(this);
-		globalEventGroups.add('identity-change', this.handleIdentityChange);
-	}
-
-	disconnectedCallback() {
-		super.disconnectedCallback();
-
-		globalEventGroups.remove('identity-change', this.handleIdentityChange);
-	}
-
-	onIdentityChange() {
-		if (isDeveloper(global.currentIdentity)) {
-			UIRouter.shared.navigate(routes.home.build({}), {
-				replaceHistory: true,
-				forceSamePage: true
-			});
-		} else {
-			this.requestUpdate();
-		}
-	}
-
-	render() {
-		return html`
-			${when(
-				global.currentIdentity.isAdmin ||
-					global.currentIdentity.groups.find(group => group.group.isDeveloper),
-				() => html`
-					<div class="w-full">
-						<user-banner></user-banner>
-						<div class="sm:px-5 min-[1024px]:px-5 lg:px-0 max-w-contentwidth m-auto">
-							<page-dev-games></page-dev-games>
-						</div>
-					</div>
-				`,
-				() => html`
-					<div
-						class=${clsx(
-							global.currentIdentity.isRegistered
-								? 'absolute text-center top-1/2 left-1/2 -translate-x-1/2 translate-y-1/2 pt-36'
-								: '',
-							!global.currentIdentity.isRegistered
-								? 'absolute text-center top-1/2 left-1/2 -translate-x-1/2 translate-y-1/2 pt-20'
-								: ''
-						)}
-					>
-						<h1 class="text-3xl pb-2">Private Beta</h1>
-						<h4 class="text-lg pb-4">
-							Rivet is still in private beta. Join the waitlist to get early access.
-						</h4>
-						<div class="w-full flex flex-row place-content-center m-auto pb-5">
-							<stylized-button href="https://b8v8449klvp.typeform.com/rivet" target="_blank">
-								Beta Access Form
-							</stylized-button>
-						</div>
-						${when(
-							!global.currentIdentity.isRegistered,
-							() => html`
-								<div class="w-3/4 border-b-white/10 border-b-[1px] h-px mx-auto"></div>
-								<h4 class="text-md pt-5 pb-3">Have access and just got logged out?</h4>
-								<div class="w-full flex flex-row place-content-center m-auto pb-5">
-									<stylized-button .trigger=${() => UIRoot.shared.openRegisterPanel()}>
-										Login
-									</stylized-button>
-								</div>
-							`
-						)}
-					</div>
-				`
-			)}
-		`;
-	}
-}
diff --git a/src/elements/pages/dev-only.ts b/src/elements/pages/dev-only.ts
index a5c7ae1e..050a9957 100644
--- a/src/elements/pages/dev-only.ts
+++ b/src/elements/pages/dev-only.ts
@@ -1,14 +1,17 @@
-import { LitElement, html } from 'lit';
+import { html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { cssify } from '../../utils/css';
 import styles from './dev-only.scss';
 
 import global from '../../utils/global';
 import routes, { responses } from '../../routes';
-import UIRouter from '../root/ui-router';
+import RvtRouter from '../root/rvt-router';
 import { globalEventGroups, IdentityChangeEvent } from '../../utils/global-events';
 import { isDeveloper } from '../../utils/identity';
 
+/**
+ * @deprecated
+ */
 @customElement('page-dev-only')
 export default class PageDevOnly extends LitElement {
 	static styles = cssify(styles);
@@ -34,7 +37,7 @@ export default class PageDevOnly extends LitElement {
 
 	onIdentityChange() {
 		if (isDeveloper(global.currentIdentity)) {
-			UIRouter.shared.navigate(routes.home.build({}), {
+			RvtRouter.shared.navigate(routes.home.build({}), {
 				replaceHistory: true,
 				forceSamePage: true
 			});
diff --git a/src/elements/pages/dev/game/games.ts b/src/elements/pages/dev/game/games.ts
index 8e674820..97b83278 100644
--- a/src/elements/pages/dev/game/games.ts
+++ b/src/elements/pages/dev/game/games.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, PropertyValues } from 'lit';
+import { html, LitElement, PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { styleMap } from 'lit/directives/style-map.js';
@@ -14,12 +14,7 @@ import { showAlert } from '../../../../ui/helpers';
 import { DropDownSelectEvent, DropDownSelection } from '../../../dev/drop-down-list';
 import { TraversableErrors, VALIDATION_ERRORS } from '../../../../utils/traversable-errors';
 import timing, { Debounce } from '../../../../utils/timing';
-import UIRouter from '../../../root/ui-router';
-
-const tailwindConfig = require('../../../../../tailwind.config.js');
-const tailwind_palette = tailwindConfig.theme.extend.colors;
-
-import config from '../../../../config';
+import RvtRouter from '../../../root/rvt-router';
 import { InputUpdateEvent } from '../../../dev/text-input';
 import assets from '../../../../data/assets';
 import { CloudDashboardCache } from '../../../../data/cache';
@@ -27,6 +22,9 @@ import logging from '../../../../utils/logging';
 import { GroupCreateEvent } from '../../../modals/create-group';
 import { globalEventGroups } from '../../../../utils/global-events';
 
+const tailwindConfig = require('../../../../../tailwind.config.js');
+const tailwind_palette = tailwindConfig.theme.extend.colors;
+
 @customElement('page-dev-games')
 export default class DevGames extends LitElement {
 	static styles = cssify(styles);
@@ -116,7 +114,7 @@ export default class DevGames extends LitElement {
 		if (this.gamesStream) this.gamesStream.cancel();
 	}
 
-	async fetchData(forceRestart: boolean = false) {
+	async fetchData(forceRestart = false) {
 		if (this.gamesStream) this.gamesStream.cancel();
 
 		// Fetch events
@@ -193,7 +191,7 @@ export default class DevGames extends LitElement {
 			this.gameModalClose();
 
 			// Open new game page
-			UIRouter.shared.navigate(routes.devGame.build({ gameId: res.gameId }));
+			RvtRouter.shared.navigate(routes.devGame.build({ gameId: res.gameId }));
 		} catch (err) {
 			this.loadError = err;
 			this.isCreatingGame = false;
diff --git a/src/elements/pages/dev/game/pages/game-lobbies.ts b/src/elements/pages/dev/game/pages/game-lobbies.ts
index b6ebfb61..8d56cf19 100644
--- a/src/elements/pages/dev/game/pages/game-lobbies.ts
+++ b/src/elements/pages/dev/game/pages/game-lobbies.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, PropertyValues } from 'lit';
+import { html, LitElement, PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import styles from './game-lobbies.scss';
@@ -12,8 +12,7 @@ import utils from '../../../../../utils/utils';
 import { DropDownSelectEvent, DropDownSelection } from '../../../../dev/drop-down-list';
 import { showLobbyContextMenu, tooltip } from '../../../../../ui/helpers';
 import timing from '../../../../../utils/timing';
-import UIRoot from '../../../../root/ui-root';
-import UIRouter from '../../../../root/ui-router';
+import RvtRouter from '../../../../root/rvt-router';
 
 @customElement('page-dev-game-lobbies')
 export default class DevGameLobbies extends LitElement {
@@ -200,7 +199,7 @@ export default class DevGameLobbies extends LitElement {
 	}
 
 	onClickLobby(lobbyId: string) {
-		UIRouter.shared.navigate(
+		RvtRouter.shared.navigate(
 			routes.devLogLobby.build(
 				{ gameId: this.game.gameId, lobbyId, namespaceId: this.namespaceId },
 				{ namespaceId: this.namespaceId }
diff --git a/src/elements/pages/dev/game/pages/game-logs.ts b/src/elements/pages/dev/game/pages/game-logs.ts
index afd53629..42091400 100644
--- a/src/elements/pages/dev/game/pages/game-logs.ts
+++ b/src/elements/pages/dev/game/pages/game-logs.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, PropertyValues } from 'lit';
+import { html, LitElement, PropertyValues } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { when } from 'lit/directives/when.js';
@@ -15,7 +15,7 @@ import * as api from '../../../../../utils/api';
 import * as d3 from 'd3';
 import numbro from 'numbro';
 import { ChartConfig } from '../../../../profile/graph-view';
-import UIRouter from '../../../../root/ui-router';
+import RvtRouter from '../../../../root/rvt-router';
 import logging from '../../../../../utils/logging';
 import { globalEventGroups } from '../../../../../utils/global-events';
 
@@ -81,13 +81,13 @@ export default class DevGameLogs extends LitElement {
 	logStreamType: cloud.LogStream = cloud.LogStream.STD_OUT;
 
 	@property({ type: Boolean })
-	isLogEmpty: boolean = true;
+	isLogEmpty = true;
 
 	@property({ type: Boolean })
-	isFollowingLogs: boolean = true;
+	isFollowingLogs = true;
 
 	@property({ type: Boolean })
-	isExportingLogs: boolean = false;
+	isExportingLogs = false;
 
 	@property({ type: String })
 	downloadLogsUrl?: string;
@@ -102,7 +102,7 @@ export default class DevGameLogs extends LitElement {
 
 	logStream?: api.RepeatingRequest<cloud.GetLobbyLogsOutput>;
 
-	hasInitiated: boolean = false;
+	hasInitiated = false;
 
 	updated(changedProperties: PropertyValues) {
 		super.updated(changedProperties);
@@ -197,14 +197,14 @@ export default class DevGameLogs extends LitElement {
 	/// is up to date.
 	changeLobbySelection(lobbyId?: string) {
 		if (lobbyId) {
-			UIRouter.shared.navigate(
+			RvtRouter.shared.navigate(
 				routes.devLogLobby.build(
 					{ gameId: this.game.gameId, lobbyId: lobbyId, namespaceId: this.namespaceId },
 					{ namespaceId: this.namespaceId }
 				)
 			);
 		} else {
-			UIRouter.shared.navigate(
+			RvtRouter.shared.navigate(
 				routes.devLogs.build(
 					{ gameId: this.game.gameId, namespaceId: this.namespaceId },
 					{ namespaceId: this.namespaceId }
@@ -710,7 +710,7 @@ export default class DevGameLogs extends LitElement {
 
 export function formatLobbyStatus(status: cloud.LogsLobbyStatus, startTs: Date) {
 	return status.running !== undefined
-		? !!startTs
+		? startTs
 			? 'Running'
 			: 'Not Started'
 		: status.stopped
diff --git a/src/elements/pages/dev/game/pages/game-overview.ts b/src/elements/pages/dev/game/pages/game-overview.ts
index bf95c5d9..2ffa14d8 100644
--- a/src/elements/pages/dev/game/pages/game-overview.ts
+++ b/src/elements/pages/dev/game/pages/game-overview.ts
@@ -1,15 +1,15 @@
-import { LitElement, PropertyValues, TemplateResult, html } from 'lit';
+import { html, LitElement, PropertyValues, TemplateResult } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import styles from './game-overview.scss';
 import { cssify } from '../../../../../utils/css';
-import cloud, { GameFull, NamespaceSummary } from '@rivet-gg/cloud';
+import cloud from '@rivet-gg/cloud';
 import * as api from '../../../../../utils/api';
 import logging from '../../../../../utils/logging';
 import { CloudGameCache } from '../../../../../data/cache';
 import { when } from 'lit/directives/when.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { showAlert } from '../../../../../ui/helpers';
-import UIRouter from '../../../../root/ui-router';
+import RvtRouter from '../../../../root/rvt-router';
 import routes from '../../../../../routes';
 import utils from '../../../../../utils/utils';
 import global from '../../../../../utils/global';
@@ -241,7 +241,7 @@ export default class DevGameOverview extends LitElement {
 
 			this.namespaceModalClose();
 
-			UIRouter.shared.navigate(
+			RvtRouter.shared.navigate(
 				routes.devNamespace.build({
 					gameId: this.game.gameId,
 					namespaceId: res.namespaceId
@@ -275,9 +275,7 @@ export default class DevGameOverview extends LitElement {
 						game.namespaces,
 						ns => ns.namespaceId,
 						ns => {
-							const namespaceVersion = this.game.versions.find(
-								v => v.versionId == ns.versionId
-							);
+							let namespaceVersion = this.game.versions.find(v => v.versionId == ns.versionId);
 							return html`
 								<game-namespace-tile
 									.gameId=${this.game.gameId}
diff --git a/src/elements/pages/dev/game/pages/game-version-draft.ts b/src/elements/pages/dev/game/pages/game-version-draft.ts
index 519cb8b6..01ada0e2 100644
--- a/src/elements/pages/dev/game/pages/game-version-draft.ts
+++ b/src/elements/pages/dev/game/pages/game-version-draft.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, PropertyValues } from 'lit';
+import { html, LitElement, PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { classMap } from 'lit/directives/class-map.js';
@@ -8,7 +8,7 @@ import { Rivet } from '@rivet-gg/api-internal';
 import settings from '../../../../../utils/settings';
 import logging from '../../../../../utils/logging';
 import global from '../../../../../utils/global';
-import UIRouter from '../../../../root/ui-router';
+import RvtRouter from '../../../../root/rvt-router';
 import routes from '../../../../../routes';
 import { showAlert } from '../../../../../ui/helpers';
 import { TraversableErrors, VALIDATION_ERRORS } from '../../../../../utils/traversable-errors';
@@ -308,7 +308,7 @@ export default class DevGameNamespace extends LitElement {
 			}
 
 			// Redirect to version page
-			UIRouter.shared.navigate(
+			RvtRouter.shared.navigate(
 				routes.devVersion.build({
 					gameId: this.game.gameId,
 					versionId,
diff --git a/src/elements/pages/dev/game/pages/game-version.ts b/src/elements/pages/dev/game/pages/game-version.ts
index 75332ac3..ecb9ee72 100644
--- a/src/elements/pages/dev/game/pages/game-version.ts
+++ b/src/elements/pages/dev/game/pages/game-version.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, PropertyValues } from 'lit';
+import { html, LitElement, PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { cssify } from '../../../../../utils/css';
@@ -8,7 +8,7 @@ import global from '../../../../../utils/global';
 import { Rivet } from '@rivet-gg/api-internal';
 import { showAlert } from '../../../../../ui/helpers';
 import settings from '../../../../../utils/settings';
-import UIRouter from '../../../../root/ui-router';
+import RvtRouter from '../../../../root/rvt-router';
 import { DropDownSelectEvent } from '../../../../dev/drop-down-list';
 import { globalEventGroups } from '../../../../../utils/global-events';
 import { Orientation } from '../../../../common/overlay-positioning';
@@ -164,7 +164,7 @@ export default class DevGameNamespace extends LitElement {
 		);
 
 		// Switch to draft view
-		UIRouter.shared.navigate(
+		RvtRouter.shared.navigate(
 			routes.devVersion.build({
 				gameId: this.game.gameId,
 				versionId: this.versionId,
diff --git a/src/elements/pages/dev/game/pages/game.ts b/src/elements/pages/dev/game/pages/game.ts
index b55caca1..0b956544 100644
--- a/src/elements/pages/dev/game/pages/game.ts
+++ b/src/elements/pages/dev/game/pages/game.ts
@@ -1,11 +1,11 @@
-import { customElement, property, query } from 'lit/decorators.js';
-import { LitElement, html, PropertyValues, TemplateResult } from 'lit';
+import { customElement, property } from 'lit/decorators.js';
+import { html, LitElement, PropertyValues, TemplateResult } from 'lit';
 import { cssify } from '../../../../../utils/css';
 import styles from './game.scss';
 import { responses } from '../../../../../routes';
 import cloud from '@rivet-gg/cloud';
 import * as api from '../../../../../utils/api';
-import UIRouter from '../../../../root/ui-router';
+import RvtRouter from '../../../../root/rvt-router';
 import { CloudGameCache } from '../../../../../data/cache';
 import logging from '../../../../../utils/logging';
 import { globalEventGroups } from '../../../../../utils/global-events';
@@ -118,13 +118,13 @@ export default class DevGame extends LitElement {
 				.namespaceId=${this.namespaceId}
 			></page-dev-namespace-summary>`;
 
-			UIRouter.shared.updateTitle(this.game.displayName);
+			RvtRouter.shared.updateTitle(this.game.displayName);
 
 			pageId = 'summary';
 		} else if (this.config.billing) {
 			body = html`<page-dev-game-billing .game=${this.game}></page-dev-game-billing>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – Billing`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – Billing`);
 
 			pageId = 'billing';
 		} else if (this.config.namespace) {
@@ -137,14 +137,14 @@ export default class DevGame extends LitElement {
 				n => n.namespaceId == this.config.namespace.namespaceId
 			).displayName;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – ${namespaceName}`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – ${namespaceName}`);
 		} else if (this.config.versionSummary) {
 			body = html`<page-dev-namespace-version
 				.game=${this.game}
 				.namespaceId=${this.namespaceId}
 			></page-dev-namespace-version>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – Versions`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – Versions`);
 		} else if (this.config.version) {
 			body = html`<page-dev-game-version
 				.game=${this.game}
@@ -154,11 +154,11 @@ export default class DevGame extends LitElement {
 			let version = this.game.versions.find(v => v.versionId == this.config.version.versionId);
 			let versionName = version ? version.displayName : 'Unknown version';
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – ${versionName}`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – ${versionName}`);
 		} else if (this.config.versionDraft) {
 			body = html`<page-dev-game-version-draft .game=${this.game}></page-dev-game-version-draft>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – Version Draft`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – Version Draft`);
 
 			pageId = 'draft';
 		} else if (this.config.tokens) {
@@ -167,7 +167,7 @@ export default class DevGame extends LitElement {
 				.namespaceId=${this.namespaceId}
 			></page-dev-game-tokens>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – Tokens`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – Tokens`);
 
 			pageId = 'tokens';
 		} else if (this.config.logs) {
@@ -178,21 +178,21 @@ export default class DevGame extends LitElement {
 			>
 			</page-dev-game-logs>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – Logs`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – Logs`);
 
 			pageId = 'logs';
 		} else if (this.config.lobbies) {
 			body = html`<page-dev-game-lobbies .game=${this.game} .namespaceId=${this.namespaceId}>
 			</page-dev-game-lobbies>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – Lobbies`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – Lobbies`);
 
 			pageId = 'lobbies';
 		} else if (this.config.kv) {
 			body = html`<page-dev-game-kv .game=${this.game} .namespaceId=${this.namespaceId}>
 			</page-dev-game-kv>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – KV`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – KV`);
 			pageId = 'kv';
 		}
 
diff --git a/src/elements/pages/dev/game/settings/game-settings.ts b/src/elements/pages/dev/game/settings/game-settings.ts
index eaa66e37..ee4c7464 100644
--- a/src/elements/pages/dev/game/settings/game-settings.ts
+++ b/src/elements/pages/dev/game/settings/game-settings.ts
@@ -1,10 +1,10 @@
 import { customElement, property } from 'lit/decorators.js';
-import { LitElement, html, PropertyValues, TemplateResult } from 'lit';
+import { html, LitElement, PropertyValues, TemplateResult } from 'lit';
 import { cssify } from '../../../../../utils/css';
 import routes, { responses } from '../../../../../routes';
 import cloud from '@rivet-gg/cloud';
 import * as api from '../../../../../utils/api';
-import UIRouter from '../../../../root/ui-router';
+import RvtRouter from '../../../../root/rvt-router';
 import { CloudGameCache } from '../../../../../data/cache';
 import logging from '../../../../../utils/logging';
 import { globalEventGroups } from '../../../../../utils/global-events';
@@ -109,7 +109,7 @@ export default class DevGameSettings extends LitElement {
 				.flatMap(x => x.items)
 				.find(p => p.hasOwnProperty('id') && p.id == this.tabId);
 
-			if (currentTab) UIRouter.shared.updateTitle(currentTab.title);
+			if (currentTab) RvtRouter.shared.updateTitle(currentTab.title);
 		}
 
 		if (changedProperties.has('config')) {
@@ -142,7 +142,7 @@ export default class DevGameSettings extends LitElement {
 		// Navigate to the correct tab; this will update this view automatically
 		let url = routes.devGameSettings.build({ gameId: this.gameId, tab: tabId });
 
-		UIRouter.shared.navigate(url, {
+		RvtRouter.shared.navigate(url, {
 			replaceHistory: true
 		});
 	}
@@ -157,15 +157,15 @@ export default class DevGameSettings extends LitElement {
 		if (this.config.general) {
 			body = html`<page-dev-game-settings-general .game=${this.game}></page-dev-game-settings-general>`;
 
-			UIRouter.shared.updateTitle('General');
+			RvtRouter.shared.updateTitle('General');
 		} else if (this.config.billing) {
 			body = html`<page-dev-game-settings-billing .game=${this.game}></page-dev-game-settings-billing>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} - Billing`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} - Billing`);
 		} else if (this.config.tokens) {
 			body = html`<page-dev-game-settings-tokens .game=${this.game}></page-dev-game-settings-tokens>`;
 
-			UIRouter.shared.updateTitle(`${this.game.displayName} – Tokens`);
+			RvtRouter.shared.updateTitle(`${this.game.displayName} – Tokens`);
 		}
 
 		return html`
diff --git a/src/elements/pages/dev/group/group-invite.ts b/src/elements/pages/dev/group/group-invite.ts
index b9d456e7..dc7cb471 100644
--- a/src/elements/pages/dev/group/group-invite.ts
+++ b/src/elements/pages/dev/group/group-invite.ts
@@ -1,4 +1,4 @@
-import { LitElement, html } from 'lit';
+import { html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import routes, { responses } from '../../../../routes';
 import { cssify } from '../../../../utils/css';
@@ -8,7 +8,7 @@ import { when } from 'lit/directives/when.js';
 import * as api from '../../../../utils/api';
 
 import global from '../../../../utils/global';
-import UIRouter from '../../../root/ui-router';
+import RvtRouter from '../../../root/rvt-router';
 import timing, { Debounce } from '../../../../utils/timing';
 
 @customElement('page-group-invite')
@@ -68,11 +68,11 @@ export default class GroupInvitePage extends LitElement {
 			this.isConsuming = true;
 			let res = await global.live.group.consumeGroupInvite({ groupInviteCode: this.code });
 
-			UIRouter.shared.navigate(routes.groupOverview.build({ id: res.groupId }));
+			RvtRouter.shared.navigate(routes.groupOverview.build({ id: res.groupId }));
 		} catch (err) {
 			if (err.code.startsWith('GROUP')) {
 				if (err.code == 'GROUP_ALREADY_MEMBER') {
-					UIRouter.shared.navigate(routes.groupOverview.build({ id: err.metadata.group_id }), {
+					RvtRouter.shared.navigate(routes.groupOverview.build({ id: err.metadata.group_id }), {
 						replaceHistory: true
 					});
 				} else this.codeError = err.message;
diff --git a/src/elements/pages/dev/group/group.ts b/src/elements/pages/dev/group/group.ts
index 2d288642..10da0a9c 100644
--- a/src/elements/pages/dev/group/group.ts
+++ b/src/elements/pages/dev/group/group.ts
@@ -1,4 +1,4 @@
-import { customElement, property, query } from 'lit/decorators.js';
+import { customElement, property } from 'lit/decorators.js';
 import { html, LitElement, PropertyValues } from 'lit';
 import { when } from 'lit/directives/when.js';
 import { styleMap } from 'lit/directives/style-map.js';
@@ -8,15 +8,14 @@ import routes, { responses } from '../../../../routes';
 import global from '../../../../utils/global';
 import cloud from '@rivet-gg/cloud';
 import { globalEventGroups } from '../../../../utils/global-events';
-import { showAlert } from '../../../../ui/helpers';
-import UIRouter from '../../../root/ui-router';
+import RvtRouter from '../../../root/rvt-router';
 
 import assets from '../../../../data/assets';
 import * as api from '../../../../utils/api';
 
 import { CloudDashboardCache, GroupProfileCache } from '../../../../data/cache';
 import logging from '../../../../utils/logging';
-import { DropDownSelectEvent, DropDownSelection } from '../../../dev/drop-down-list';
+import { DropDownSelection } from '../../../dev/drop-down-list';
 import timing, { Debounce } from '../../../../utils/timing';
 import utils from '../../../../utils/utils';
 import { InputUpdateEvent } from '../../../dev/text-input';
@@ -197,9 +196,8 @@ export default class GroupPage extends LitElement {
 	}
 
 	async fetchGroup() {
-		let firstFetch = !this.profile;
-
 		if (this.groupStream) this.groupStream.cancel();
+
 		this.groupStream = await GroupProfileCache.watch(this.groupId, res => {
 			let firstFetch = !this.profile;
 
@@ -208,7 +206,7 @@ export default class GroupPage extends LitElement {
 			if (firstFetch) this.fetchColor();
 
 			// Update the title
-			UIRouter.shared.updateTitle(this.profile.displayName);
+			RvtRouter.shared.updateTitle(this.profile.displayName);
 		});
 
 		this.groupStream.onError(err => {
@@ -262,7 +260,7 @@ export default class GroupPage extends LitElement {
 			this.gameModalClose();
 
 			// Open new game page
-			UIRouter.shared.navigate(routes.devGame.build({ gameId: res.gameId }));
+			RvtRouter.shared.navigate(routes.devGame.build({ gameId: res.gameId }));
 		} catch (err) {
 			this.loadError = err;
 			this.isCreatingGame = false;
@@ -399,7 +397,7 @@ export default class GroupPage extends LitElement {
 
 	buildBackButton() {
 		// If back navigation is possible, use function rather than link
-		if (UIRouter.shared.canGoBack) {
+		if (RvtRouter.shared.canGoBack) {
 			return html` <stylized-button
 				icon="solid/play"
 				.trigger=${this.navigateBack.bind(this)}
@@ -416,6 +414,6 @@ export default class GroupPage extends LitElement {
 	}
 
 	navigateBack() {
-		UIRouter.shared.navBack();
+		RvtRouter.shared.navBack();
 	}
 }
diff --git a/src/elements/pages/dev/group/settings/group-settings.ts b/src/elements/pages/dev/group/settings/group-settings.ts
index 61d945b1..3cb77690 100644
--- a/src/elements/pages/dev/group/settings/group-settings.ts
+++ b/src/elements/pages/dev/group/settings/group-settings.ts
@@ -1,10 +1,10 @@
 import { customElement, property } from 'lit/decorators.js';
-import { LitElement, html, PropertyValues, TemplateResult } from 'lit';
+import { html, LitElement, PropertyValues, TemplateResult } from 'lit';
 import { cssify } from '../../../../../utils/css';
 import routes, { responses } from '../../../../../routes';
 import group from '@rivet-gg/group';
 import * as api from '../../../../../utils/api';
-import UIRouter from '../../../../root/ui-router';
+import RvtRouter from '../../../../root/rvt-router';
 import { GroupProfileCache } from '../../../../../data/cache';
 import logging from '../../../../../utils/logging';
 import { globalEventGroups } from '../../../../../utils/global-events';
@@ -109,7 +109,7 @@ export default class GroupSettings extends LitElement {
 				.flatMap(x => x.items)
 				.find(p => p.hasOwnProperty('id') && p.id == this.tabId);
 
-			if (currentTab) UIRouter.shared.updateTitle(currentTab.title);
+			if (currentTab) RvtRouter.shared.updateTitle(currentTab.title);
 		}
 
 		if (changedProperties.has('config')) {
@@ -139,7 +139,7 @@ export default class GroupSettings extends LitElement {
 		// Navigate to the correct tab; this will update this view automatically
 		let url = routes.groupSettings.build({ groupId: this.groupId, tab: tabId });
 
-		UIRouter.shared.navigate(url, {
+		RvtRouter.shared.navigate(url, {
 			replaceHistory: true
 		});
 	}
@@ -158,15 +158,15 @@ export default class GroupSettings extends LitElement {
 		if (this.config.general) {
 			body = html`<page-group-settings-general .group=${this.group}></page-group-settings-general>`;
 
-			UIRouter.shared.updateTitle('General');
+			RvtRouter.shared.updateTitle('General');
 		} else if (this.config.billing) {
 			body = html`<page-group-settings-billing .group=${this.group}></page-group-settings-billing>`;
 
-			UIRouter.shared.updateTitle(`${this.group.displayName} - Billing`);
+			RvtRouter.shared.updateTitle(`${this.group.displayName} - Billing`);
 		} else if (this.config.members) {
 			body = html`<page-group-settings-members .group=${this.group}></page-group-settings-members>`;
 
-			UIRouter.shared.updateTitle(`${this.group.displayName} – Members`);
+			RvtRouter.shared.updateTitle(`${this.group.displayName} – Members`);
 		}
 
 		return html`
diff --git a/src/elements/pages/dev/namespace/namespace-version.ts b/src/elements/pages/dev/namespace/namespace-version.ts
index f77cee12..e2794be8 100644
--- a/src/elements/pages/dev/namespace/namespace-version.ts
+++ b/src/elements/pages/dev/namespace/namespace-version.ts
@@ -1,4 +1,4 @@
-import { LitElement, PropertyValues, TemplateResult, html } from 'lit';
+import { html, LitElement, TemplateResult } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { cssify } from '../../../../utils/css';
 import styles from './namespace-version.scss';
@@ -11,7 +11,7 @@ import utils from '../../../../utils/utils';
 import { when } from 'lit/directives/when.js';
 import { showAlert, tooltip } from '../../../../ui/helpers';
 import clsx from 'clsx';
-import UIRouter from '../../../root/ui-router';
+import RvtRouter from '../../../root/rvt-router';
 
 enum displayVersion {
 	PRODUCTION = 'PRODUCTION',
@@ -142,7 +142,7 @@ export default class DevNamespaceVersion extends LitElement {
 	}
 
 	getActiveNamespaceList(version: cloud.VersionSummary): {
-		namespaceList: String;
+		namespaceList: string;
 		versionIsActive: boolean;
 	} {
 		let activeVersions = new Map<string, string[]>();
@@ -272,7 +272,7 @@ export default class DevNamespaceVersion extends LitElement {
 	}
 
 	navigateBack() {
-		UIRouter.shared.navBack();
+		RvtRouter.shared.navBack();
 	}
 
 	render() {
diff --git a/src/elements/pages/dev/user/consent.scss b/src/elements/pages/dev/user/consent.scss
deleted file mode 100644
index 7073bd82..00000000
--- a/src/elements/pages/dev/user/consent.scss
+++ /dev/null
@@ -1,102 +0,0 @@
-@use '../../../shared/common';
-
-#preload {
-	position: absolute;
-	width: 0;
-	height: 0;
-	left: 0;
-	top: 0;
-	opacity: 0;
-}
-
-#base {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	min-height: 100vh;
-
-	display: flex;
-	justify-content: center;
-	align-items: center;
-
-	#center {
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		box-sizing: border-box;
-		padding: 60px 45px;
-		max-width: 100vw;
-
-		#overflow {
-			position: absolute;
-			max-width: 100vw;
-			max-height: 100vh;
-			overflow: hidden;
-
-			#bg {
-				position: absolute;
-				left: 50%;
-				top: 50%;
-				width: 600px;
-				height: 400px;
-				transform: translate(-50%, -50%);
-			}
-		}
-
-		#content {
-			position: relative;
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-			z-index: 1;
-
-			#header {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-
-				e-svg {
-					width: 50px;
-					height: 50px;
-					margin-right: 10px;
-				}
-
-				h1 {
-					position: relative;
-					margin: 0;
-					text-align: center;
-					font-weight: 900;
-					font-size: 55px;
-				}
-			}
-
-			h2 {
-				position: relative;
-				margin: 0;
-				text-align: center;
-				font-weight: 600;
-				font-size: 16px;
-			}
-
-			#consent-area {
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				margin: 30px 0 20px 0;
-
-				p {
-					margin: 0;
-					font-size: 14px;
-					color: #ecececec;
-				}
-			}
-
-			stylized-button {
-				--text-transform: none;
-			}
-		}
-	}
-}
diff --git a/src/elements/pages/dev/user/consent.ts b/src/elements/pages/dev/user/consent.ts
deleted file mode 100644
index cf7f066b..00000000
--- a/src/elements/pages/dev/user/consent.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { LitElement, html } from 'lit';
-import { customElement } from 'lit/decorators.js';
-import { cssify } from '../../../../utils/css';
-import styles from './consent.scss';
-import global from '../../../../utils/global';
-
-@customElement('page-consent')
-export default class ConsentPage extends LitElement {
-	static styles = cssify(styles);
-
-	onConsent() {
-		global.grantConsent();
-	}
-
-	render() {
-		return html`
-			<div id="base">
-				<div id="center">
-					<div id="overflow">
-						<lazy-img id="bg" src=${''}></lazy-img>
-					</div>
-					<div id="content">
-						<div id="header">
-							<e-svg src="logo/logo-gradient-white" preserve></e-svg>
-							<h1>Welcome to Rivet!</h1>
-						</div>
-						<h2>First things first, lets do some housekeeping.</h2>
-
-						<div id="consent-area">
-							<p>
-								By clicking continue, you agree to the Rivet
-								<a class="link" href="https://rivet.gg/terms" target="_blank"
-									>Terms of Service</a
-								>
-								and
-								<a class="link" href="https://rivet.gg/privacy" target="_blank"
-									>Privacy Policy</a
-								>.
-							</p>
-						</div>
-
-						<stylized-button .trigger=${this.onConsent.bind(this)}>Continue</stylized-button>
-					</div>
-				</div>
-			</div>
-		`;
-	}
-}
diff --git a/src/elements/pages/dev/user/module.ts b/src/elements/pages/dev/user/module.ts
index cbed6bb1..97097791 100644
--- a/src/elements/pages/dev/user/module.ts
+++ b/src/elements/pages/dev/user/module.ts
@@ -1,2 +1 @@
-import './consent';
 import './settings';
diff --git a/src/elements/pages/dev/user/settings.ts b/src/elements/pages/dev/user/settings.ts
index 491b6967..f36bbb44 100644
--- a/src/elements/pages/dev/user/settings.ts
+++ b/src/elements/pages/dev/user/settings.ts
@@ -1,19 +1,19 @@
 import { customElement, property, query } from 'lit/decorators.js';
-import { LitElement, html, TemplateResult, PropertyValues } from 'lit';
+import { html, LitElement, PropertyValues, TemplateResult } from 'lit';
 import { repeat } from 'lit/directives/repeat.js';
 import { when } from 'lit/directives/when.js';
 import styles from './settings.scss';
 import { cssify } from '../../../../utils/css';
-import { tooltip, showAlert } from '../../../../ui/helpers';
+import { showAlert, tooltip } from '../../../../ui/helpers';
 import { globalEventGroups, SettingChangeEvent } from '../../../../utils/global-events';
-import UIRouter from '../../../root/ui-router';
+import RvtRouter from '../../../root/rvt-router';
 import global from '../../../../utils/global';
 import routes, { responses } from '../../../../routes';
 
 import { OAUTH_PROVIDERS } from '../../../../utils/utils';
 import logging from '../../../../utils/logging';
 import { ToggleSwitchEvent } from '../../../common/toggle-switch';
-import UIRoot from '../../../root/ui-root';
+import RvtRoot from '../../../root/rvt-root';
 import { ls } from '../../../../utils/cache';
 import { map } from 'lit/directives/map.js';
 
@@ -67,7 +67,7 @@ export default class SettingsPage extends LitElement {
 			{},
 			{
 				thirdPartyData: ls.getBoolean('third-party-data', true),
-				collectData: ls.getBoolean('collect-data', true),
+				collectData: ls.getBoolean('collect-data', true)
 			}
 		);
 
@@ -145,7 +145,7 @@ export default class SettingsPage extends LitElement {
 				.flatMap(x => x.items)
 				.find(p => p.hasOwnProperty('id') && p.id == this.tabId);
 
-			if (currentTab) UIRouter.shared.updateTitle(currentTab.title);
+			if (currentTab) RvtRouter.shared.updateTitle(currentTab.title);
 		}
 	}
 
@@ -153,7 +153,7 @@ export default class SettingsPage extends LitElement {
 		// Navigate to the correct tab; this will update this view automatically
 		let url = routes.settings.build({ tab: tabId });
 
-		UIRouter.shared.navigate(url, {
+		RvtRouter.shared.navigate(url, {
 			replaceHistory: true
 		});
 	}
@@ -200,7 +200,7 @@ export default class SettingsPage extends LitElement {
 				[
 					{
 						label: 'Register now',
-						cb: () => UIRoot.shared.openRegisterPanel()
+						cb: () => RvtRoot.shared.openRegisterPanel()
 					},
 					{
 						label: 'Dismiss'
@@ -285,7 +285,7 @@ export default class SettingsPage extends LitElement {
 									icon="solid/envelope"
 									color="#404040"
 									text="#eeeeee"
-									.trigger=${() => UIRoot.shared.openRegisterPanel()}
+									.trigger=${() => RvtRoot.shared.openRegisterPanel()}
 									>${isRegistered ? 'View registration' : 'Link email'}</stylized-button
 								>
 						  `}
@@ -383,7 +383,7 @@ export default class SettingsPage extends LitElement {
 							>Log out</stylized-button
 					  >`
 					: html`<p>Logged in as guest.</p>
-							<stylized-button .trigger=${() => UIRoot.shared.openRegisterPanel()}
+							<stylized-button .trigger=${() => RvtRoot.shared.openRegisterPanel()}
 								>Register Now</stylized-button
 							> `}
 			</div>
diff --git a/src/elements/pages/link-game.ts b/src/elements/pages/link-game.ts
index 1bcfbe4e..2efb1444 100644
--- a/src/elements/pages/link-game.ts
+++ b/src/elements/pages/link-game.ts
@@ -1,4 +1,4 @@
-import { LitElement, html, PropertyValues } from 'lit';
+import { html, LitElement, PropertyValues } from 'lit';
 import config from '../../config';
 import { customElement, property } from 'lit/decorators.js';
 import { cssify } from '../../utils/css';
@@ -13,7 +13,7 @@ import { showAlert, tooltip } from '../../ui/helpers';
 import assets from '../../data/assets';
 import { GameLinkStatus } from '@rivet-gg/identity';
 
-// Sent to the ui-root so that we can advance the linking page's stage even if it is removed from DOM
+// Sent to the rvt-root so that we can advance the linking page's stage even if it is removed from DOM
 // intermittently
 export class DeferredStageEvent extends Event {
 	constructor(public stage: Stage) {
@@ -37,7 +37,7 @@ export default class LinkGamePage extends LitElement {
 	token: string;
 
 	@property({ type: Boolean })
-	isLoading: boolean = true;
+	isLoading = true;
 
 	@property({ type: Object })
 	gameLinkData: api.identity.GetGameLinkCommandOutput;
diff --git a/src/elements/pages/module.ts b/src/elements/pages/module.ts
index af330973..7b1ac0dc 100644
--- a/src/elements/pages/module.ts
+++ b/src/elements/pages/module.ts
@@ -6,4 +6,4 @@ import './dev-only';
 import './error';
 import './invalid-page-state';
 import './link-game';
-import './dev-dash';
+import './rvt-user-dashboard';
diff --git a/src/elements/pages/dev-dash.scss b/src/elements/pages/rvt-user-dashboard.scss
similarity index 99%
rename from src/elements/pages/dev-dash.scss
rename to src/elements/pages/rvt-user-dashboard.scss
index ee32e00d..4f0c0183 100644
--- a/src/elements/pages/dev-dash.scss
+++ b/src/elements/pages/rvt-user-dashboard.scss
@@ -6,6 +6,12 @@
 $tile-margin: 8px;
 $tile-border-radius: 20px;
 
+:host {
+	display: flex;
+	justify-content: center;
+	min-height: 100%;
+}
+
 #base {
 	padding: 0 20px 27px 20px;
 
@@ -70,10 +76,6 @@ $tile-border-radius: 20px;
 		}
 
 		#banner-content {
-			display: flex;
-			flex-direction: row;
-			align-items: space-between;
-
 			display: flex;
 			flex-direction: row;
 			align-items: flex-end;
diff --git a/src/elements/pages/rvt-user-dashboard.ts b/src/elements/pages/rvt-user-dashboard.ts
new file mode 100644
index 00000000..46bcc85e
--- /dev/null
+++ b/src/elements/pages/rvt-user-dashboard.ts
@@ -0,0 +1,105 @@
+import { html, LitElement } from 'lit';
+import { customElement, property } from 'lit/decorators.js';
+import { cssify } from '../../utils/css';
+import styles from './rvt-user-dashboard.scss';
+import global from '../../utils/global';
+import { when } from 'lit/directives/when.js';
+import { globalEventGroups, IdentityChangeEvent } from '../../utils/global-events';
+import { isDeveloper } from '../../utils/identity';
+import routes from '../../routes';
+import RvtRouter from '../root/rvt-router';
+import RvtRoot from '../root/rvt-root';
+
+@customElement('rvt-user-dashboard')
+export default class RvtUserDashboard extends LitElement {
+	static styles = cssify(styles);
+
+	@property({ type: Object })
+	loadError?: any;
+
+	/// === EVENTS ===
+	handleIdentityChange: (e: IdentityChangeEvent) => void;
+
+	connectedCallback() {
+		super.connectedCallback();
+
+		this.handleIdentityChange = this.onIdentityChange.bind(this);
+		globalEventGroups.add('identity-change', this.handleIdentityChange);
+	}
+
+	disconnectedCallback() {
+		super.disconnectedCallback();
+
+		globalEventGroups.remove('identity-change', this.handleIdentityChange);
+	}
+
+	onIdentityChange() {
+		if (isDeveloper(global.currentIdentity)) {
+			RvtRouter.shared.navigate(routes.home.build({}), {
+				replaceHistory: true,
+				forceSamePage: true
+			});
+		} else {
+			this.requestUpdate();
+		}
+	}
+
+	onLoginButtonClick() {
+		global.grantConsent();
+		RvtRoot.shared.openRegisterPanel();
+	}
+
+	render() {
+		return html`
+			${when(
+				global.currentIdentity?.isAdmin ||
+					global.currentIdentity?.groups.find(group => group.group.isDeveloper),
+				() => html`
+					<div class="max-w-contentwidth w-full mx-auto">
+						<user-banner></user-banner>
+						<div class="">
+							<page-dev-games></page-dev-games>
+						</div>
+					</div>
+				`,
+				() => html`
+					<div class="text-center p-4 pb-8 self-center">
+						<e-svg class="w-16 h-auto" src="logo/logo-gradient-white" preserve></e-svg>
+						<h1 class="text-5xl mt-2 mb-8">Welcome to Rivet!</h1>
+						<p class="text-lg">Rivet is still in private beta.</p>
+						<p class="my-2 text-lg">Join the waitlist to get early access.</p>
+						<div class="flex justify-center my-8">
+							<stylized-button href="https://b8v8449klvp.typeform.com/rivet" target="_blank">
+								Beta Access Form
+							</stylized-button>
+						</div>
+						${when(
+							!global.currentIdentity?.isRegistered,
+							() => html`
+								<div class="w-3/4 border-b-white/10 border-b-[1px] h-px mx-auto my-4"></div>
+								<div
+									class="w-full flex m-auto pb-5 text-left items-center justify-center gap-4"
+								>
+									<p class="text-md">Have access and just got logged out?</p>
+									<stylized-button .trigger="${this.onLoginButtonClick.bind(this)}">
+										Login
+									</stylized-button>
+								</div>
+								<p class="text-gray-400 text-xs">
+									By clicking Login, you agree to the Rivet
+									<a class="link" href="https://rivet.gg/terms" target="_blank">
+										Terms of Service
+									</a>
+									and
+									<a class="link" href="https://rivet.gg/privacy" target="_blank">
+										Privacy Policy </a
+									>.
+								</p>
+							`
+						)}
+					</div>
+				`
+			)}
+		`;
+	}
+}
diff --git a/src/elements/profile/user-banner.scss b/src/elements/profile/user-banner.scss
index ff7b4c43..5ac3f475 100644
--- a/src/elements/profile/user-banner.scss
+++ b/src/elements/profile/user-banner.scss
@@ -7,8 +7,6 @@ $tile-margin: 8px;
 $tile-border-radius: 20px;
 
 #base {
-	padding: 0 20px 27px 20px;
-
 	display: flex;
 	flex-direction: column;
 	align-items: center;
@@ -72,10 +70,6 @@ $tile-border-radius: 20px;
 		}
 
 		#banner-content {
-			display: flex;
-			flex-direction: row;
-			align-items: space-between;
-
 			display: flex;
 			flex-direction: row;
 			align-items: flex-end;
diff --git a/src/elements/profile/user-banner.ts b/src/elements/profile/user-banner.ts
index 96b9b42e..97ba4c0d 100644
--- a/src/elements/profile/user-banner.ts
+++ b/src/elements/profile/user-banner.ts
@@ -1,4 +1,4 @@
-import { LitElement, TemplateResult, html } from 'lit';
+import { html, LitElement, TemplateResult } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { cssify } from '../../utils/css';
 import styles from './user-banner.scss';
@@ -6,7 +6,7 @@ import global from '../../utils/global';
 import assets from '../../data/assets';
 import { responses } from '../../routes';
 import { when } from 'lit/directives/when.js';
-import UIRoot from '../root/ui-root';
+import RvtRoot from '../root/rvt-root';
 
 interface Splash {
 	render: (name: string) => TemplateResult;
@@ -108,7 +108,7 @@ export default class UserBanner extends LitElement {
 									<b>editing your profile</b>, and much more.
 								</p>
 								<div id="guest-actions">
-									<stylized-button .trigger=${() => UIRoot.shared.openRegisterPanel()}
+									<stylized-button .trigger=${() => RvtRoot.shared.openRegisterPanel()}
 										>Register Now</stylized-button
 									>
 								</div>
diff --git a/src/elements/root/ui-root.scss b/src/elements/root/rvt-root.scss
similarity index 97%
rename from src/elements/root/ui-root.scss
rename to src/elements/root/rvt-root.scss
index f0e450fe..1cda040c 100644
--- a/src/elements/root/ui-root.scss
+++ b/src/elements/root/rvt-root.scss
@@ -31,17 +31,6 @@
 	// min-height: 100vh;
 	// left: consts.$sidebar-width;
 	// top: 0px;
-
-	ui-router {
-		box-sizing: border-box;
-		position: relative;
-		min-height: 100%;
-	}
-
-	&.mobile {
-		left: 0;
-		width: 100%;
-	}
 }
 
 // === MEDIA HOLDER ===
diff --git a/src/elements/root/ui-root.ts b/src/elements/root/rvt-root.ts
similarity index 80%
rename from src/elements/root/ui-root.ts
rename to src/elements/root/rvt-root.ts
index 857eea56..5b48f8f6 100644
--- a/src/elements/root/ui-root.ts
+++ b/src/elements/root/rvt-root.ts
@@ -1,15 +1,11 @@
 import { customElement, property, query } from 'lit/decorators.js';
 import { html, LitElement, TemplateResult } from 'lit';
-import { classMap } from 'lit/directives/class-map.js';
-import { when } from 'lit/directives/when.js';
-import { repeat } from 'lit/directives/repeat.js';
-import { ifDefined } from 'lit/directives/if-defined.js';
 import { cssify } from '../../utils/css';
 import global, { GlobalStatus } from '../../utils/global';
 import { globalEventGroups, GlobalStatusChangeEvent, windowEventGroups } from '../../utils/global-events';
 import timing from '../../utils/timing';
-import styles from './ui-root.scss';
-import UIRouter, { RouteChangeEvent, RouteTitleChangeEvent } from './ui-router';
+import styles from './rvt-root.scss';
+import RvtRouter, { RouteChangeEvent, RouteTitleChangeEvent } from './rvt-router';
 import { AlertOption } from '../overlay/alert-panel';
 import { ActionSheetItem } from '../overlay/action-sheet';
 import RegisterPanel from '../overlay/register-panel';
@@ -19,7 +15,11 @@ import { DeferredStageEvent, Stage } from '../pages/link-game';
 import StylizedButton from '../common/stylized-button';
 import { Alignment, Orientation } from '../common/overlay-positioning';
 import { DropDownSelectEvent, DropDownSelection } from '../dev/drop-down-list';
-import { Breadcrumb } from '../common/navbar';
+import { Breadcrumb } from '../common/rvt-nav';
+import { ifDefined } from 'lit/directives/if-defined.js';
+import { when } from 'lit/directives/when.js';
+import { repeat } from 'lit/directives/repeat.js';
+import { classMap } from 'lit/directives/class-map.js';
 
 export const MIN_SWIPE_THRESHOLD = 10;
 const TRANSITION_LENGTH = timing.milliseconds(200); // Match with consts.scss/$transition-length
@@ -66,15 +66,15 @@ interface DropDownListData<T> {
 	highlightColor: string;
 }
 
-@customElement('ui-root')
-export default class UIRoot extends LitElement {
+@customElement('rvt-root')
+export default class RvtRoot extends LitElement {
 	static styles = cssify(styles);
 
-	static shared: UIRoot;
+	static shared: RvtRoot;
 
 	// === COMPONENTS ===
-	@query('ui-router')
-	router: UIRouter;
+	@query('rvt-router')
+	router: RvtRouter;
 
 	@query('register-panel')
 	registerPanel: RegisterPanel;
@@ -147,8 +147,8 @@ export default class UIRoot extends LitElement {
 		super();
 
 		// Set singleton
-		if (UIRoot.shared != null) throw new Error('UIRoot.shared has already been set.');
-		UIRoot.shared = this;
+		if (RvtRoot.shared != null) throw new Error('UIRoot.shared has already been set.');
+		RvtRoot.shared = this;
 
 		// Hook in to fetch events
 		if (config.DEBUG) {
@@ -163,7 +163,6 @@ export default class UIRoot extends LitElement {
 	// === LIFECYCLE ===
 	connectedCallback() {
 		super.connectedCallback();
-
 		// Handle status change
 		this.handleStatusChange = this.onStatusChange.bind(this);
 		globalEventGroups.add('status-change', this.handleStatusChange);
@@ -373,7 +372,6 @@ export default class UIRoot extends LitElement {
 	// === RENDER ===
 	render() {
 		let content = null;
-
 		// NOTE: Game link page has own flow
 		if (
 			window.location.pathname.startsWith('/link/') &&
@@ -386,9 +384,9 @@ export default class UIRoot extends LitElement {
 			let token = window.location.pathname.split('/')[2];
 			content = html`
 				<page-link-game
-					.token=${token}
-					.initStage=${ifDefined(this.deferredLinkGameStage)}
-					@deferred-stage=${(e: DeferredStageEvent) => (this.deferredLinkGameStage = e.stage)}
+					.token="${token}"
+					.initStage="${ifDefined(this.deferredLinkGameStage)}"
+					@deferred-stage="${(e: DeferredStageEvent) => (this.deferredLinkGameStage = e.stage)}"
 				></page-link-game>
 				${this.renderBasicOverlays()}
 			`;
@@ -399,11 +397,9 @@ export default class UIRoot extends LitElement {
 				case GlobalStatus.Bootstrapping:
 					this.showLoading();
 					break;
-
-				// Interactive
 				case GlobalStatus.Consenting:
 					this.hideLoading();
-					content = html`<page-consent></page-consent>`;
+					content = html` <rvt-user-dashboard></rvt-user-dashboard>`;
 					break;
 				case GlobalStatus.Connected:
 				case GlobalStatus.Reconnecting:
@@ -449,7 +445,7 @@ export default class UIRoot extends LitElement {
 							inFlightHostCountsSorted,
 							x => x[0],
 							x => {
-								return html`<li class="${classMap({ error: x[1] > 3 })}">
+								return html` <li class="${classMap({ error: x[1] > 3 })}">
 									${x[0]}: <span>${x[1]}</span>
 								</li>`;
 							}
@@ -462,44 +458,49 @@ export default class UIRoot extends LitElement {
 
 	renderContent() {
 		return html`
-			<!-- Offset for navbar -->
-			<div class="pt-14"></div>
+			<rvt-nav
+				class="z-50 relative"
+				id="nav-bar"
+				.routeTitle="${this.routeTitle}"
+				.breadcrumbs="${this.breadcrumb}"
+			></rvt-nav>
 
 			<!-- Page Body -->
-			<div id="content-holder">
-				<ui-router
-					@change=${this.onRouteChange.bind(this)}
-					@title-change=${this.onTitleChange.bind(this)}
-				></ui-router>
+			<div id="content-holder" class="min-h-screen flex pt-14 box-border">
+				<rvt-router
+					@change="${this.onRouteChange.bind(this)}"
+					@title-change="${this.onTitleChange.bind(this)}"
+				></rvt-router>
 			</div>
 
-			<nav-bar .routeTitle=${this.routeTitle} .breadcrumbs=${this.breadcrumb}></nav-bar>
-
 			<!-- Register overlay -->
-			<drop-down-modal .active=${this.registerPanelActive} @close=${this.closeRegisterPanel.bind(this)}>
+			<drop-down-modal
+				.active="${this.registerPanelActive}"
+				@close="${this.closeRegisterPanel.bind(this)}"
+			>
 				<modal-body slot="body">
-					<register-panel light @close=${this.closeRegisterPanel.bind(this)}></register-panel>
+					<register-panel light @close="${this.closeRegisterPanel.bind(this)}"></register-panel>
 				</modal-body>
 			</drop-down-modal>
 
 			<overlay-positioning
-				.active=${this.dropDownListData.active}
-				.contextElement=${this.dropDownListData.contextElement}
-				.orientation=${this.dropDownListData.orientation}
-				.alignment=${Alignment.Corner}
-				.fadeAnimation=${false}
-				@close=${this.closeDropDownList.bind(this)}
+				.active="${this.dropDownListData.active}"
+				.contextElement="${this.dropDownListData.contextElement}"
+				.orientation="${this.dropDownListData.orientation}"
+				.alignment="${Alignment.Corner}"
+				.fadeAnimation="${false}"
+				@close="${this.closeDropDownList.bind(this)}"
 			>
 				<drop-down-list
 					overlay
-					.selection=${this.dropDownListData.selection}
-					.options=${this.dropDownListData.options}
-					?fixed=${this.dropDownListData.fixed}
-					.light=${this.dropDownListData.light}
-					.bgColor=${this.dropDownListData.bgColor}
-					.highlightColor=${this.dropDownListData.highlightColor}
-					@select=${this.dropDownListData.selectionCb}
-					@close=${this.closeDropDownList.bind(this)}
+					.selection="${this.dropDownListData.selection}"
+					.options="${this.dropDownListData.options}"
+					?fixed="${this.dropDownListData.fixed}"
+					.light="${this.dropDownListData.light}"
+					.bgColor="${this.dropDownListData.bgColor}"
+					.highlightColor="${this.dropDownListData.highlightColor}"
+					@select="${this.dropDownListData.selectionCb}"
+					@close="${this.closeDropDownList.bind(this)}"
 				></drop-down-list>
 			</overlay-positioning>
 
@@ -510,29 +511,29 @@ export default class UIRoot extends LitElement {
 	renderBasicOverlays() {
 		return html`<!-- Alert overlay -->
 			<drop-down-modal
-				.active=${this.alertPanelData.active}
-				.no-dim-close=${this.alertPanelData && this.alertPanelData.noDimClose}
-				@close=${this.hideAlertPanel.bind(this)}
+				.active="${this.alertPanelData.active}"
+				.no-dim-close="${this.alertPanelData && this.alertPanelData.noDimClose}"
+				@close="${this.hideAlertPanel.bind(this)}"
 			>
 				<modal-body slot="body">
 					<alert-panel
-						.data=${this.alertPanelData}
-						@select=${this.hideAlertPanel.bind(this)}
+						.data="${this.alertPanelData}"
+						@select="${this.hideAlertPanel.bind(this)}"
 					></alert-panel>
 				</modal-body>
 			</drop-down-modal>
 
 			<overlay-positioning
-				.active=${this.actionSheetData.active}
-				.contextElement=${this.actionSheetData.contextElement}
-				.orientation=${Orientation.TopCenter}
+				.active="${this.actionSheetData.active}"
+				.contextElement="${this.actionSheetData.contextElement}"
+				.orientation="${Orientation.TopCenter}"
 				scale-animation
 				offset-y="5"
-				@close=${this.hideActionSheet.bind(this)}
+				@close="${this.hideActionSheet.bind(this)}"
 			>
 				<action-sheet
-					.options=${this.actionSheetData.options}
-					@select=${this.hideActionSheet.bind(this)}
+					.options="${this.actionSheetData.options}"
+					@select="${this.hideActionSheet.bind(this)}"
 				></action-sheet>
 			</overlay-positioning>
 
@@ -541,10 +542,10 @@ export default class UIRoot extends LitElement {
 
 			<!-- Tooltip -->
 			<overlay-positioning
-				.active=${this.tooltipData.active}
-				.contextElement=${this.tooltipData.contextElement}
-				.orientation=${Orientation.TopCenter}
-				@close=${this.hideTooltip.bind(this)}
+				.active="${this.tooltipData.active}"
+				.contextElement="${this.tooltipData.contextElement}"
+				.orientation="${Orientation.TopCenter}"
+				@close="${this.hideTooltip.bind(this)}"
 				no-pointer
 				scale-animation
 				offset-y="5"
@@ -555,12 +556,12 @@ export default class UIRoot extends LitElement {
 			<!-- Context menu -->
 			<overlay-positioning
 				manual
-				.active=${this.contextMenuData.active}
-				.anchorX=${this.contextMenuData.x}
-				.anchorY=${this.contextMenuData.y}
-				.contextElement=${this.contextMenuData.contextElement}
-				.orientation=${this.contextMenuData.orientation}
-				@close=${this.hideContextMenu.bind(this)}
+				.active="${this.contextMenuData.active}"
+				.anchorX="${this.contextMenuData.x}"
+				.anchorY="${this.contextMenuData.y}"
+				.contextElement="${this.contextMenuData.contextElement}"
+				.orientation="${this.contextMenuData.orientation}"
+				@close="${this.hideContextMenu.bind(this)}"
 			>
 				${this.contextMenuData.content}
 			</overlay-positioning>`;
diff --git a/src/elements/root/rvt-router.scss b/src/elements/root/rvt-router.scss
new file mode 100644
index 00000000..e7dd94c8
--- /dev/null
+++ b/src/elements/root/rvt-router.scss
@@ -0,0 +1,7 @@
+@use '../shared/common';
+@use '../shared/consts';
+
+:host {
+	flex-grow: 1;
+	position: relative;
+}
diff --git a/src/elements/root/ui-router.ts b/src/elements/root/rvt-router.ts
similarity index 89%
rename from src/elements/root/ui-router.ts
rename to src/elements/root/rvt-router.ts
index 5b025507..d5541cc7 100644
--- a/src/elements/root/ui-router.ts
+++ b/src/elements/root/rvt-router.ts
@@ -1,15 +1,11 @@
-import { LitElement, html, PropertyValues } from 'lit';
-import { customElement, property, query } from 'lit/decorators.js';
-import { repeat } from 'lit/directives/repeat.js';
+import { html, LitElement, PropertyValues } from 'lit';
+import { customElement, property } from 'lit/decorators.js';
 import { cssify } from '../../utils/css';
-import global from '../../utils/global';
 import timing from '../../utils/timing';
-import { windowEventGroups, bodyEventGroups } from '../../utils/global-events';
+import { windowEventGroups } from '../../utils/global-events';
 import logging from '../../utils/logging';
 import { classMap } from 'lit/directives/class-map.js';
-import { styleMap } from 'lit/directives/style-map.js';
-import styles from './ui-router.scss';
-import UIRoot, { MIN_SWIPE_THRESHOLD } from './ui-root';
+import styles from './rvt-router.scss';
 import routes, {
 	RenderResult,
 	RenderResultRedirect,
@@ -19,9 +15,7 @@ import routes, {
 } from '../../routes';
 
 import * as uuid from 'uuid';
-import { Breadcrumb } from '../common/navbar';
-
-const PAGE_ANIMATION_DURATION = timing.milliseconds(250);
+import { Breadcrumb } from '../common/rvt-nav';
 
 interface PageState {
 	scrollTop: number;
@@ -66,11 +60,11 @@ export class RouteTitleChangeEvent extends Event {
 	}
 }
 
-@customElement('ui-router')
-export default class UIRouter extends LitElement {
+@customElement('rvt-router')
+export default class RvtRouter extends LitElement {
 	static styles = cssify(styles);
 
-	static shared: UIRouter;
+	static shared: RvtRouter;
 
 	@property({ type: Array })
 	history: RemovablePage[] = [];
@@ -89,6 +83,7 @@ export default class UIRouter extends LitElement {
 	handleScroll: (e: Event) => void;
 
 	/*=== Navigation State ===*/
+
 	/// Returns the full URL for the current page.
 	get fullPath(): string {
 		return location.href;
@@ -126,7 +121,7 @@ export default class UIRouter extends LitElement {
 		super();
 
 		// Set singleton
-		UIRouter.shared = this;
+		RvtRouter.shared = this;
 
 		// Parse the path url
 		let url = routes.home.build({});
@@ -315,6 +310,11 @@ export default class UIRouter extends LitElement {
 					this.history[i].old = true;
 					this.history[i].new = false;
 					this.history[i].state = this.buildPageState();
+					if (this.history.length > 0) {
+						if (!this.removePage(this.history[i])) {
+							logging.error(`Failed to remove page "${this.history[i].src}"`);
+						}
+					}
 					break;
 				}
 			}
@@ -435,14 +435,9 @@ export default class UIRouter extends LitElement {
 						page.new = false;
 						page.state.scrollTop = document.body.scrollTop;
 
-						// Remove current page from history after animation is over
-						page.removalTimeout = window.setTimeout(() => {
-							if (!this.removePage(page)) {
-								logging.error(`Failed to remove page "${page.src}"`);
-							}
-
-							this.requestUpdate('history');
-						}, PAGE_ANIMATION_DURATION);
+						if (!this.removePage(page)) {
+							logging.error(`Failed to remove page "${page.src}"`);
+						}
 					}
 					// Navigate to previous page
 					else if (page.old) {
@@ -535,32 +530,20 @@ export default class UIRouter extends LitElement {
 	render() {
 		// Clone the page history list so it will not be mutated
 		let pageList = [...this.history];
-		// Count how many back animation pages there are (used for animation purposes)
-		let backedPages = this.getBackedPages();
 
 		let newestPage = pageList[pageList.length - 1];
 
-		if (!newestPage) return html`<div id="base"></div>`;
+		if (!newestPage) return html``;
 
 		// Create class map
 		let classes = classMap({
 			page: true,
 			old: newestPage.old,
 			new: newestPage.new,
-			back: newestPage.back
-		});
-
-		// Position old pages in the proper y-pos based on scroll
-		let scrollStyle = styleMap({
-			transform: newestPage.old ? `translateY(${-newestPage.state.scrollTop + this.scrollTop}px)` : null
+			back: newestPage.back,
+			first: pageList.length == 1
 		});
 
-		// Two divs are used here because you cannot animate separate transform properties in
-		// css separately
-		return html`<div id="base">
-			<div class=${classes}>
-				<div class="y-scroll" style=${scrollStyle}>${newestPage.renderResult.template}</div>
-			</div>
-		</div>`;
+		return html`<div class="${classes} h-full">${newestPage.renderResult.template}</div> `;
 	}
 }
diff --git a/src/elements/root/ui-router.scss b/src/elements/root/ui-router.scss
deleted file mode 100644
index cf3342bc..00000000
--- a/src/elements/root/ui-router.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-@use '../shared/common';
-@use '../shared/consts';
-
-$transition-duration: 250ms; // Also update in ui-router
-
-#base {
-	display: flex;
-	flex-direction: column;
-
-	.page {
-		position: relative;
-		left: 0;
-		top: 0;
-		width: 100%;
-		// min-height: 93vh;
-		min-height: calc(100% - 4rem);
-	}
-}
-
-@media only screen and (max-width: consts.$mobile-width-threshold) {
-	#base {
-		.page {
-			transform: translateX(100vw);
-			box-shadow: 0 0 128px rgba(0, 0, 0, 0.8);
-
-			.y-scroll {
-				min-height: calc(100% - 4rem);
-				background-color: $base-bg;
-			}
-
-			&.back {
-				transform: translateX(-100vw);
-			}
-
-			// Home page has a lesser shadow
-			&.home {
-				box-shadow: 0 0 64px rgba(0, 0, 0, 0.6);
-			}
-
-			&.old {
-				// Position and width have to be manually set because old pages are removed from normal flow
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 100vw;
-
-				transform: translateX(-100vw);
-
-				&.back {
-					transform: translateX(100vw);
-				}
-			}
-
-			&.new {
-				transform: translateX(0vh);
-			}
-		}
-
-		&.notouch {
-			.page {
-				&.old {
-					box-shadow: none;
-					transition:
-						box-shadow $transition-duration,
-						transform $transition-duration * 4;
-					transition-timing-function: ease-out;
-
-					&.back {
-						transition:
-							box-shadow $transition-duration,
-							transform $transition-duration;
-						transition-timing-function: ease-out;
-					}
-				}
-
-				&.new {
-					box-shadow: none;
-					transition:
-						box-shadow $transition-duration,
-						transform $transition-duration;
-					transition-timing-function: ease-out;
-				}
-			}
-		}
-	}
-}
diff --git a/src/hub.ts b/src/hub.ts
index fea5be43..17afd7f8 100644
--- a/src/hub.ts
+++ b/src/hub.ts
@@ -1,7 +1,7 @@
 import './utils/start-posthog';
 import './elements/mod';
 import numbro from 'numbro';
-import UIRoot from './elements/root/ui-root';
+import RvtRoot from './elements/root/rvt-root';
 import global from './utils/global';
 import logging from './utils/logging';
 
@@ -9,7 +9,7 @@ numbro.setDefaults({ roundingFunction: Math.floor });
 
 window.addEventListener('load', async () => {
 	// Add main UI
-	let uiRoot = new UIRoot();
+	let uiRoot = new RvtRoot();
 	document.body.appendChild(uiRoot);
 
 	// initiate
diff --git a/src/routes.ts b/src/routes.ts
index b59c96a6..6a9efcaa 100644
--- a/src/routes.ts
+++ b/src/routes.ts
@@ -1,12 +1,12 @@
-import { TemplateResult, html } from 'lit';
+import { html, TemplateResult } from 'lit';
 import * as pathToRegexp from 'path-to-regexp';
 import global from './utils/global';
 import utils from './utils/utils';
 import { DevGameRootConfig } from './elements/pages/dev/game/pages/game';
-import UIRoot from './elements/root/ui-root';
+import RvtRoot from './elements/root/rvt-root';
 import { RivetError } from '@rivet-gg/api-internal';
 import { isDeveloper } from './utils/identity';
-import { Breadcrumb } from './elements/common/navbar';
+import { Breadcrumb } from './elements/common/rvt-nav';
 import { GameSettingsRootConfig } from './elements/pages/dev/game/settings/game-settings';
 import { GroupSettingsRootConfig } from './elements/pages/dev/group/settings/group-settings';
 
@@ -66,11 +66,13 @@ class Route<P extends RouteParameters, S extends SearchParameters = {}> {
 namespace routes {
 	export let home = new Route<{}>({
 		path: '/',
-		render({}) {
+		render() {
 			return {
 				title: 'Home',
 				breadcrumb: { type: 'Home' },
-				template: html` <dev-dash .identity=${global.currentIdentity}></dev-dash> `
+				template: html`
+					<rvt-user-dashboard .identity="${global.currentIdentity}"></rvt-user-dashboard>
+				`
 			};
 		}
 	});
@@ -99,7 +101,7 @@ namespace routes {
 
 	// Reuse the same template in order to preserve the same `page-group-settings` instance.
 	function renderPageGroupSettings(groupId: string, config?: GroupSettingsRootConfig) {
-		return html`<page-group-settings .groupId=${groupId} .config=${config}></page-group-settings>`;
+		return html` <page-group-settings .groupId="${groupId}" .config="${config}"></page-group-settings>`;
 	}
 
 	export let groupSettingsRedirect = new Route<{ groupId: string }>({
@@ -134,7 +136,7 @@ namespace routes {
 			return {
 				title: 'Group',
 				breadcrumb: { type: 'Group', groupId: id },
-				template: html`<page-group .groupId=${id}></page-group>`
+				template: html` <page-group .groupId="${id}"></page-group>`
 			};
 		}
 	});
@@ -207,9 +209,9 @@ namespace routes {
 	// Reuse the same template in order to preserve the same `page-dev-game` instance.
 	function renderPageDevGame(gameId: string, namespaceId: string, config: DevGameRootConfig) {
 		return html`<page-dev-game
-			.gameId=${gameId}
-			.namespaceId=${namespaceId}
-			.config=${config}
+			.gameId="${gameId}"
+			.namespaceId="${namespaceId}"
+			.config="${config}"
 		></page-dev-game>`;
 	}
 
@@ -222,7 +224,7 @@ namespace routes {
 			return {
 				title: 'Game',
 				breadcrumb: { type: 'Game', gameId, title: 'Overview' },
-				template: html` <game-overview .gameId=${gameId}></game-overview> `
+				template: html`<game-overview .gameId="${gameId}"></game-overview> `
 			};
 		}
 	});
@@ -238,7 +240,10 @@ namespace routes {
 	});
 
 	function renderPageDevGameSettings(gameId: string, config: GameSettingsRootConfig) {
-		return html`<page-dev-game-settings .gameId=${gameId} .config=${config}></page-dev-game-settings>`;
+		return html`<page-dev-game-settings
+			.gameId="${gameId}"
+			.config="${config}"
+		></page-dev-game-settings>`;
 	}
 
 	export let devGameSettingsRedirect = new Route<{ gameId: string }>({
@@ -471,14 +476,15 @@ export namespace responses {
 				<div class="text-center fixed w-full h-32 m-auto left-0 right-0 top-0 bottom-0">
 					<h1 class="text-red-500 font-bold text-8xl pr-2">404</h1>
 					<h4 class="pb-4 font-semibold">Page Not Found</h4>
-						<stylized-button 
-							class="mx-auto"
-							right-icon="solid/arrow-right"
-							color=${tailwind_palette['raised-bg']}
-							border-color=${tailwind_palette['raised-bg-border-color']}
-							border-width=".75px"
-							href=${routes.home.build({})}
-						>Go Home</stylized-button>
+					<stylized-button
+						class="mx-auto"
+						right-icon="solid/arrow-right"
+						color=${tailwind_palette['raised-bg']}
+						border-color=${tailwind_palette['raised-bg-border-color']}
+						border-width=".75px"
+						href=${routes.home.build({})}
+						>Go Home</stylized-button
+					>
 				</div>
 			`
 		};
@@ -490,7 +496,7 @@ export namespace responses {
 			breadcrumb: {
 				type: 'Custom'
 			},
-			template: html`<invalid-page-state>
+			template: html` <invalid-page-state>
 				<h1 slot="title">Coming Soon</h1>
 				<h2 slot="subtitle">This page isn't available yet. Come back soon!</h2>
 				<div slot="actions">
@@ -506,15 +512,15 @@ export namespace responses {
 			breadcrumb: {
 				type: 'Custom'
 			},
-			template: html`<invalid-page-state>
+			template: html` <invalid-page-state>
 				<h1 slot="title">Registered Only</h1>
 				<h2 slot="subtitle">
 					This page isn't available for guest accounts. Register to save your account.
 				</h2>
 				<div slot="actions">
-					<stylized-button .trigger=${() => UIRoot.shared.openRegisterPanel()}
-						>Register Now</stylized-button
-					>
+					<stylized-button .trigger="${() => RvtRoot.shared.openRegisterPanel()}"
+						>Register Now
+					</stylized-button>
 				</div>
 			</invalid-page-state>`
 		};
@@ -526,7 +532,7 @@ export namespace responses {
 			breadcrumb: {
 				type: 'Custom'
 			},
-			template: html`<invalid-page-state>
+			template: html` <invalid-page-state>
 				<h1 slot="title">Desktop Only</h1>
 				<h2 slot="subtitle">This page is only available on a Desktop platform.</h2>
 			</invalid-page-state>`
@@ -539,7 +545,7 @@ export namespace responses {
 			breadcrumb: {
 				type: 'Custom'
 			},
-			template: html`<page-dev-only></page-dev-only>`
+			template: html` <page-dev-only></page-dev-only>`
 		};
 	}
 
@@ -548,7 +554,7 @@ export namespace responses {
 		let errorMessage: string;
 		if (typeof error == 'string') errorMessage = error;
 		else if (error instanceof RivetError) {
-			return html`<page-error
+			return html` <page-error
 				.message=${(error.body as any)?.message}
 				.expand=${!notFullHeight}
 			></page-error>`;
@@ -561,7 +567,7 @@ export namespace responses {
 			errorMessage = err.statusText ? err.statusText : err.status.toString() ?? 'Error';
 		} else errorMessage = 'Error';
 
-		return html`<page-error .message=${errorMessage} .expand=${!notFullHeight}></page-error>`;
+		return html` <page-error .message="${errorMessage}" .expand="${!notFullHeight}"></page-error>`;
 	}
 }
 
diff --git a/src/ui/helpers.ts b/src/ui/helpers.ts
index caf985a0..f3954531 100644
--- a/src/ui/helpers.ts
+++ b/src/ui/helpers.ts
@@ -1,5 +1,5 @@
 import { html, TemplateResult } from 'lit';
-import UIRoot from '../elements/root/ui-root';
+import RvtRoot from '../elements/root/rvt-root';
 import { AlertOption } from '../elements/overlay/alert-panel';
 import { ActionSheetItem } from '../elements/overlay/action-sheet';
 import * as api from '../utils/api';
@@ -14,11 +14,11 @@ export function tooltip(text: string): (e: Event) => void {
 		let element = event.currentTarget as HTMLElement;
 
 		// Show tooltip
-		UIRoot.shared.showTooltip(element, text);
+		RvtRoot.shared.showTooltip(element, text);
 
 		// Add hide event; we register click, since that may cause the tooltip to disappear on an action
 		let hideTooltip = () => {
-			UIRoot.shared.hideTooltip();
+			RvtRoot.shared.hideTooltip();
 
 			element.removeEventListener('mouseleave', hideTooltip);
 			element.removeEventListener('click', hideTooltip);
@@ -77,7 +77,7 @@ function abstractContextMenu(cb: () => TemplateResult): (e: MouseEvent) => void
 		let element = event.currentTarget as HTMLElement;
 
 		// Show contextmenu
-		UIRoot.shared.showContextMenu(element, event.clientX, event.clientY, cb());
+		RvtRoot.shared.showContextMenu(element, event.clientX, event.clientY, cb());
 
 		// Stop default context menu from being enabled
 		event.preventDefault();
@@ -103,11 +103,11 @@ export function showAlert(
 	options: AlertOption[] = [{ label: 'Dismiss' }]
 ) {
 	// Show alert
-	UIRoot.shared.showAlertPanel({ title, details, options, active: true });
+	RvtRoot.shared.showAlertPanel({ title, details, options, active: true });
 }
 
 export function showActionSheet(anchor: HTMLElement, options: ActionSheetItem[]) {
-	UIRoot.shared.showActionSheet({
+	RvtRoot.shared.showActionSheet({
 		contextElement: anchor,
 		options,
 		active: true
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 8e2df98b..2b863574 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -29,7 +29,7 @@ export class Token {
 }
 
 // TODO: Delay changing global status when refreshing token by 1-3 seconds so there is no state change
-// that causes the <ui-router> to be unloaded and then reloaded again
+// that causes the <rvt-router> to be unloaded and then reloaded again
 export class AuthManager {
 	public token?: Token;
 	public authenticationFailed = false;
diff --git a/src/utils/global.ts b/src/utils/global.ts
index 61363851..eaaf7e5a 100644
--- a/src/utils/global.ts
+++ b/src/utils/global.ts
@@ -1,9 +1,9 @@
 import logging from './logging';
 import config from '../config';
-import { AuthManager, Token } from './auth';
+import { AuthManager } from './auth';
 import settings, { SettingChange } from './settings';
 import timing from './timing';
-import { windowEventGroups, globalEventGroups } from './global-events';
+import { globalEventGroups, windowEventGroups } from './global-events';
 import * as api from './api';
 import * as cloud from '@rivet-gg/cloud';
 import { RootCache } from '../data/cache';
@@ -77,7 +77,7 @@ export class GlobalState {
 	liveInitiated = false;
 	liveBlockingBypass: number = null;
 
-	bootstrapFailed: boolean = false;
+	bootstrapFailed = false;
 	bootstrapData: Rivet.cloud.BootstrapResponse;
 
 	identityStream: api.RepeatingRequest<api.identity.GetIdentitySelfProfileCommandOutput>;
@@ -212,9 +212,6 @@ export class GlobalState {
 
 		this.bootstrap();
 
-		// Establish push notifications
-		this.pushNotifications = new PushNotifications();
-
 		// Set initial status
 		this.updateStatus();
 
@@ -254,7 +251,7 @@ export class GlobalState {
 	}
 
 	/// Fetches configuration information from the servers & creates the intiital auth token.
-	bootstrap(noCache: boolean = false) {
+	bootstrap(noCache = false) {
 		// Reset bootstrap state
 		this.bootstrapFailed = false;
 		this.bootstrapData = undefined;
@@ -404,7 +401,6 @@ export class GlobalState {
 			if (this.troubleConnecting) status = GlobalStatus.Reconnecting;
 			else status = GlobalStatus.Connected;
 		}
-		console.log('status', status);
 
 		// Dispatch event
 		if (status !== this.status) {