diff --git a/.cursor/rules/210.mdc b/.cursor/rules/210.mdc
new file mode 100644
index 00000000..b8bbebc4
--- /dev/null
+++ b/.cursor/rules/210.mdc
@@ -0,0 +1,5 @@
+---
+alwaysApply: true
+---
+
+Keep files below 210 lines.
\ No newline at end of file
diff --git a/.cursor/rules/always-commit.mdc b/.cursor/rules/always-commit.mdc
new file mode 100644
index 00000000..3662e8ad
--- /dev/null
+++ b/.cursor/rules/always-commit.mdc
@@ -0,0 +1,5 @@
+---
+alwaysApply: true
+---
+
+Commit all pending changes. Commit using conventional commits. Always commit after each implementation step or change.
diff --git a/.cursor/rules/dry.mdc b/.cursor/rules/dry.mdc
new file mode 100644
index 00000000..8251ef43
--- /dev/null
+++ b/.cursor/rules/dry.mdc
@@ -0,0 +1,5 @@
+---
+alwaysApply: true
+---
+
+Keep things simple. Strive to keep code DRY.
diff --git a/dist/index.html b/dist/index.html
index c96e1c24..35e5dd00 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Markr - Nostr Bookmarks</title>
-    <script type="module" crossorigin src="/assets/index-Cnm-Nmlg.js"></script>
+    <script type="module" crossorigin src="/assets/index-Dh663TVM.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-D18sZheu.css">
   </head>
   <body>
