diff --git a/src/components/nostr/ChatComponent.vue b/src/components/nostr/ChatComponent.vue
index 3b7105f..55d95a9 100644
--- a/src/components/nostr/ChatComponent.vue
+++ b/src/components/nostr/ChatComponent.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col h-full">
     <!-- Mobile: Peer List View -->
-    <div v-if="!selectedPeer || (isMobile && !showChat)" class="flex flex-col h-full">
+    <div v-if="isMobile && (!selectedPeer || !showChat)" class="flex flex-col h-full">
       <!-- Header -->
       <div class="flex items-center justify-between p-4 border-b">
         <div class="flex items-center space-x-3">
@@ -60,26 +60,26 @@
     <div v-else-if="isMobile && showChat" class="flex flex-col h-full">
       <!-- Chat Header with Back Button -->
       <div class="flex items-center justify-between p-4 border-b">
-        <div class="flex items-center space-x-3">
-          <Button 
-            variant="ghost" 
-            size="icon" 
-            @click="goBackToPeers"
-            class="mr-2"
-          >
-            <ArrowLeft class="h-5 w-5" />
-          </Button>
-          <Avatar class="h-8 w-8">
-            <AvatarImage v-if="getPeerAvatar(selectedPeer)" :src="getPeerAvatar(selectedPeer)!" />
-            <AvatarFallback>{{ getPeerInitials(selectedPeer) }}</AvatarFallback>
-          </Avatar>
-          <div>
-            <h3 class="font-medium">{{ selectedPeer.username || 'Unknown User' }}</h3>
-            <p class="text-xs text-muted-foreground">
-              {{ formatPubkey(selectedPeer.pubkey) }}
-            </p>
+                  <div class="flex items-center space-x-3">
+            <Button 
+              variant="ghost" 
+              size="icon" 
+              @click="goBackToPeers"
+              class="mr-2"
+            >
+              <ArrowLeft class="h-5 w-5" />
+            </Button>
+            <Avatar class="h-8 w-8">
+              <AvatarImage v-if="selectedPeer && getPeerAvatar(selectedPeer)" :src="getPeerAvatar(selectedPeer)!" />
+              <AvatarFallback>{{ selectedPeer ? getPeerInitials(selectedPeer) : 'U' }}</AvatarFallback>
+            </Avatar>
+            <div>
+              <h3 class="font-medium">{{ selectedPeer?.username || 'Unknown User' }}</h3>
+              <p class="text-xs text-muted-foreground">
+                {{ selectedPeer ? formatPubkey(selectedPeer.pubkey) : '' }}
+              </p>
+            </div>
           </div>
-        </div>
         <Badge v-if="isConnected" variant="default" class="text-xs">
           Connected
         </Badge>
@@ -134,114 +134,135 @@
     </div>
 
     <!-- Desktop: Split View -->
-    <div v-else class="flex flex-1 overflow-hidden">
-      <!-- Peer List -->
-      <div class="w-80 border-r bg-muted/30">
-        <div class="p-4 border-b">
-          <h3 class="font-medium">Peers ({{ peers.length }})</h3>
+    <div v-else-if="!isMobile" class="flex flex-col h-full">
+      <!-- Header -->
+      <div class="flex items-center justify-between p-4 border-b">
+        <div class="flex items-center space-x-3">
+          <h2 class="text-lg font-semibold">Chat</h2>
+          <Badge v-if="isConnected" variant="default" class="text-xs">
+            Connected
+          </Badge>
+          <Badge v-else variant="secondary" class="text-xs">
+            Disconnected
+          </Badge>
         </div>
