diff --git a/src/client/index.js b/src/client/index.js
index 260ba416..5155ac5f 100644
--- a/src/client/index.js
+++ b/src/client/index.js
@@ -45,7 +45,7 @@ const client = {
   manila,
   barbican,
   zun,
-  magnum
+  magnum,
 };
 
 window.client = client;
diff --git a/src/layouts/admin-menu.jsx b/src/layouts/admin-menu.jsx
index 5f0c1c9c..1be1c0a1 100644
--- a/src/layouts/admin-menu.jsx
+++ b/src/layouts/admin-menu.jsx
@@ -143,6 +143,7 @@ const renderMenu = (t) => {
           path: '/compute/baremetal-node-admin',
           name: t('Bare Metal Setting'),
           key: 'baremetalNodeAdmin',
+          endpoints: 'ironic',
           level: 1,
           children: [
             {
@@ -348,6 +349,7 @@ const renderMenu = (t) => {
           path: '/network/load-balancers-admin',
           name: t('Load Balancers'),
           key: 'lbAdmin',
+          endpoints: 'octavia',
           level: 1,
           children: [
             {
@@ -371,6 +373,7 @@ const renderMenu = (t) => {
           path: '/network/vpn-admin',
           name: t('VPN'),
           key: 'vpnAdmin',
+          endpoints: 'neutron_vpn',
           level: 1,
           children: [
             {
@@ -403,6 +406,7 @@ const renderMenu = (t) => {
       path: '/share',
       name: t('Share File Storage'),
       key: 'fileStorageAdmin',
+      endpoints: 'manilav2',
       icon: <SwitcherOutlined />,
       children: [
         {
@@ -410,7 +414,6 @@ const renderMenu = (t) => {
           name: t('Share'),
           key: 'shareAdmin',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-admin\/detail\/.[^/]+$/,
@@ -426,7 +429,6 @@ const renderMenu = (t) => {
           name: t('Share Type'),
           key: 'shareTypeAdmin',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-type-admin\/detail\/.[^/]+$/,
@@ -442,7 +444,6 @@ const renderMenu = (t) => {
           name: t('Share Group Type'),
           key: 'shareGroupTypeAdmin',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-group-type-admin\/detail\/.[^/]+$/,
@@ -458,7 +459,6 @@ const renderMenu = (t) => {
           name: t('Share Network'),
           key: 'shareNetworkAdmin',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-network-admin\/detail\/.[^/]+$/,
@@ -474,7 +474,6 @@ const renderMenu = (t) => {
           name: t('Share Server'),
           key: 'shareServerAdmin',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-server-admin\/detail\/.[^/]+$/,
@@ -490,7 +489,6 @@ const renderMenu = (t) => {
           name: t('Share Instance'),
           key: 'shareInstanceAdmin',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-instance-admin\/detail\/.[^/]+$/,
@@ -506,7 +504,6 @@ const renderMenu = (t) => {
           name: t('Share Group'),
           key: 'shareGroupAdmin',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-group-admin\/detail\/.[^/]+$/,
@@ -681,6 +678,7 @@ const renderMenu = (t) => {
       path: '/heat',
       name: t('Orchestration'),
       key: 'heatAdmin',
+      endpoints: 'heats',
       icon: <AppstoreOutlined />,
       children: [
         {
diff --git a/src/layouts/menu.jsx b/src/layouts/menu.jsx
index ec206637..b2082db6 100644
--- a/src/layouts/menu.jsx
+++ b/src/layouts/menu.jsx
@@ -204,6 +204,7 @@ const renderMenu = (t) => {
           path: '/storage/container',
           name: t('Object Storage'),
           key: 'container',
+          endpoints: 'swift',
           level: 1,
           children: [
             {
@@ -323,6 +324,7 @@ const renderMenu = (t) => {
           path: '/network/load-balancers',
           name: t('Load Balancers'),
           key: 'lb',
+          endpoints: 'octavia',
           level: 1,
           children: [
             {
@@ -374,6 +376,7 @@ const renderMenu = (t) => {
           path: '/network/vpn',
           name: t('VPN'),
           key: 'vpn',
+          endpoints: 'neutron_vpn',
           level: 1,
           children: [
             {
@@ -406,6 +409,7 @@ const renderMenu = (t) => {
       path: '/share',
       name: t('Share File Storage'),
       key: 'fileStorage',
+      endpoints: 'manilav2',
       icon: <SwitcherOutlined />,
       children: [
         {
@@ -413,7 +417,6 @@ const renderMenu = (t) => {
           name: t('Share'),
           key: 'share',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share\/detail\/.[^/]+$/,
@@ -435,7 +438,6 @@ const renderMenu = (t) => {
           name: t('Share Network'),
           key: 'shareNetwork',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-network\/detail\/.[^/]+$/,
@@ -451,7 +453,6 @@ const renderMenu = (t) => {
           name: t('Share Group'),
           key: 'shareGroup',
           level: 1,
-          endpoints: 'manilav2',
           children: [
             {
               path: /^\/share\/share-group\/detail\/.[^/]+$/,
@@ -491,6 +492,7 @@ const renderMenu = (t) => {
       path: '/heat',
       name: t('Orchestration'),
       key: 'heat',
+      endpoints: 'heat',
       icon: <AppstoreOutlined />,
       children: [
         {
@@ -527,6 +529,7 @@ const renderMenu = (t) => {
       path: '/database',
       name: t('Database'),
       key: 'database',
+      endpoints: 'trove',
       icon: <DatabaseFilled />,
       children: [
         {
@@ -592,6 +595,7 @@ const renderMenu = (t) => {
           path: '/container/containers',
           name: t('Containers'),
           key: 'zunContainers',
+          endpoints: 'zun',
           level: 1,
           children: [
             {
@@ -613,6 +617,7 @@ const renderMenu = (t) => {
           path: '/container/capsules',
           name: t('Capsules'),
           key: 'zunCapsules',
+          endpoints: 'zun',
           level: 1,
           children: [
             {
@@ -628,6 +633,7 @@ const renderMenu = (t) => {
           path: '/container-infra/clusters',
           name: t('Clusters'),
           key: 'containerInfraClusters',
+          endpoints: 'magnum',
           level: 1,
           children: [
             {
@@ -649,6 +655,7 @@ const renderMenu = (t) => {
           path: '/container-infra/cluster-template',
           name: t('Cluster Template'),
           key: 'clusterTemplate',
+          endpoints: 'magnum',
           level: 1,
           children: [
             {