diff --git a/src/App.tsx b/src/App.tsx
index 80898fdb..6f0299b5 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -8,6 +8,7 @@ function App() {
   const [eventStore, setEventStore] = useState<EventStore | null>(null)
   const [isAuthenticated, setIsAuthenticated] = useState(false)
   const [userPublicKey, setUserPublicKey] = useState<string | null>(null)
+  const [userProfile, setUserProfile] = useState<{name?: string, username?: string, nip05?: string} | null>(null)
 
   useEffect(() => {
     // Initialize event store
@@ -28,16 +29,19 @@ function App() {
         </header>
         
         {!isAuthenticated ? (
-          <Login onLogin={(publicKey) => {
+          <Login onLogin={(publicKey, profile) => {
             setIsAuthenticated(true)
             setUserPublicKey(publicKey)
+            setUserProfile(profile)
           }} />
         ) : (
           <Bookmarks 
             userPublicKey={userPublicKey}
+            userProfile={userProfile}
             onLogout={() => {
               setIsAuthenticated(false)
               setUserPublicKey(null)
+              setUserProfile(null)
             }} 
           />
         )}
diff --git a/src/components/Bookmarks.tsx b/src/components/Bookmarks.tsx
index 9098f48a..0f00788e 100644
--- a/src/components/Bookmarks.tsx
+++ b/src/components/Bookmarks.tsx
@@ -11,12 +11,19 @@ interface Bookmark {
   tags: string[][]
 }
 
+interface UserProfile {
+  name?: string
+  username?: string
+  nip05?: string
+}
+
 interface BookmarksProps {
   userPublicKey: string | null
+  userProfile: UserProfile | null
   onLogout: () => void
 }
 
-const Bookmarks: React.FC<BookmarksProps> = ({ userPublicKey, onLogout }) => {
+const Bookmarks: React.FC<BookmarksProps> = ({ userPublicKey, userProfile, onLogout }) => {
   const [bookmarks, setBookmarks] = useState<Bookmark[]>([])
   const [loading, setLoading] = useState(true)
   const eventStore = useContext(EventStoreContext)
@@ -104,8 +111,23 @@ const Bookmarks: React.FC<BookmarksProps> = ({ userPublicKey, onLogout }) => {
     return new Date(timestamp * 1000).toLocaleDateString()
   }
 
-  const formatPublicKey = (publicKey: string) => {
-    return `${publicKey.slice(0, 8)}...${publicKey.slice(-8)}`
+  const formatUserDisplay = (profile: UserProfile | null, publicKey: string | null) => {
+    if (!profile || (!profile.name && !profile.username && !profile.nip05)) {
+      return publicKey ? `${publicKey.slice(0, 8)}...${publicKey.slice(-8)}` : 'Unknown User'
+    }
+    
+    // Priority: NIP-05 > name > username
+    if (profile.nip05) {
+      return profile.nip05
+    }
+    if (profile.name) {
+      return profile.name
+    }
+    if (profile.username) {
+      return `@${profile.username}`
+    }
+    
+    return publicKey ? `${publicKey.slice(0, 8)}...${publicKey.slice(-8)}` : 'Unknown User'
   }
 
   if (loading) {
@@ -115,7 +137,7 @@ const Bookmarks: React.FC<BookmarksProps> = ({ userPublicKey, onLogout }) => {
           <div>
             <h2>Your Bookmarks</h2>
             {userPublicKey && (
-              <p className="user-info">Logged in as: {formatPublicKey(userPublicKey)}</p>
+              <p className="user-info">Logged in as: {formatUserDisplay(userProfile, userPublicKey)}</p>
             )}
           </div>
           <button onClick={onLogout} className="logout-button">
@@ -133,7 +155,7 @@ const Bookmarks: React.FC<BookmarksProps> = ({ userPublicKey, onLogout }) => {
         <div>
           <h2>Your Bookmarks ({bookmarks.length})</h2>
           {userPublicKey && (
-            <p className="user-info">Logged in as: {formatPublicKey(userPublicKey)}</p>
+            <p className="user-info">Logged in as: {formatUserDisplay(userProfile, userPublicKey)}</p>
           )}
         </div>
         <button onClick={onLogout} className="logout-button">
diff --git a/src/components/Login.tsx b/src/components/Login.tsx
index b8a5238c..091ca03a 100644
--- a/src/components/Login.tsx
+++ b/src/components/Login.tsx
@@ -1,12 +1,74 @@
 import { useState } from 'react'
 
+interface UserProfile {
+  name?: string
+  username?: string
+  nip05?: string
+}
+
 interface LoginProps {
-  onLogin: (publicKey: string) => void
+  onLogin: (publicKey: string, profile: UserProfile) => void
 }
 
 const Login: React.FC<LoginProps> = ({ onLogin }) => {
   const [isConnecting, setIsConnecting] = useState(false)
 
+  const fetchUserProfile = async (publicKey: string): Promise<UserProfile> => {
+    try {
+      // Create a simple relay connection to fetch profile
+      const relay = new WebSocket('wss://relay.damus.io')
+      
+      return new Promise((resolve) => {
+        const timeout = setTimeout(() => {
+          relay.close()
+          resolve({}) // Return empty profile if timeout
+        }, 5000)
+
+        relay.onopen = () => {
+          // Request profile event (kind 0)
+          relay.send(JSON.stringify([
+            "REQ",
+            "profile",
+            {
+              "kinds": [0],
+              "authors": [publicKey]
+            }
+          ]))
+        }
+
+        relay.onmessage = (event) => {
+          try {
+            const data = JSON.parse(event.data)
+            if (data[0] === 'EVENT' && data[2]?.kind === 0) {
+              const profileEvent = data[2]
+              const profileContent = JSON.parse(profileEvent.content || '{}')
+              
+              clearTimeout(timeout)
+              relay.close()
+              
+              resolve({
+                name: profileContent.name,
+                username: profileContent.username,
+                nip05: profileContent.nip05
+              })
+            }
+          } catch (error) {
+            console.error('Error parsing profile:', error)
+          }
+        }
+
+        relay.onerror = () => {
+          clearTimeout(timeout)
+          relay.close()
+          resolve({}) // Return empty profile on error
+        }
+      })
+    } catch (error) {
+      console.error('Error fetching profile:', error)
+      return {}
+    }
+  }
+
   const handleLogin = async () => {
     try {
       setIsConnecting(true)
@@ -20,7 +82,9 @@ const Login: React.FC<LoginProps> = ({ onLogin }) => {
       const publicKey = await window.nostr.getPublicKey()
       
       if (publicKey) {
-        onLogin(publicKey)
+        // Fetch user profile from nostr
+        const profile = await fetchUserProfile(publicKey)
+        onLogin(publicKey, profile)
       } else {
         throw new Error('Failed to get public key')
       }