-        <ScrollArea class="h-full">
-          <div class="p-2 space-y-1">
-            <div
-              v-for="peer in peers"
-              :key="peer.user_id"
-              @click="selectPeer(peer)"
-              :class="[
-                'flex items-center space-x-3 p-3 rounded-lg cursor-pointer transition-colors',
-                selectedPeer?.user_id === peer.user_id
-                  ? 'bg-primary text-primary-foreground'
-                  : 'hover:bg-muted'
-              ]"
-            >
-              <Avatar class="h-8 w-8">
-                <AvatarImage v-if="getPeerAvatar(peer)" :src="getPeerAvatar(peer)!" />
-                <AvatarFallback>{{ getPeerInitials(peer) }}</AvatarFallback>
-              </Avatar>
-              <div class="flex-1 min-w-0">
-                <p class="text-sm font-medium truncate">
-                  {{ peer.username || 'Unknown User' }}
-                </p>
-                <p class="text-xs text-muted-foreground truncate">
-                  {{ formatPubkey(peer.pubkey) }}
-                </p>
-              </div>
-            </div>
-          </div>
-        </ScrollArea>
+        <Button @click="refreshPeers" :disabled="isLoading" size="sm">
+          <RefreshCw v-if="isLoading" class="h-4 w-4 animate-spin" />
+          <RefreshCw v-else class="h-4 w-4" />
+          Refresh Peers
+        </Button>
       </div>
 
-      <!-- Chat Area -->
-      <div class="flex-1 flex flex-col">
-        <div v-if="selectedPeer" class="flex-1 flex flex-col">
-          <!-- Chat Header -->
+      <!-- Main Content -->
+      <div class="flex flex-1 overflow-hidden">
+        <!-- Peer List -->
+        <div class="w-80 border-r bg-muted/30">
           <div class="p-4 border-b">
-            <div class="flex items-center space-x-3">
-              <Avatar class="h-8 w-8">
-                <AvatarImage v-if="getPeerAvatar(selectedPeer)" :src="getPeerAvatar(selectedPeer)!" />
-                <AvatarFallback>{{ getPeerInitials(selectedPeer) }}</AvatarFallback>
-              </Avatar>
-              <div>
-                <h3 class="font-medium">{{ selectedPeer.username || 'Unknown User' }}</h3>
-                <p class="text-sm text-muted-foreground">
-                  {{ formatPubkey(selectedPeer.pubkey) }}
-                </p>
-              </div>
-            </div>
+            <h3 class="font-medium">Peers ({{ peers.length }})</h3>
           </div>
-
-          <!-- Messages -->
-          <ScrollArea class="flex-1 p-4">
-            <div class="space-y-4">
+          <ScrollArea class="h-full">
+            <div class="p-2 space-y-1">
               <div
-                v-for="message in currentMessages"
-                :key="message.id"
+                v-for="peer in peers"
+                :key="peer.user_id"
+                @click="selectPeer(peer)"
                 :class="[
-                  'flex',
-                  message.sent ? 'justify-end' : 'justify-start'
+                  'flex items-center space-x-3 p-3 rounded-lg cursor-pointer transition-colors',
+                  selectedPeer?.user_id === peer.user_id
+                    ? 'bg-primary text-primary-foreground'
+                    : 'hover:bg-muted'
                 ]"
               >
-                <div
-                  :class="[
-                    'max-w-xs lg:max-w-md px-4 py-2 rounded-lg',
-                    message.sent
-                      ? 'bg-primary text-primary-foreground'
-                      : 'bg-muted'
-                  ]"
-                >
-                  <p class="text-sm">{{ message.content }}</p>
-                  <p class="text-xs opacity-70 mt-1">
-                    {{ formatTime(message.created_at) }}
+                <Avatar class="h-8 w-8">
+                  <AvatarImage v-if="getPeerAvatar(peer)" :src="getPeerAvatar(peer)!" />
+                  <AvatarFallback>{{ getPeerInitials(peer) }}</AvatarFallback>
+                </Avatar>
+                <div class="flex-1 min-w-0">
+                  <p class="text-sm font-medium truncate">
+                    {{ peer.username || 'Unknown User' }}
+                  </p>
+                  <p class="text-xs text-muted-foreground truncate">
+                    {{ formatPubkey(peer.pubkey) }}
                   </p>
                 </div>
               </div>
             </div>
