diff --git a/subuser.install b/subuser.install
index f9191a5..1860403 100644
--- a/subuser.install
+++ b/subuser.install
@@ -11,7 +11,7 @@
  */
 function subuser_install() {
   $record = array(
-    'predicate' => 'subuser',
+    'relation_type' => 'subuser',
     'label' => t('Subuser'),
     'directional' => TRUE,
     'source_bundles' => array('user:user'),
diff --git a/subuser.module b/subuser.module
index d96f174..8bd0106 100644
--- a/subuser.module
+++ b/subuser.module
@@ -53,6 +53,39 @@ function subuser_menu() {
  */
 function subuser_menu_alter(&$items) {
   $items['admin/people/create']['access callback'] = 'subuser_access_create_callback';
+  $items['user/%user']['access callback'] = 'subuser_access_view_callback';
+  $items['user/%user/cancel']['access callback'] = 'subuser_access_delete_callback';
+  $items['user/%user/cancel/confirm/%/%']['access callback'] = 'subuser_access_delete_callback';
+  $items['user/%user/edit']['access callback'] = 'subuser_access_edit_callback';
+}
+
+/**
+ * Implements hook_profile2_access().
+ */
+function subuser_profile2_access($op, $profile = NULL, $account = NULL) {
+  global $user;
+  // Fall through if we're not checking access for the current user account
+  if ((!isset($account) || $account->uid == $user->uid) && isset($profile->uid)) {
+    switch ($op) {
+      case 'view':
+        if (subuser_access_view_callback($profile->uid)) {
+          return TRUE;
+        }
+        break;
+
+      case 'edit':
+        if (subuser_access_edit_callback($profile->uid)) {
+          return TRUE;
+        }
+        break;
+
+      case 'delete':
+        if (subuser_access_delete_callback($profile->uid)) {
+          return TRUE;
+        }
+    }
+    // Do not explicitly deny access so others may still grant access.
+  }
 }
 
 /**
@@ -78,6 +111,70 @@ function subuser_access_create($account = NULL) {
 }
 
 /**
+ * Our access callback for user editing - only permits users with
+ * 'Administering subuser profiles' to edit user or parent-user to edit subusers
+ *
+ * @param $account
+ *   the account being edited (user object or uid)
+ */
+function subuser_access_edit_callback($account){
+  global $user;
+  $children = subuser_load_all($user);
+  $acct_uid = is_object($account) ? $account->uid : $account;
+
+  return (($user->uid == $acct_uid) || user_access('administer users') ||
+          (user_access('administer subusers') && in_array($acct_uid, $children))
+          ) && $acct_uid > 0;
+}
+
+/**
+ * Our access callback for user deleting - only permits users with
+ * 'Administering subuser profiles' to delete user or parent-user to delete subusers
+ *
+ * @param $account
+ *   the account being deleted (user object or uid)
+ */
+function subuser_access_delete_callback($account) {
+  global $user;
+  $children = subuser_load_all($user);
+  $acct_uid = is_object($account) ? $account->uid : $account;
+
+  return ((($user->uid == $acct_uid) && user_access('cancel account') ||
+           (user_access('administer subusers') && in_array($acct_uid, $children))
+           ) || user_access('administer users')) && $acct_uid > 0;
+}
+
+/**
+ * Our access callback for user viewing - only permits users with
+ * 'Administering subuser profiles' to view user or parent-user to view subusers
+ *
+ * @param $account
+ *   the account being viewed (user object or uid)
+ */
+function subuser_access_view_callback($account) {
+  global $user;
+  $children = subuser_load_all($user);
+  $acct_uid = is_object($account) ? $account->uid : $account;
+
+  // Never allow access to view the anonymous user account.
+  if ($acct_uid) {
+    // Admins can view all, users can view own profiles at all times.
+    if ($user->uid == $acct_uid || user_access('administer users') ||
+        (user_access('administer subusers') && in_array($acct_uid, $children))) {
+      return TRUE;
+    }
+    elseif (user_access('access user profiles')) {
+      // At this point, load the complete account object.
+      if (!is_object($account)) {
+        $account = user_load((int) $acct_uid);
+      }
+      return (is_object($account) && $account->access && $account->status);
+    }
+  }
+  return FALSE;
+}
+
+/**
  * Determine whether the user has a given privilege.
  *
  * If not subuser_access_create() is checked to determin if the permission
@@ -151,7 +248,8 @@ function subuser_user_register_form_submit($form, &$form_state) {
       array('entity_type' => 'user', 'entity_id' => $form_state['user']->uid),
       array('entity_type' => 'user', 'entity_id' => $user->uid),
     );
-    relation_create('subuser', $endpoints);
+    $relation = relation_create('subuser', $endpoints);
+    relation_save($relation);
   }
 }
 
@@ -167,12 +265,22 @@ function subuser_user_register_form_submit($form, &$form_state) {
  *   An associative array of related accounts were key and value is user ID.
  */
 function subuser_load_all($account, $children = TRUE) {
-  $users = array();
-  foreach (relation_query('user', $account->uid, (int) $children)->execute() as $result) {
-    $relation = relation_load($result->rid, $result->vid);
-    $users[$uid = (int) $relation->endpoints[LANGUAGE_NONE][0]['entity_id']] = $uid;
+
+  $subusers = &drupal_static(__FUNCTION__);
+  // Our 'subuser' relation has the child entity at index 0, parent at 1.
+  $cp = empty($children) ? 1 : 0;
+  if (!isset($subusers[$account->uid][$cp])) {
+
+    $users = array();
+    foreach (relation_query('user', $account->uid, (int) $children)->execute() as $result) {
+      $relation = relation_load($result->rid, $result->vid);
+      if ($relation->relation_type == 'subuser') {
+        $users[$uid = (int) $relation->endpoints[LANGUAGE_NONE][$cp]['entity_id']] = $uid;
+      }
+    }
+    $subusers[$account->uid][$cp] = $users;
   }
-  return $users;
+  return $subusers[$account->uid][$cp];
 }
 
 /**
diff --git a/subuser.views_default.inc b/subuser.views_default.inc
index f64d3b0..4fed5bd 100644
--- a/subuser.views_default.inc
+++ b/subuser.views_default.inc
@@ -19,20 +19,21 @@ function subuser_views_default_views() {
   $view->base_table = 'users';
   $view->human_name = 'Subuser';
   $view->core = 7;
-  $view->api_version = '3.0-alpha1';
+  $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
   /* Display: Master */
   $handler = $view->new_display('default', 'Master', 'default');
-  $handler->display->display_options['title'] = variable_get('subuser_list', 'Subusers');
+  $handler->display->display_options['title'] = 'Subusers';
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'create subuser 2';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
+  $handler->display->display_options['query']['options']['query_comment'] = FALSE;
   $handler->display->display_options['exposed_form']['type'] = 'basic';
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['pager']['options']['items_per_page'] = '10';
-  $handler->display->display_options['style_plugin'] = 'bulk';
+  $handler->display->display_options['style_plugin'] = 'table';
   $handler->display->display_options['style_options']['columns'] = array(
     'name' => 'name',
     'rid' => 'rid',
@@ -58,26 +59,6 @@ function subuser_views_default_views() {
   $handler->display->display_options['style_options']['override'] = 1;
   $handler->display->display_options['style_options']['sticky'] = 0;
   $handler->display->display_options['style_options']['empty_table'] = 0;
-  $handler->display->display_options['style_options']['selected_operations'] = array(
-    'views_bulk_operations_delete_user_action' => 'views_bulk_operations_delete_user_action',
-    'system_message_action' => 'system_message_action',
-    'views_bulk_operations_user_roles_action' => 'views_bulk_operations_user_roles_action',
-    'system_block_ip_action' => 0,
-    'user_block_user_action' => 0,
-    'user_user_operations_block' => 0,
-    'views_bulk_operations_action' => 0,
-    'views_bulk_operations_script_action' => 0,
-    'views_bulk_operations_argument_selector_action' => 0,
-    'system_goto_action' => 0,
-    'system_send_email_action' => 0,
-    'user_user_operations_unblock' => 0,
-  );
-  $handler->display->display_options['style_options']['execution_type'] = '1';
-  $handler->display->display_options['style_options']['display_type'] = '0';
-  $handler->display->display_options['style_options']['skip_confirmation'] = 0;
-  $handler->display->display_options['style_options']['display_result'] = 1;
-  $handler->display->display_options['style_options']['merge_single_action'] = 1;
-  $handler->display->display_options['style_options']['hide_select_all'] = 0;
   /* No results behavior: Global: Text area */
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
@@ -86,34 +67,133 @@ function subuser_views_default_views() {
   $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'No users were found.';
   $handler->display->display_options['empty']['area']['tokenize'] = 0;
-  /* Relationship: User: Relation: Subuser (user <-> user) */
+  /* Relationship: User: Relation: Subuser (user -&gt; user) */
   $handler->display->display_options['relationships']['relation_subuser_user']['id'] = 'relation_subuser_user';
   $handler->display->display_options['relationships']['relation_subuser_user']['table'] = 'users';
   $handler->display->display_options['relationships']['relation_subuser_user']['field'] = 'relation_subuser_user';
   $handler->display->display_options['relationships']['relation_subuser_user']['required'] = 1;
+  $handler->display->display_options['relationships']['relation_subuser_user']['r_index'] = '0';
+  $handler->display->display_options['relationships']['relation_subuser_user']['entity_deduplication_left'] = 0;
+  $handler->display->display_options['relationships']['relation_subuser_user']['entity_deduplication_right'] = 0;
+  /* Field: User: Uid */
+  $handler->display->display_options['fields']['uid']['id'] = 'uid';
+  $handler->display->display_options['fields']['uid']['table'] = 'users';
+  $handler->display->display_options['fields']['uid']['field'] = 'uid';
+  $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
+  $handler->display->display_options['fields']['uid']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['uid']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['uid']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['uid']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['uid']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['uid']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['uid']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['uid']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['uid']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['uid']['link_to_user'] = 0;
   /* Field: User: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'users';
   $handler->display->display_options['fields']['name']['field'] = 'name';
-  $handler->display->display_options['fields']['name']['label'] = 'User';
-  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 1;
+  $handler->display->display_options['fields']['name']['alter']['text'] = '<a href="/user/[uid]">[name]</a> ';
   $handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['name']['alter']['absolute'] = 0;
   $handler->display->display_options['fields']['name']['alter']['external'] = 0;
   $handler->display->display_options['fields']['name']['alter']['replace_spaces'] = 0;
   $handler->display->display_options['fields']['name']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
   $handler->display->display_options['fields']['name']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['name']['alter']['more_link'] = 0;
   $handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
   $handler->display->display_options['fields']['name']['alter']['html'] = 0;
   $handler->display->display_options['fields']['name']['element_label_colon'] = 1;
   $handler->display->display_options['fields']['name']['element_default_classes'] = 1;
   $handler->display->display_options['fields']['name']['hide_empty'] = 0;
   $handler->display->display_options['fields']['name']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['name']['hide_alter_empty'] = 1;
   $handler->display->display_options['fields']['name']['link_to_user'] = 1;
   $handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
+  $handler->display->display_options['fields']['name']['format_username'] = 1;
+  /* Field: User: Created date */
+  $handler->display->display_options['fields']['created']['id'] = 'created';
+  $handler->display->display_options['fields']['created']['table'] = 'users';
+  $handler->display->display_options['fields']['created']['field'] = 'created';
+  $handler->display->display_options['fields']['created']['label'] = 'Created';
+  $handler->display->display_options['fields']['created']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['created']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['created']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['created']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['created']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['created']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['created']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['created']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['created']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['created']['date_format'] = 'long';
+  /* Field: User: Last access */
+  $handler->display->display_options['fields']['access']['id'] = 'access';
+  $handler->display->display_options['fields']['access']['table'] = 'users';
+  $handler->display->display_options['fields']['access']['field'] = 'access';
+  $handler->display->display_options['fields']['access']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['access']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['access']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['access']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['access']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['access']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['access']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['access']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['access']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['access']['date_format'] = 'long';
+  /* Field: User: E-mail */
+  $handler->display->display_options['fields']['mail']['id'] = 'mail';
+  $handler->display->display_options['fields']['mail']['table'] = 'users';
+  $handler->display->display_options['fields']['mail']['field'] = 'mail';
+  $handler->display->display_options['fields']['mail']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['mail']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['mail']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['mail']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['mail']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['mail']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['mail']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['mail']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['mail']['hide_alter_empty'] = 1;
   /* Field: User: Roles */
   $handler->display->display_options['fields']['rid']['id'] = 'rid';
   $handler->display->display_options['fields']['rid']['table'] = 'users_roles';
@@ -124,37 +204,88 @@ function subuser_views_default_views() {
   $handler->display->display_options['fields']['rid']['alter']['external'] = 0;
   $handler->display->display_options['fields']['rid']['alter']['replace_spaces'] = 0;
   $handler->display->display_options['fields']['rid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['rid']['alter']['trim'] = 0;
   $handler->display->display_options['fields']['rid']['alter']['nl2br'] = 0;
   $handler->display->display_options['fields']['rid']['alter']['word_boundary'] = 1;
   $handler->display->display_options['fields']['rid']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['rid']['alter']['more_link'] = 0;
   $handler->display->display_options['fields']['rid']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['rid']['alter']['trim'] = 0;
   $handler->display->display_options['fields']['rid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['rid']['element_label_colon'] = 1;
   $handler->display->display_options['fields']['rid']['element_default_classes'] = 1;
   $handler->display->display_options['fields']['rid']['hide_empty'] = 0;
   $handler->display->display_options['fields']['rid']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['rid']['hide_alter_empty'] = 1;
+  /* Field: User: Active */
+  $handler->display->display_options['fields']['status']['id'] = 'status';
+  $handler->display->display_options['fields']['status']['table'] = 'users';
+  $handler->display->display_options['fields']['status']['field'] = 'status';
+  $handler->display->display_options['fields']['status']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['status']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['status']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['status']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['status']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['status']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['status']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['status']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['status']['hide_alter_empty'] = 1;
+  $handler->display->display_options['fields']['status']['not'] = 0;
   /* Field: User: Edit link */
   $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['table'] = 'users';
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
-  $handler->display->display_options['fields']['edit_node']['label'] = 'Operations';
-  $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = 1;
+  $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<a href="/user/[uid]/edit">[name]</a> ';
   $handler->display->display_options['fields']['edit_node']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['edit_node']['alter']['absolute'] = 0;
   $handler->display->display_options['fields']['edit_node']['alter']['external'] = 0;
   $handler->display->display_options['fields']['edit_node']['alter']['replace_spaces'] = 0;
   $handler->display->display_options['fields']['edit_node']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['edit_node']['alter']['trim'] = 0;
   $handler->display->display_options['fields']['edit_node']['alter']['nl2br'] = 0;
   $handler->display->display_options['fields']['edit_node']['alter']['word_boundary'] = 1;
   $handler->display->display_options['fields']['edit_node']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['edit_node']['alter']['more_link'] = 0;
   $handler->display->display_options['fields']['edit_node']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['edit_node']['alter']['trim'] = 0;
   $handler->display->display_options['fields']['edit_node']['alter']['html'] = 0;
   $handler->display->display_options['fields']['edit_node']['element_label_colon'] = 1;
   $handler->display->display_options['fields']['edit_node']['element_default_classes'] = 1;
   $handler->display->display_options['fields']['edit_node']['hide_empty'] = 0;
   $handler->display->display_options['fields']['edit_node']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['edit_node']['hide_alter_empty'] = 1;
+  /* Field: User: Cancel link */
+  $handler->display->display_options['fields']['cancel_node']['id'] = 'cancel_node';
+  $handler->display->display_options['fields']['cancel_node']['table'] = 'users';
+  $handler->display->display_options['fields']['cancel_node']['field'] = 'cancel_node';
+  $handler->display->display_options['fields']['cancel_node']['label'] = 'Cancel';
+  $handler->display->display_options['fields']['cancel_node']['alter']['alter_text'] = 1;
+  $handler->display->display_options['fields']['cancel_node']['alter']['text'] = '<a href="/user/[uid]/cancel">[name]</a> ';
+  $handler->display->display_options['fields']['cancel_node']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['cancel_node']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['cancel_node']['alter']['more_link'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['cancel_node']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['cancel_node']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['cancel_node']['hide_alter_empty'] = 1;
   /* Sort criterion: User: Created date */
   $handler->display->display_options['sorts']['created']['id'] = 'created';
   $handler->display->display_options['sorts']['created']['table'] = 'users';
@@ -165,8 +296,8 @@ function subuser_views_default_views() {
   $handler->display->display_options['arguments']['uid']['table'] = 'users';
   $handler->display->display_options['arguments']['uid']['field'] = 'uid';
   $handler->display->display_options['arguments']['uid']['relationship'] = 'relation_subuser_user';
-  $handler->display->display_options['arguments']['uid']['default_action'] = 'not found';
-  $handler->display->display_options['arguments']['uid']['default_argument_type'] = 'fixed';
+  $handler->display->display_options['arguments']['uid']['default_action'] = 'default';
+  $handler->display->display_options['arguments']['uid']['default_argument_type'] = 'current_user';
   $handler->display->display_options['arguments']['uid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['uid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['uid']['summary']['format'] = 'default_summary';
@@ -180,13 +311,20 @@ function subuser_views_default_views() {
   $handler->display->display_options['filters']['status']['value'] = '1';
   $handler->display->display_options['filters']['status']['group'] = 0;
   $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+  /* Filter criterion: User: Current */
+  $handler->display->display_options['filters']['uid_current']['id'] = 'uid_current';
+  $handler->display->display_options['filters']['uid_current']['table'] = 'users';
+  $handler->display->display_options['filters']['uid_current']['field'] = 'uid_current';
+  $handler->display->display_options['filters']['uid_current']['relationship'] = 'relation_subuser_user';
+  $handler->display->display_options['filters']['uid_current']['value'] = '1';
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
   $handler->display->display_options['path'] = 'user/%/subuser';
   $handler->display->display_options['menu']['type'] = 'tab';
-  $handler->display->display_options['menu']['title'] = variable_get('subuser_list', 'Subusers');
+  $handler->display->display_options['menu']['title'] = 'Subusers';
   $handler->display->display_options['menu']['weight'] = '0';
+
   $translatables['subuser'] = array(
     t('Master'),
     t('Subusers'),
@@ -212,4 +350,4 @@ function subuser_views_default_views() {
   $views[$view->name] = $view;
 
   return $views;
-}
\ No newline at end of file
+}