diff --git a/src/.gitignore b/src/.gitignore
index 16d54bb..e89acec 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -22,3 +22,4 @@ pnpm-debug.log*
 
 # jetbrains setting folder
 .idea/
+package-lock.json
diff --git a/src/src/components/PageWrapper.tsx b/src/src/components/PageWrapper.tsx
index aad2e22..49cc2d9 100644
--- a/src/src/components/PageWrapper.tsx
+++ b/src/src/components/PageWrapper.tsx
@@ -1,14 +1,46 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 import GitHubUserInput from "../components/GitHubUserInput";
 import GitHubActivity from "./GitHubActivity";
 
+function toSlug(username: string): string {
+  return username
+    .toLowerCase()
+    .trim()
+    .replace(/\s+/g, "-")
+    .replace(/[^a-z0-9-]/g, "")
+    .replace(/-+/g, "-")
+    .replace(/^-|-$/g, "");
+}
+
+function getUsernameFromUrl(): string {
+  if (typeof window === "undefined") return "trueberryless";
+  const params = new URLSearchParams(window.location.search);
+  return params.get("user") || "trueberryless";
+}
+
 export default function CommitListPage(githubToken: any) {
-  const [username, setUsername] = useState("trueberryless"); // Default user
+  const [username, setUsername] = useState(getUsernameFromUrl);
+
+  useEffect(() => {
+    const handlePopState = () => {
+      setUsername(getUsernameFromUrl());
+    };
+    window.addEventListener("popstate", handlePopState);
+    return () => window.removeEventListener("popstate", handlePopState);
+  }, []);
+
+  const handleUserSelect = (user: string) => {
+    const slug = toSlug(user);
+    setUsername(slug);
+    const url = new URL(window.location.href);
+    url.searchParams.set("user", slug);
+    window.history.pushState({ username: slug }, "", url.toString());
+  };
 
   return (
     <div className="flex flex-col items-center gap-6 p-6">
-      <GitHubUserInput onUserSelect={(user) => setUsername(user)} />
+      <GitHubUserInput onUserSelect={handleUserSelect} />
       <h3 className="w-full text-2xl font-bold text-white">
         Showing latest GitHub activity for {username}
       </h3>