diff --git a/index.php b/index.php
index cd80336..2025141 100644
--- a/index.php
+++ b/index.php
@@ -260,11 +260,20 @@ $projectImageUrl = $_SERVER['PROJECT_IMAGE_URL'] ?? '';
                         }
                     }
                     echo htmlspecialchars($active_server_name); 
-                    if ($is_owner || $can_manage_server): ?>
-                        <span class="ms-auto" style="cursor: pointer;" data-bs-toggle="modal" data-bs-target="#serverSettingsModal">
-                            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 5v.01M12 12v.01M12 19v.01M12 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm0 7a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm0 7a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/></svg>
-                        </span>
-                    <?php endif;
+                    ?>
+                    <div class="ms-auto d-flex align-items-center">
+                        <?php if ($can_manage_channels): ?>
+                            <span class="add-channel-btn me-2" style="cursor: pointer; opacity: 0.7;" data-bs-toggle="modal" data-bs-target="#addChannelModal" data-type="chat" data-category-id="" title="Create Channel">
+                                <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="12" y1="5" x2="12" y2="19"></line><line x1="5" y1="12" x2="19" y2="12"></line></svg>
+                            </span>
+                        <?php endif; ?>
+                        <?php if ($is_owner || $can_manage_server): ?>
+                            <span style="cursor: pointer; opacity: 0.7;" data-bs-toggle="modal" data-bs-target="#serverSettingsModal" title="Server Settings">
+                                <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 5v.01M12 12v.01M12 19v.01M12 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm0 7a1 1 0 1 1 0-2 1 1 0 0 1 0 2zm0 7a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/></svg>
+                            </span>
+                        <?php endif; ?>
+                    </div>
+                    <?php
                 }
             ?>
         </div>
@@ -283,8 +292,8 @@ $projectImageUrl = $_SERVER['PROJECT_IMAGE_URL'] ?? '';
                 <?php
                 // Separate categories and channels
                 $categories = array_filter($channels, function($c) { return $c['type'] === 'category'; });
-                $top_level_channels = array_filter($channels, function($c) { 
-                    return $c['type'] !== 'category' && (empty($c['category_id']) || !in_array($c['category_id'], array_column($GLOBALS['channels'] ?? [], 'id'))); 
+                $top_level_channels = array_filter($channels, function($c) use ($channels) { 
+                    return $c['type'] !== 'category' && (empty($c['category_id']) || !in_array($c['category_id'], array_column($channels, 'id'))); 
                 });
                 
                 // Helper to render a channel item
@@ -995,6 +1004,7 @@ $projectImageUrl = $_SERVER['PROJECT_IMAGE_URL'] ?? '';
                 <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
             </div>
             <form action="api_v1_channels.php" method="POST">
+                <input type="hidden" name="action" value="create">
                 <input type="hidden" name="server_id" value="<?php echo $active_server_id; ?>">
                 <div class="modal-body">
                     <div class="mb-3">