diff --git a/luci-app-dockerman/htdocs/luci-static/resources/dockerman/common.js b/luci-app-dockerman/htdocs/luci-static/resources/dockerman/common.js
index 4425ecd9..9e9d89ea 100644
--- a/luci-app-dockerman/htdocs/luci-static/resources/dockerman/common.js
+++ b/luci-app-dockerman/htdocs/luci-static/resources/dockerman/common.js
@@ -437,7 +437,7 @@ const dv = view.extend({
 	outputText: '', // Initialize output text
 
 	get dockerman_url() {
-		return L.url('admin/services/dockerman');
+		return L.url('admin/dockerman');
 	},
 
 	parseHeaders(headers, array) {
diff --git a/luci-app-dockerman/root/usr/share/luci/menu.d/luci-app-dockerman.json b/luci-app-dockerman/root/usr/share/luci/menu.d/luci-app-dockerman.json
index 0cc3995d..b818a854 100644
--- a/luci-app-dockerman/root/usr/share/luci/menu.d/luci-app-dockerman.json
+++ b/luci-app-dockerman/root/usr/share/luci/menu.d/luci-app-dockerman.json
@@ -1,7 +1,7 @@
 {
-	"admin/services/dockerman": {
-		"title": "Dockerman JS",
-		"order": "60",
+	"admin/dockerman": {
+		"title": "Docker",
+		"order": "40",
 		"action": {
 			"type": "firstchild"
 		},
@@ -15,7 +15,7 @@
 		}
 	},
 
-	"admin/services/dockerman/overview": {
+	"admin/dockerman/overview": {
 		"title": "Overview",
 		"order": 1,
 		"action": {
@@ -24,7 +24,7 @@
 		}
 	},
 
-	"admin/services/dockerman/configuration": {
+	"admin/dockerman/configuration": {
 		"title": "Configuration",
 		"order": 2,
 		"action": {
@@ -33,14 +33,14 @@
 		}
 	},
 
-	"admin/services/dockerman/container/archive/*": {
+	"admin/dockerman/container/archive/*": {
 		"action": {
 			"type": "alias",
-			"path": "admin/services/dockerman/containers"
+			"path": "admin/dockerman/containers"
 		}
 	},
 
-	"admin/services/dockerman/container/archive/put/*": {
+	"admin/dockerman/container/archive/put/*": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -52,7 +52,7 @@
 		}
 	},
 
-	"admin/services/dockerman/container/archive/get/*": {
+	"admin/dockerman/container/archive/get/*": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -64,7 +64,7 @@
 		}
 	},
 
-	"admin/services/dockerman/container/export/*": {
+	"admin/dockerman/container/export/*": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -76,7 +76,7 @@
 		}
 	},
 
-	"admin/services/dockerman/container/*": {
+	"admin/dockerman/container/*": {
 		"title_hide": "Container",
 		"action": {
 			"type": "view",
@@ -84,7 +84,7 @@
 		}
 	},
 
-	"admin/services/dockerman/containers": {
+	"admin/dockerman/containers": {
 		"title": "Containers",
 		"order": 3,
 		"action": {
@@ -93,7 +93,7 @@
 		}
 	},
 
-	"admin/services/dockerman/containers/prune": {
+	"admin/dockerman/containers/prune": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -106,14 +106,14 @@
 		}
 	},
 
-	"admin/services/dockerman/container": {
+	"admin/dockerman/container": {
 		"action": {
 			"type": "alias",
-			"path": "admin/services/dockerman/containers"
+			"path": "admin/dockerman/containers"
 		}
 	},
 
-	"admin/services/dockerman/container_new": {
+	"admin/dockerman/container_new": {
 		"title_hide": "Container",
 		"action": {
 			"type": "view",
@@ -121,7 +121,7 @@
 		}
 	},
 
-	"admin/services/dockerman/images/build": {
+	"admin/dockerman/images/build": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -134,7 +134,7 @@
 		}
 	},
 
-	"admin/services/dockerman/images/build/prune": {
+	"admin/dockerman/images/build/prune": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -147,7 +147,7 @@
 		}
 	},
 
-	"admin/services/dockerman/images/get/*": {
+	"admin/dockerman/images/get/*": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -159,7 +159,7 @@
 		}
 	},
 
-	"admin/services/dockerman/images/load": {
+	"admin/dockerman/images/load": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -172,7 +172,7 @@
 		}
 	},
 
-	"admin/services/dockerman/images/prune": {
+	"admin/dockerman/images/prune": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -185,7 +185,7 @@
 		}
 	},
 
-	"admin/services/dockerman/images": {
+	"admin/dockerman/images": {
 		"title": "Images",
 		"order": 4,
 		"action": {
@@ -194,7 +194,7 @@
 		}
 	},
 
-	"admin/services/dockerman/images/create": {
+	"admin/dockerman/images/create": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -207,7 +207,7 @@
 		}
 	},
 
-	"admin/services/dockerman/images/push/*": {
+	"admin/dockerman/images/push/*": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -220,14 +220,14 @@
 		}
 	},
 
-	"admin/services/dockerman/image": {
+	"admin/dockerman/image": {
 		"action": {
 			"type": "alias",
-			"path": "admin/services/dockerman/images"
+			"path": "admin/dockerman/images"
 		}
 	},
 
-	"admin/services/dockerman/network/*": {
+	"admin/dockerman/network/*": {
 		"title_hide": "Network",
 		"action": {
 			"type": "view",
@@ -235,7 +235,7 @@
 		}
 	},
 
-	"admin/services/dockerman/networks": {
+	"admin/dockerman/networks": {
 		"title": "Networks",
 		"order": 5,
 		"action": {
@@ -244,7 +244,7 @@
 		}
 	},
 
-	"admin/services/dockerman/networks/prune": {
+	"admin/dockerman/networks/prune": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -257,7 +257,7 @@
 		}
 	},
 
-	"admin/services/dockerman/network_new": {
+	"admin/dockerman/network_new": {
 		"title_hide": "Network",
 		"action": {
 			"type": "view",
@@ -265,14 +265,14 @@
 		}
 	},
 
-	"admin/services/dockerman/network": {
+	"admin/dockerman/network": {
 		"action": {
 			"type": "alias",
-			"path": "admin/services/dockerman/networks"
+			"path": "admin/dockerman/networks"
 		}
 	},
 
-	"admin/services/dockerman/volumes": {
+	"admin/dockerman/volumes": {
 		"title": "Volumes",
 		"order": 6,
 		"action": {
@@ -281,7 +281,7 @@
 		}
 	},
 
-	"admin/services/dockerman/volumes/prune": {
+	"admin/dockerman/volumes/prune": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -294,7 +294,7 @@
 		}
 	},
 
-	"admin/services/dockerman/docker/events": {
+	"admin/dockerman/docker/events": {
 		"action": {
 			"type": "function",
 			"module": "luci.controller.docker",
@@ -307,7 +307,7 @@
 		}
 	},
 
-	"admin/services/dockerman/events": {
+	"admin/dockerman/events": {
 		"title": "Events",
 		"order": 7,
 		"action": {