diff --git a/frontend/src/NetworkConfigManager.jsx b/frontend/src/NetworkConfigManager.jsx
index 91886e7..5c147d0 100644
--- a/frontend/src/NetworkConfigManager.jsx
+++ b/frontend/src/NetworkConfigManager.jsx
@@ -1412,16 +1412,6 @@ function NetworkConfigManager() {
                 Провайдер будет автоматически взят из данных сервера
               </div>
             </div>
-            <div className="col-md-6">
-              <FormField
-                label="Имя"
-                name="name"
-                value={editingGateway.name}
-                onChange={(val) => setEditingGateway({ ...editingGateway, name: val })}
-                placeholder="SWE-IHOR"
-                required
-              />
-            </div>
             <div className="col-md-6">
               <FormField
                 label="IP адрес"
@@ -1429,6 +1419,16 @@ function NetworkConfigManager() {
                 value={editingGateway.ip}
                 onChange={(val) => setEditingGateway({ ...editingGateway, ip: val })}
                 placeholder="94.142.140.1"
+                required
+              />
+            </div>
+            <div className="col-md-6">
+              <FormField
+                label="Комментарий"
+                name="description"
+                value={editingGateway.description}
+                onChange={(val) => setEditingGateway({ ...editingGateway, description: val })}
+                placeholder="Основной выход через Cloudflare"
               />
             </div>
             <div className="col-md-6">
@@ -1465,7 +1465,7 @@ function NetworkConfigManager() {
                     .filter(g => g.id !== editingGateway.id && g.type === 'direct')
                     .map(g => (
                       <option key={g.id} value={g.id}>
-                        {g.name} {g.ip ? `(${g.ip})` : ''}
+                        {g.ip || g.name} {g.description ? `(${g.description})` : ''}
                       </option>
                     ))}
                 </select>
@@ -1474,15 +1474,6 @@ function NetworkConfigManager() {
                 </div>
               </div>
             )}
-            <div className="col-12">
-              <FormField
-                label="Описание"
-                name="description"
-                value={editingGateway.description}
-                onChange={(val) => setEditingGateway({ ...editingGateway, description: val })}
-                placeholder="Основной выход через Cloudflare"
-              />
-            </div>
             {editingGateway.serverId && (() => {
               const server = getServerInfo(editingGateway.serverId);
               return server ? (