diff --git a/sites/all/modules/subuser/subuser.views_default.inc b/sites/all/modules/subuser/subuser.views_default.inc
index f64d3b0..799db64 100644
--- a/sites/all/modules/subuser/subuser.views_default.inc
+++ b/sites/all/modules/subuser/subuser.views_default.inc
@@ -21,7 +21,7 @@ function subuser_views_default_views() {
   $view->core = 7;
   $view->api_version = '3.0-alpha1';
   $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');
@@ -29,19 +29,20 @@ function subuser_views_default_views() {
   $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',
     'edit_node' => 'edit_node',
   );
-  $handler->display->display_options['style_options']['default'] = 'name';
+  $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
     'name' => array(
-      'sortable' => 1,
+      'sortable' => 0,
       'default_sort_order' => 'asc',
       'align' => '',
       'separator' => '',
@@ -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,11 +67,43 @@ 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: Broken/missing handler */
   $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;
+  /* Field: User: Bulk operations */
+  $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'users';
+  $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['selected_operations'] = array(
+    'user_block_user_action' => 'user_block_user_action',
+    'views_bulk_operations_delete_item' => 'views_bulk_operations_delete_item',
+    'views_bulk_operations_user_roles_action' => 'views_bulk_operations_user_roles_action',
+  );
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['execution_type'] = '2';
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_type'] = '0';
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['skip_confirmation'] = 0;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_result'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['merge_single_action'] = 1;
+  $handler->display->display_options['fields']['views_bulk_operations']['vbo']['force_single'] = 0;
   /* Field: User: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
   $handler->display->display_options['fields']['name']['table'] = 'users';
@@ -102,11 +115,11 @@ function subuser_views_default_views() {
   $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']['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;
@@ -124,11 +137,11 @@ 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']['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;
@@ -145,11 +158,11 @@ function subuser_views_default_views() {
   $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']['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;
@@ -180,13 +193,14 @@ 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;
-
+  
   /* 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'),