diff --git a/src/lib/components/AuthSig.svelte b/src/lib/components/AuthSig.svelte
index 00cb90c..2e8b692 100644
--- a/src/lib/components/AuthSig.svelte
+++ b/src/lib/components/AuthSig.svelte
@@ -2,6 +2,7 @@
 	import { onMount } from 'svelte';
 	import { checkAndSignAuthMessage } from '@lit-protocol/lit-node-client';
 	import { LOCAL_STORAGE_KEYS } from '@lit-protocol/constants';
+	import Send from '$lib/Send.svelte';
 
 	let authSig = null;
 	let error = null;
diff --git a/src/lib/components/Wallet.svelte b/src/lib/components/Wallet.svelte
new file mode 100644
index 0000000..e93c836
--- /dev/null
+++ b/src/lib/components/Wallet.svelte
@@ -0,0 +1,21 @@
+<script>
+	import AuthSig from '$lib/components/AuthSig.svelte';
+	import Wallet from '$lib/Wallet.svelte';
+	import Send from '$lib/Send.svelte';
+	import WalletConnect from '$lib/WalletConnect.svelte';
+	import Balance from '$lib/components/Balance.svelte';
+
+	let pkpWallet;
+	let authSig;
+	let pkpPubKey =
+		'046da3ba67065fd1e2726242ca01cd4601524893f4aa4b0042578fa6cbec28fa8c9a28eb9f7893932fc09717edc9e1db57e157a21eed346247c1db5a722a01f571';
+</script>
+
+<AuthSig />
+<div class="flex flex-col items-center justify-center p-4 bg-gray-200">
+	<Wallet bind:pkpWallet bind:authSig />
+	<Send bind:pkpWallet />
+	<Balance />
+
+	<WalletConnect bind:pkpWallet bind:authSig bind:pkpPubKey />
+</div>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 9c8302a..25b5399 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,14 +1,7 @@
 <script>
-	import Wallet from '$lib/Wallet.svelte';
-	import Send from '$lib/Send.svelte';
-	import WalletConnect from '$lib/WalletConnect.svelte';
 	import GoogleAuth from '$lib/components/GoogleAuth.svelte';
 	import Composite from '$lib/components/Composite.svelte';
 
-	let pkpWallet;
-	let authSig;
-	let pkpPubKey =
-		'046da3ba67065fd1e2726242ca01cd4601524893f4aa4b0042578fa6cbec28fa8c9a28eb9f7893932fc09717edc9e1db57e157a21eed346247c1db5a722a01f571';
 	let componentsData = {
 		layout: `
 			grid-template-areas: 
@@ -35,17 +28,6 @@
 
 <Composite {componentsData} />
 
-<!-- <LitStatus />
-<AuthSign /> -->
-
-<!-- <div class="flex flex-col items-center justify-center p-4 bg-gray-200">
-	<Wallet bind:pkpWallet bind:authSig />
-	<Send bind:pkpWallet />
-	<Balance />
-
-	<WalletConnect bind:pkpWallet bind:authSig bind:pkpPubKey />
-</div> -->
-
 <!-- <div class="fixed top-0 left-0 w-full h-full overflow-hidden">
 	<main class="grid grid-rows-[auto,1fr,auto] min-h-screen">
 		<header class="p-4 text-black bg-gray-100">