-            <div ref="messagesEndRef" />
           </ScrollArea>
-
-          <!-- Message Input -->
-          <div class="p-4 border-t">
-            <form @submit.prevent="sendMessage" class="flex space-x-2">
-              <Input
-                v-model="messageInput"
-                placeholder="Type a message..."
-                :disabled="!isConnected || !selectedPeer"
-                class="flex-1"
-              />
-              <Button type="submit" :disabled="!isConnected || !selectedPeer || !messageInput.trim()">
-                <Send class="h-4 w-4" />
-              </Button>
-            </form>
-          </div>
         </div>
 
-        <!-- No Peer Selected -->
-        <div v-else class="flex-1 flex items-center justify-center">
-          <div class="text-center">
-            <MessageSquare class="h-12 w-12 text-muted-foreground mx-auto mb-4" />
-            <h3 class="text-lg font-medium mb-2">No peer selected</h3>
-            <p class="text-muted-foreground">
-              Select a peer from the list to start chatting
-            </p>
+        <!-- Chat Area -->
+        <div class="flex-1 flex flex-col">
+          <div v-if="selectedPeer" class="flex-1 flex flex-col">
+            <!-- Chat Header -->
+            <div class="p-4 border-b">
+              <div class="flex items-center space-x-3">
+                <Avatar class="h-8 w-8">
+                  <AvatarImage v-if="getPeerAvatar(selectedPeer)" :src="getPeerAvatar(selectedPeer)!" />
+                  <AvatarFallback>{{ getPeerInitials(selectedPeer) }}</AvatarFallback>
+                </Avatar>
+                <div>
+                  <h3 class="font-medium">{{ selectedPeer.username || 'Unknown User' }}</h3>
+                  <p class="text-sm text-muted-foreground">
+                    {{ formatPubkey(selectedPeer.pubkey) }}
+                  </p>
+                </div>
+              </div>
+            </div>
+
+            <!-- Messages -->
+            <ScrollArea class="flex-1 p-4">
+              <div class="space-y-4">
+                <div
+                  v-for="message in currentMessages"
+                  :key="message.id"
+                  :class="[
+                    'flex',
+                    message.sent ? 'justify-end' : 'justify-start'
+                  ]"
+                >
+                  <div
+                    :class="[
+                      'max-w-xs lg:max-w-md px-4 py-2 rounded-lg',
+                      message.sent
+                        ? 'bg-primary text-primary-foreground'
+                        : 'bg-muted'
+                    ]"
+                  >
+                    <p class="text-sm">{{ message.content }}</p>
+                    <p class="text-xs opacity-70 mt-1">
+                      {{ formatTime(message.created_at) }}
+                    </p>
+                  </div>
+                </div>
+              </div>
+              <div ref="messagesEndRef" />
+            </ScrollArea>
+
+            <!-- Message Input -->
+            <div class="p-4 border-t">
+              <form @submit.prevent="sendMessage" class="flex space-x-2">
+                <Input
+                  v-model="messageInput"
+                  placeholder="Type a message..."
+                  :disabled="!isConnected || !selectedPeer"
+                  class="flex-1"
+                />
+                <Button type="submit" :disabled="!isConnected || !selectedPeer || !messageInput.trim()">
+                  <Send class="h-4 w-4" />
+                </Button>
+              </form>
+            </div>
+          </div>
+
+          <!-- No Peer Selected -->
+          <div v-else class="flex-1 flex items-center justify-center">
+            <div class="text-center">
+              <MessageSquare class="h-12 w-12 text-muted-foreground mx-auto mb-4" />
+              <h3 class="text-lg font-medium mb-2">No peer selected</h3>
+              <p class="text-muted-foreground">
+                Select a peer from the list to start chatting
+              </p>
+            </div>
           </div>
         </div>
       </div>