diff --git a/src/app/home/components/Blockchain.tsx b/src/app/components/Blockchain.tsx
similarity index 100%
rename from src/app/home/components/Blockchain.tsx
rename to src/app/components/Blockchain.tsx
diff --git a/src/app/home/components/Header.tsx b/src/app/components/Header.tsx
similarity index 62%
rename from src/app/home/components/Header.tsx
rename to src/app/components/Header.tsx
index bd3712f..75cd167 100644
--- a/src/app/home/components/Header.tsx
+++ b/src/app/components/Header.tsx
@@ -1,20 +1,25 @@
 import { Block, BlockTypes } from "@/components/Block";
 import { Title } from "@/components/Title";
 import { Status } from "@/components/Status";
-import { useStore, useWallet } from "@/hooks";
+import { useStore } from "@/hooks";
 import { Button } from "@/components/Button";
 
-export const Header: React.FunctionComponent<{}> = () => {
+type HeaderProps = {
+  onWalletConnect?: () => void;
+}
+
+export const Header: React.FunctionComponent<HeaderProps> = (props) => {
   const { appStatus, wallet } = useStore();
-  const { onWalletConnect } = useWallet();
 
   return (
     <>
       <Block className="mb-5" type={BlockTypes.FlexHorizontal}>
         <Title>Waku RLN</Title>
-        <Button onClick={onWalletConnect}>
-          Connect Wallet
-        </Button>
+        {props.onWalletConnect && (
+          <Button onClick={props.onWalletConnect}>
+            Connect Wallet
+          </Button>
+        )}
       </Block>
       <Status text="Application status" mark={appStatus} />
       {wallet && <p className="mt-3 text-sm">Wallet connected: {wallet}</p> }
diff --git a/src/app/home/components/Keystore.tsx b/src/app/components/Keystore.tsx
similarity index 100%
rename from src/app/home/components/Keystore.tsx
rename to src/app/components/Keystore.tsx
diff --git a/src/app/home/components/KeystoreDetails.tsx b/src/app/components/KeystoreDetails.tsx
similarity index 100%
rename from src/app/home/components/KeystoreDetails.tsx
rename to src/app/components/KeystoreDetails.tsx
diff --git a/src/app/home/components/Waku.tsx b/src/app/components/Waku.tsx
similarity index 100%
rename from src/app/home/components/Waku.tsx
rename to src/app/components/Waku.tsx
diff --git a/src/app/home/page.tsx b/src/app/home/page.tsx
index e8e046f..8270f84 100644
--- a/src/app/home/page.tsx
+++ b/src/app/home/page.tsx
@@ -1,15 +1,11 @@
 "use client";
-import { Header } from "./components/Header";
-import { Waku } from "./components/Waku";
-import { Keystore } from "./components/Keystore";
-import { KeystoreDetails } from "./components/KeystoreDetails";
+import { Header } from "@/app/components/Header";
+import { Waku } from "@/app/components/Waku";
 
 export default function Home() {
   return (
     <main className="flex min-h-screen flex-col p-24 font-mono max-w-screen-lg m-auto">
       <Header />
-      <Keystore />
-      <KeystoreDetails />
       <Waku />
     </main>
   );
diff --git a/src/app/keystore/page.tsx b/src/app/keystore/page.tsx
new file mode 100644
index 0000000..269f232
--- /dev/null
+++ b/src/app/keystore/page.tsx
@@ -0,0 +1,16 @@
+"use client";
+import { Header } from "@/app/components/Header";
+import { Keystore } from "@/app/components/Keystore";
+import { KeystoreDetails } from "@/app/components/KeystoreDetails";
+import { useWallet } from "@/hooks";
+
+export default function KeystorePage() {
+    const { onWalletConnect } = useWallet();
+  return (
+    <main className="flex min-h-screen flex-col p-24 font-mono max-w-screen-lg m-auto">
+      <Header onWalletConnect={onWalletConnect} />
+      <Keystore />
+      <KeystoreDetails />
+    </main>
+  );
+}
diff --git a/src/services/waku.ts b/src/services/waku.ts
index 4033760..bf8f8e3 100644
--- a/src/services/waku.ts
+++ b/src/services/waku.ts
@@ -52,7 +52,7 @@ class Relay {
 
       this.subscriptionRoutine = window.setInterval(async () => {
         await this.fetchMessages();
-      },  SECOND);
+      },  5 * SECOND);
 
       this.contentTopicListeners.set(contentTopic, 1);
     } catch (error) {