diff --git a/services_api_key_auth.links.action.yml b/services_api_key_auth.links.action.yml
index 2a49e619bfa04f09678f24bfd98c90b523f6b3d6..41bbc3b065a1ba15f1e82c52d940aa607f98aefc 100644
--- a/services_api_key_auth.links.action.yml
+++ b/services_api_key_auth.links.action.yml
@@ -1,5 +1,11 @@
 entity.api_key.add_form:
   route_name: 'entity.api_key.add_form'
-  title: 'Add Api key'
+  title: 'Add api key'
+  appears_on:
+    - entity.api_key.collection
+
+services_api_key_auth.settings:
+  route_name: 'services_api_key_auth.api_key_auth_settings'
+  title: 'General settings'
   appears_on:
     - entity.api_key.collection
diff --git a/services_api_key_auth.links.menu.yml b/services_api_key_auth.links.menu.yml
index 498b1a7d44e5f9dd9bc8ad0df4245effed9eb02c..fb26ba05663b2d2c0f2090292ce7e776b86c6828 100644
--- a/services_api_key_auth.links.menu.yml
+++ b/services_api_key_auth.links.menu.yml
@@ -1,14 +1,20 @@
 # Api key menu items definition
 entity.api_key.collection:
-  title: 'API Key Auth provider'
+  title: 'Api key list'
   route_name: entity.api_key.collection
   description: 'Configure API Key registration for users'
   parent: system.admin_config_services
   weight: 99
 
-services_api_key_auth.api_key_auth_settings:
-  title: Request API Key Authentication settings
-  description: The request api key authentication settings
-  parent: system.admin_config_system
-  route_name: system.admin_config_services
-  weight: 10
+entity.api_key.add:
+  title: 'Add api key'
+  route_name: entity.api_key.add_form
+  parent: entity.api_key.collection
+  weight: 98
+
+services_api_key_auth.settings:
+  title: Api key authentication settings
+  description: The API Key Authentication settings
+  parent: entity.api_key.collection
+  route_name: services_api_key_auth.api_key_auth_settings
+  weight: 99
diff --git a/services_api_key_auth.routing.yml b/services_api_key_auth.routing.yml
index 7e8364ea83871214e43c2a794deaad18c0df1176..2131d1ef8a5fcf5380b467f13df636fbcaadd26b 100644
--- a/services_api_key_auth.routing.yml
+++ b/services_api_key_auth.routing.yml
@@ -1,30 +1,31 @@
 entity.api_key.collection:
-  path: '/admin/config/services/api_key'
+  path: '/admin/config/services/api-key-auth'
   defaults:
     _entity_list: 'api_key'
-    _title: 'Api Key List'
+    _title: 'Api key list'
   requirements:
     _permission: 'administer services_api_key_auth'
 
 entity.api_key.add_form:
-  path: '/admin/config/services/api_key/add'
+  path: '/admin/config/services/api-key-auth/add'
   defaults:
-    _title: 'Add Api keys'
+    _title: 'Add api key'
     _entity_form: 'api_key.add'
   requirements:
     _entity_create_access: 'api_key'
 
 entity.api_key.edit_form:
-  path: '/admin/config/services/api_key/{api_key}/edit'
+  path: '/admin/config/services/api-key-auth/{api_key}/edit'
   defaults:
-    _entity_form: 'api_key.add'
+    _title: 'Edit api key'
+    _entity_form: 'api_key.edit'
   requirements:
     _entity_access: 'api_key.edit'
 
 entity.api_key.delete_form:
-  path: '/admin/config/services/api_key/{api_key}/delete'
+  path: '/admin/config/services/api-key-auth/{api_key}/delete'
   defaults:
-    _title: 'Delete api_key'
+    _title: 'Delete api key'
     _entity_form: 'api_key.delete'
   requirements:
     _entity_access: 'api_key.delete'
@@ -34,9 +35,9 @@ entity.api_key.delete_form:
         with_config_overrides: TRUE
 
 services_api_key_auth.api_key_auth_settings:
-  path: '/admin/config/services/api-key-auth-settings'
+  path: '/admin/config/services/api-key-auth/settings'
   defaults:
-    _title: 'Request API Key Authentication settings'
+    _title: 'Api key authentication settings'
     _form: 'Drupal\services_api_key_auth\Form\ApiKeyAuthSettingsForm'
   requirements:
-    _permission: 'administer site configuration'
+    _permission: 'administer services_api_key_auth'