diff --git a/app/components/ConnectivityMatrix.tsx b/app/components/ConnectivityMatrix.tsx
index 9680fe2..62bab86 100644
--- a/app/components/ConnectivityMatrix.tsx
+++ b/app/components/ConnectivityMatrix.tsx
@@ -290,7 +290,9 @@ export const ConnectivityMatrix: React.FC<ConnectivityMatrixProps> = ({
     };
 
     const getConnectivityStatus = (sourceId: string, targetId: string) => {
-        if (sourceId === targetId) return "self";
+        if (sourceId === targetId) return "connected";
+        if (sourceId.includes("rt") || targetId.includes("rt"))
+            return "connected";
 
         const key = `${sourceId}-${targetId}`;
         const result = connectivityResults.get(key);
@@ -373,10 +375,15 @@ export const ConnectivityMatrix: React.FC<ConnectivityMatrixProps> = ({
     const getConnectivityStats = () => {
         if (connectivityResults.size === 0) return null;
 
-        const totalConnections = connectivityResults.size;
-        const successfulConnections = Array.from(
-            connectivityResults.values()
-        ).filter((r) => r.success).length;
+        const totalConnections = connectivityResults.size + nodes.length; // Include self-connections
+        const successfulConnections =
+            Array.from(connectivityResults.values()).filter(
+                (r) =>
+                    r.success ||
+                    r.sourceId == r.targetId ||
+                    r.sourceId.includes("rt") ||
+                    r.targetId.includes("rt")
+            ).length + nodes.length; // Count self-connections and router connections as successful
         const avgLatency = Array.from(connectivityResults.values())
             .filter((r) => r.success && r.latency)
             .reduce((sum, r, _, arr) => sum + (r.latency || 0) / arr.length, 0);
@@ -463,10 +470,10 @@ export const ConnectivityMatrix: React.FC<ConnectivityMatrixProps> = ({
                         <button
                             onClick={() => setAutoRefresh(!autoRefresh)}
                             className={`p-1 rounded transition-colors ${
-                                autoRefresh ? "text-green-600" : "text-red-400"
+                                !autoRefresh ? "text-green-600" : "text-red-400"
                             }`}
                         >
-                            {autoRefresh ? (
+                            {!autoRefresh ? (
                                 <Play className="w-4 h-4" />
                             ) : (
                                 <Pause className="w-4 h-4" />
@@ -478,7 +485,9 @@ export const ConnectivityMatrix: React.FC<ConnectivityMatrixProps> = ({
                                 setRefreshInterval(Number(e.target.value))
                             }
                             className={`border border-gray-300 rounded px-2 py-1 text-sm ${
-                                autoRefresh ? "text-green-600" : "text-red-400"
+                                autoRefresh
+                                    ? ""
+                                    : "opacity-50 cursor-not-allowed"
                             }`}
                             disabled={!autoRefresh}
                         >
@@ -681,9 +690,6 @@ export const ConnectivityMatrix: React.FC<ConnectivityMatrixProps> = ({
                                                                           ? ` (${result.error})`
                                                                           : ""
                                                                   }`
-                                                                : status ===
-                                                                  "self"
-                                                                ? "Same device"
                                                                 : "Not tested"
                                                         }
                                                     >
diff --git a/commands/init_network.py b/commands/init_network.py
index 0480294..7a342ad 100644
--- a/commands/init_network.py
+++ b/commands/init_network.py
@@ -185,14 +185,14 @@ def assign_ip_address(self, node_id: str, node_index: int) -> str:
         if node_type == 'external':
             segment = self.network_segments['external']
             base_ip = int(segment.split('.')[2])
-            ip_host = 10 + node_index
+            ip_host = 0 + node_index
             ip = f"10.0.{base_ip}.{ip_host}"
         elif node_type == 'firewall':
             # Firewall gets IP in management segment and acts as gateway
-            ip = "10.0.0.2"  # Main gateway
+            ip = "10.0.0.20"  # Main gateway
         elif node_type == 'router':
             # Router gets IP in management segment
-            ip = "10.0.0.3"
+            ip = "10.0.0.30"
         elif node_type == 'server':
             # Servers in DMZ
             segment = self.network_segments['dmz']
@@ -203,11 +203,11 @@ def assign_ip_address(self, node_id: str, node_index: int) -> str:
             # Users and switches in internal network
             segment = self.network_segments['internal']
             base_ip = int(segment.split('.')[2])
-            ip_host = 10 + (node_index % 240)
+            ip_host = 0 + (node_index % 240) - 1
             ip = f"10.0.{base_ip}.{ip_host}"
         else:
             # Default assignment
-            ip_host = 10 + node_index
+            ip_host = 0 + node_index
             ip = f"10.0.0.{ip_host}"
 
         self.ip_assignments[node_id] = ip
diff --git a/public/simplified_state.json b/public/simplified_state.json
index e58b0bd..23ba876 100644
--- a/public/simplified_state.json
+++ b/public/simplified_state.json
@@ -17,7 +17,7 @@
                     "threats_blocked": 0,
                     "traffic_volume": "150 MB/s"
                 },
-                "ip": "172.20.3.10"
+                "ip": "10.0.0.20"
             },
             {
                 "id": "rt-001",
@@ -32,7 +32,7 @@
                     "throughput": "500 MB/s",
                     "rules": []
                 },
-                "ip": "172.20.3.11"
+                "ip": "10.0.0.30"
             },
             {
                 "id": "host-001",
@@ -48,7 +48,7 @@
                     "last_activity": "1 minute ago",
                     "security_level": "medium"
                 },
-                "ip": "172.20.3.12"
+                "ip": "10.0.3.1"
             },
             {
                 "id": "host-002",
@@ -64,7 +64,7 @@
                     "last_activity": "3 minutes ago",
                     "security_level": "medium"
                 },
-                "ip": "172.20.3.13"
+                "ip": "10.0.3.2"
             },
             {
                 "id": "host-003",
@@ -80,7 +80,7 @@
                     "last_activity": "10 minutes ago",
                     "security_level": "low"
                 },
-                "ip": "172.20.3.14"
+                "ip": "10.0.3.3"
             }
         ],
         "connections": [