diff --git a/services_keyauth.admin.inc b/services_keyauth.admin.inc
index 58dc2e3..cdd0df3 100644
--- a/services_keyauth.admin.inc
+++ b/services_keyauth.admin.inc
@@ -24,10 +24,10 @@ function services_keyauth_admin_keys_list() {
     $operations = array();
 
     // Set the edit column.
-    $operations[] = array('data' => l(t('edit'), 'admin/build/services/keys/'. $kid));
+    $operations[] = array('data' => l(t('edit'), 'admin/settings/services_keyauth/keys/' . $kid));
 
     // Set the delete column.
-    $operations[] = array('data' => l(t('delete'), 'admin/build/services/keys/'. $kid .'/delete'));
+    $operations[] = array('data' => l(t('delete'), 'admin/settings/services_keyauth/keys/'. $kid .'/delete'));
 
     foreach ($operations as $operation) {
       $row[] = $operation;
@@ -89,7 +89,7 @@ function services_keyauth_admin_keys_form() {
     '#required'       => TRUE,
   );
 
-  $methods = services_get_all();
+/*$methods = services_get_all();
   foreach ($methods as $method) {
     $form_methods[$method['method']] = $method['method'];
   }
@@ -101,7 +101,7 @@ function services_keyauth_admin_keys_form() {
     '#default_value' => $accessible_methods,
     '#description' => t('Define which methods are accessible.'),
   );
-
+*/
   $form['submit'] = array(
     '#type'           => 'submit',
     '#value'          => $key_title != '' ? t('Save key') : t('Create key'),
@@ -129,7 +129,7 @@ function services_keyauth_admin_keys_form_validate($form, &$form_state) {
 function services_keyauth_admin_keys_form_submit($form, &$form_state) {
   services_keyauth_admin_keys_save($form_state['values']);
 
-  $form_state['redirect']  =  'admin/build/services/keys';
+  $form_state['redirect']  =  'admin/settings/services_keyauth/keys';
 }
 
 /**
@@ -189,7 +189,7 @@ function services_keyauth_admin_keys_delete_confirm(&$form_state, $kid = 0) {
 
   $caption .= '<p>'. t('This action cannot be undone.') .'</p>';
 
-  return confirm_form($form, $message, 'admin/build/services/keys', $caption, t('Delete'));
+  return confirm_form($form, $message, 'admin/settings/services_keyauth/keys', $caption, t('Delete'));
 }
 
 /**
@@ -202,5 +202,5 @@ function services_keyauth_admin_keys_delete_confirm_submit($form, &$form_state)
   drupal_set_message(t('The key %key has been deleted.', $t_args));
   watchdog('menu', 'Deleted key %key.', $t_args, WATCHDOG_NOTICE);
 
-  $form_state['redirect'] = 'admin/build/services/keys';
+  $form_state['redirect'] = 'admin/settings/services_keyauth/keys';
 }
\ No newline at end of file
diff --git a/services_keyauth.module b/services_keyauth.module
index e92c7ae..52c4148 100644
--- a/services_keyauth.module
+++ b/services_keyauth.module
@@ -18,7 +18,7 @@ function services_keyauth_cron() {
  * Determine whether the current user has access to a keys configuration.
  */
 function services_keyauth_access() {
-  return user_access('administer services') && variable_get('services_use_key', TRUE);
+  return user_access('administer services');// && variable_get('services_use_key', TRUE);
 }
 
 /**
@@ -32,9 +32,6 @@ function services_keyauth_authentication_info() {
     'security_settings' => '_services_keyauth_security_settings',
     'security_settings_validate' => '_services_keyauth_security_settings_validate',
     'security_settings_submit' => '_services_keyauth_security_settings_submit',
-    'alter_methods' => '_services_keyauth_alter_methods',
-    'alter_browse_form' => '_services_keyauth_alter_browse_form',
-    'alter_browse_form_submit' => '_services_keyauth_alter_browse_form_submit',
     'authenticate_call' => '_services_keyauth_authenticate_call',
   );
 }
@@ -45,15 +42,31 @@ function services_keyauth_authentication_info() {
 function services_keyauth_menu() {
   $items = array();
 
-  $items['admin/build/services/keys'] = array(
+  $items['admin/settings/services_keyauth'] = array(
+    'title'             => t('Services Keys Auth'),
+    'description'       => t('Keys used for authentication with Services module.'),
+    'type'              => MENU_NORMAL_ITEM,
+    'page callback'     => 'services_keyauth_admin_keys_list',
+    'access callback'   => 'services_keyauth_access',
+    'file'              => 'services_keyauth.admin.inc',
+  );
+  $items['admin/settings/services_keyauth/keys'] = array(
     'title'             => 'Keys',
     'description'       => 'Manage application access to site services.',
-    'page callback'     => 'services_keyauth_admin_keys_list',
+    'access callback'   => 'services_keyauth_access',
+    'type'              => MENU_DEFAULT_LOCAL_TASK,
+    'file'              => 'services_keyauth.admin.inc',
+    'weight'            => '-1',
+  );
+  $items['admin/settings/services_keyauth/add'] = array(
+    'title'             => 'Create key',
+    'page callback'     => 'drupal_get_form',
+    'page arguments'    => array('services_keyauth_admin_keys_form'),
     'access callback'   => 'services_keyauth_access',
     'type'              => MENU_LOCAL_TASK,
     'file'              => 'services_keyauth.admin.inc',
   );
-  $items['admin/build/services/keys/%'] = array(
+  $items['admin/settings/services_keyauth/keys/%'] = array(
     'title'             => 'Edit key',
     'access arguments'  => array('administer services'),
     'page callback'     => 'drupal_get_form',
@@ -61,31 +74,24 @@ function services_keyauth_menu() {
     'file'              => 'services_keyauth.admin.inc',
     'type'              => MENU_CALLBACK,
   );
-  $items['admin/build/services/keys/%/delete'] = array(
+  $items['admin/settings/services_keyauth/keys/%/delete'] = array(
     'access arguments'  => array('administer services'),
     'page callback'     => 'drupal_get_form',
     'page arguments'    => array('services_keyauth_admin_keys_delete_confirm', 4),
     'file'              => 'services_keyauth.admin.inc',
     'type'              => MENU_CALLBACK,
   );
-  $items['admin/build/services/keys/list'] = array(
-    'title'             => 'List',
-    'type'              => MENU_DEFAULT_LOCAL_TASK,
-    'access callback'   => 'services_keyauth_access',
-    'weight'            => -10,
-  );
-  $items['admin/build/services/keys/add'] = array(
-    'title'             => 'Create key',
-    'page callback'     => 'drupal_get_form',
-    'page arguments'    => array('services_keyauth_admin_keys_form'),
-    'access callback'   => 'services_keyauth_access',
-    'type'              => MENU_LOCAL_TASK,
-    'file'              => 'services_keyauth.admin.inc',
-  );
 
   return $items;
 }
 
+function services_keyauth_admin_page() {
+  $output = t('This is the admin page for entering authorization keys.');
+  
+  return $output;
+}
+
+
 /**
  * Given the necessary data, create a unique hash for key authentication.
  *