diff --git a/oauth.local_tasks.yml b/oauth.local_tasks.yml
new file mode 100644
index 0000000..53caafb
--- /dev/null
+++ b/oauth.local_tasks.yml
@@ -0,0 +1,4 @@
+oauth.user_consumer:
+  title: 'OAuth Consumers'
+  route_name: oauth.user_consumer
+  base_route: user.view
\ No newline at end of file
diff --git a/oauth.menu_links.yml b/oauth.menu_links.yml
new file mode 100644
index 0000000..c6fd8ee
--- /dev/null
+++ b/oauth.menu_links.yml
@@ -0,0 +1,6 @@
+oauth.admin_form:
+  title: OAuth
+  description: 'Settings for OAuth.'
+  parent: system.admin_config_system
+  route_name: oauth.admin_form
+
diff --git a/oauth.module b/oauth.module
index e531e8a..4a46404 100644
--- a/oauth.module
+++ b/oauth.module
@@ -52,13 +52,6 @@ function oauth_menu() {
     'file' => 'oauth.admin.inc',
   );
 
-  $menu['admin/config/services/oauth'] = array(
-    'title' => 'OAuth',
-    'description' => 'Settings for OAuth',
-    'route_name' => 'oauth.admin_form',
-    'type' => MENU_NORMAL_ITEM,
-  );
-
   $menu['admin/config/services/oauth/settings'] = array(
     'title' => 'Settings',
     'description' => 'Settings for OAuth',
@@ -121,18 +114,6 @@ function oauth_menu() {
     'type' => MENU_CALLBACK,
   );
 
-  $menu['user/%user/oauth/consumer'] = array(
-    'title' => 'OAuth Consumers',
-    'route_name' => 'oauth.user_consumer',
-    'type' => MENU_LOCAL_TASK,
-  );
-
-  $menu['user/%user/oauth/consumer/add'] = array(
-    'title' => 'Add an OAuth Consumer',
-    'route_name' => 'oauth.user_consumer_add',
-    'type' => MENU_CALLBACK,
-  );
-
   return $menu;
 }
 
diff --git a/oauth.routing.yml b/oauth.routing.yml
index 158c702..d53d1ab 100644
--- a/oauth.routing.yml
+++ b/oauth.routing.yml
@@ -16,6 +16,7 @@ oauth.user_consumer_add:
   path: 'oauth/consumer/add'
   defaults:
     _form: 'Drupal\oauth\Form\OAuthAddConsumerForm'
+    _title: 'Add an OAuth Consumer'
   requirements:
     _permission: 'access own consumers'
 
@@ -24,4 +25,4 @@ oauth.user_consumer_delete:
   defaults:
     _form: 'Drupal\oauth\Form\OAuthDeleteConsumerForm'
   requirements:
-    _permission: 'access own consumers'
+    _permission: 'access own consumers'
\ No newline at end of file
