diff --git a/apps.module b/apps.module
index 241dc4e..3750567 100755
--- a/apps.module
+++ b/apps.module
@@ -77,65 +77,76 @@ function apps_menu() {
   );
 
   // App operations
-  $menu["admin/apps/%apps_app/%"] = array(
-    'load arguments' => array(3),
+  $menu["admin/apps/%apps_server/%apps_app"] = array(
+    'load arguments' => array(2),
     'title callback' => "apps_app_title",
-    'title arguments' => array(2),
+    'title arguments' => array(3),
     'page callback' => 'apps_app_details_page',
-    'page arguments' => array(2),
+    'page arguments' => array(3),
     'access callback' => 'apps_app_access',
-    'access arguments' => array(2, 'details'),
-    'type' => MENU_CALLBACK,
+    'access arguments' => array(3, 'details'),
+    'type' => MENU_NORMAL_ITEM,
     'file' => 'apps.pages.inc',
   );
-  $menu["admin/apps/%apps_app/%/details"] = array(
+  $menu["admin/apps/%apps_server/%apps_app/details"] = array(
     'title' => "App Details",
     'weight' => 1,
+    'load arguments' => array(2),
+    'page callback' => 'apps_app_details_page',
+    'page arguments' => array(3),
+    'access callback' => 'apps_app_access',
+    'access arguments' => array(3, 'details'),
     'type' => MENU_DEFAULT_LOCAL_TASK,
+    'file' => 'apps.pages.inc',
   );
-  $menu["admin/apps/%apps_app/%/install"] = array(
+  $menu["admin/apps/%apps_server/%apps_app/install"] = array(
     'title' => "Install App",
+    'load arguments' => array(2),
     'page callback' => 'apps_app_install',
-    'page arguments' => array(2),
+    'page arguments' => array(3),
     'access callback' => 'apps_app_access',
-    'access arguments' => array(2, 'install'),
+    'access arguments' => array(3, 'install'),
     'type' => MENU_LOCAL_ACTION,
     'file' => 'apps.pages.inc',
   );
-  $menu["admin/apps/%apps_app/%/enable"] = array(
+  $menu["admin/apps/%apps_server/%apps_app/enable"] = array(
     'title' => "Enable App",
+    'load arguments' => array(2),
     'page callback' => 'apps_app_enable',
-    'page arguments' => array(2),
+    'page arguments' => array(3),
     'access callback' => 'apps_app_access',
-    'access arguments' => array(2, 'enable'),
+    'access arguments' => array(3, 'enable'),
     'type' => MENU_LOCAL_ACTION,
     'file' => 'apps.pages.inc',
   );
-  $menu["admin/apps/%apps_app/%/disable"] = array(
+  $menu["admin/apps/%apps_server/%apps_app/disable"] = array(
     'title' => "Disable App",
+    'load arguments' => array(2),
     'page callback' => 'apps_app_disable',
-    'page arguments' => array(2),
+    'page arguments' => array(3),
     'access callback' => 'apps_app_access',
-    'access arguments' => array(2, 'disable'),
+    'access arguments' => array(3, 'disable'),
     'type' => MENU_LOCAL_ACTION,
     'file' => 'apps.pages.inc',
   );
-  $menu["admin/apps/%apps_app/%/uninstall"] = array(
+  $menu["admin/apps/%apps_server/%apps_app/uninstall"] = array(
     'title' => "Uninstall App",
+    'load arguments' => array(2),
     'page callback' => 'apps_app_uninstall',
-    'page arguments' => array(2),
+    'page arguments' => array(3),
     'access callback' => 'apps_app_access',
-    'access arguments' => array(2, 'uninstall'),
+    'access arguments' => array(3, 'uninstall'),
     'type' => MENU_LOCAL_ACTION,
     'file' => 'apps.pages.inc',
   );
-  $menu["admin/apps/%apps_app/%/configure"] =  array(
+  $menu["admin/apps/%apps_server/%apps_app/configure"] =  array(
     'title' => 'Configure',
+    'load arguments' => array(2),
     'page callback' => 'apps_app_config_page',
-    'page arguments' => array(2),
+    'page arguments' => array(3),
     'access callback' => 'apps_app_access',
-    'access arguments' => array(2, 'configure'),
-    'weight' => 2,
+    'access arguments' => array(3, 'configure'),
+    'weight' => 10,
     'type' => MENU_LOCAL_TASK,
     'file' => 'apps.pages.inc',
   );
@@ -177,7 +188,6 @@ function apps_menu() {
 
   return $menu;
 }
-
 /**
  * Implements hook_theme().
  */
@@ -426,7 +436,7 @@ function apps_server_load($name) {
 /**
  * Path object loader for an App
  */
-function apps_app_load($server_name, $app_name) {
+function apps_app_load($app_name, $server_name) {
   apps_include('manifest');
   $app = apps_apps($server_name, array('machine_name' => $app_name));
   return $app[$app_name];