diff --git a/luci-app-secubox/htdocs/luci-static/resources/view/secubox/dashboard.js b/luci-app-secubox/htdocs/luci-static/resources/view/secubox/dashboard.js
index 1f0ed9ef..f5def109 100644
--- a/luci-app-secubox/htdocs/luci-static/resources/view/secubox/dashboard.js
+++ b/luci-app-secubox/htdocs/luci-static/resources/view/secubox/dashboard.js
@@ -130,7 +130,8 @@ return view.extend({
 			{ id: 'all', label: _('All Modules') },
 			{ id: 'security', label: _('Security') },
 			{ id: 'network', label: _('Network') },
-			{ id: 'services', label: _('Services') }
+			{ id: 'services', label: _('Services') },
+			{ id: 'system', label: _('System') }
 		];
 
 		return E('section', { 'class': 'sb-card' }, [
diff --git a/luci-app-secubox/root/usr/share/luci/menu.d/luci-app-secubox.json b/luci-app-secubox/root/usr/share/luci/menu.d/luci-app-secubox.json
index 9fed9eff..6e84eaa4 100644
--- a/luci-app-secubox/root/usr/share/luci/menu.d/luci-app-secubox.json
+++ b/luci-app-secubox/root/usr/share/luci/menu.d/luci-app-secubox.json
@@ -38,12 +38,75 @@
         "title": "System Monitoring",
         "order": 10,
         "action": {"type": "view", "path": "secubox/monitoring"}
-    },
-    "admin/secubox/network": {
-        "title": "Network & Connectivity",
-        "order": 40,
-        "action": {"type": "firstchild"}
-    },
+	},
+	"admin/secubox/network": {
+		"title": "Network & Connectivity",
+		"order": 40,
+		"action": {"type": "firstchild"}
+	},
+	"admin/secubox/network/modes": {
+		"title": "Network Modes",
+		"order": 10,
+		"action": {"type": "firstchild"},
+		"depends": {
+			"acl": ["luci-app-network-modes"]
+		}
+	},
+	"admin/secubox/network/modes/overview": {
+		"title": "Overview",
+		"order": 10,
+		"action": {"type": "view", "path": "network-modes/overview"}
+	},
+	"admin/secubox/network/modes/wizard": {
+		"title": "Mode Wizard",
+		"order": 20,
+		"action": {"type": "view", "path": "network-modes/wizard"}
+	},
+	"admin/secubox/network/modes/router": {
+		"title": "Router Mode",
+		"order": 30,
+		"action": {"type": "view", "path": "network-modes/router"}
+	},
+	"admin/secubox/network/modes/multiwan": {
+		"title": "Multi-WAN Mode",
+		"order": 35,
+		"action": {"type": "view", "path": "network-modes/multiwan"}
+	},
+	"admin/secubox/network/modes/doublenat": {
+		"title": "Double NAT Mode",
+		"order": 37,
+		"action": {"type": "view", "path": "network-modes/doublenat"}
+	},
+	"admin/secubox/network/modes/accesspoint": {
+		"title": "Access Point Mode",
+		"order": 40,
+		"action": {"type": "view", "path": "network-modes/accesspoint"}
+	},
+	"admin/secubox/network/modes/relay": {
+		"title": "Relay Mode",
+		"order": 50,
+		"action": {"type": "view", "path": "network-modes/relay"}
+	},
+	"admin/secubox/network/modes/vpnrelay": {
+		"title": "VPN Relay Mode",
+		"order": 52,
+		"action": {"type": "view", "path": "network-modes/vpnrelay"}
+	},
+	"admin/secubox/network/modes/travel": {
+		"title": "Travel Mode",
+		"order": 55,
+		"action": {"type": "view", "path": "network-modes/travel"}
+	},
+	"admin/secubox/network/modes/sniffer": {
+		"title": "Sniffer Mode",
+		"order": 60,
+		"action": {"type": "view", "path": "network-modes/sniffer"}
+	},
+	"admin/secubox/network/modes/settings": {
+		"title": "Settings",
+		"order": 90,
+		"action": {"type": "view", "path": "network-modes/settings"}
+	},
     "admin/secubox/system": {
         "title": "System & Performance",
         "order": 50,