diff --git a/admin_views_default/comment.admin-content-comment.inc b/admin_views_default/comment.admin-content-comment.inc
index 9525b5e..6126305 100644
--- a/admin_views_default/comment.admin-content-comment.inc
+++ b/admin_views_default/comment.admin-content-comment.inc
@@ -37,7 +37,7 @@ $handler->display->display_options['style_options']['columns'] = array(
   'title' => 'title',
   'timestamp' => 'timestamp',
   'edit_comment' => 'edit_comment',
-  'delete_comment' => 'delete_comment',
+  'delete_comment' => 'edit_comment',
 );
 $handler->display->display_options['style_options']['default'] = 'timestamp';
 $handler->display->display_options['style_options']['info'] = array(
@@ -76,7 +76,7 @@ $handler->display->display_options['style_options']['info'] = array(
   ),
   'edit_comment' => array(
     'align' => '',
-    'separator' => '',
+    'separator' => ' ',
     'empty_column' => 0,
   ),
   'delete_comment' => array(
@@ -109,18 +109,20 @@ $handler->display->display_options['fields']['views_bulk_operations']['field'] =
 $handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
 $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
 $handler->display->display_options['fields']['views_bulk_operations']['hide_alter_empty'] = FALSE;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['entity_load_capacity'] = '10';
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['operations'] = array(
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
   'action::views_bulk_operations_delete_item' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Delete',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_modify_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Change value',
@@ -130,20 +132,21 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::system_message_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_script_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -156,51 +159,47 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
   ),
   'action::comment_publish_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Publish',
+    'postpone_processing' => 0,
   ),
   'action::system_goto_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::comment_save_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::system_send_email_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::comment_unpublish_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Unpublish',
+    'postpone_processing' => 0,
   ),
   'action::comment_unpublish_by_keyword_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
 );
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['enable_select_all_pages'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_type'] = '0';
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_result'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['force_single'] = 0;
 /* Field: Comment: Title */
 $handler->display->display_options['fields']['subject']['id'] = 'subject';
 $handler->display->display_options['fields']['subject']['table'] = 'comment';
@@ -228,7 +227,7 @@ $handler->display->display_options['fields']['timestamp']['date_format'] = 'time
 $handler->display->display_options['fields']['edit_comment']['id'] = 'edit_comment';
 $handler->display->display_options['fields']['edit_comment']['table'] = 'comment';
 $handler->display->display_options['fields']['edit_comment']['field'] = 'edit_comment';
-$handler->display->display_options['fields']['edit_comment']['label'] = '';
+$handler->display->display_options['fields']['edit_comment']['label'] = 'Operations';
 /* Field: Comment: Delete link */
 $handler->display->display_options['fields']['delete_comment']['id'] = 'delete_comment';
 $handler->display->display_options['fields']['delete_comment']['table'] = 'comment';
@@ -374,6 +373,7 @@ $translatables['admin_views_comment'] = array(
   t('Author'),
   t('Posted in'),
   t('Updated'),
+  t('Operations'),
   t('Published'),
   t('Unpublished'),
 );
diff --git a/admin_views_default/node.admin-content.inc b/admin_views_default/node.admin-content.inc
index 63e2aa0..b488a2c 100644
--- a/admin_views_default/node.admin-content.inc
+++ b/admin_views_default/node.admin-content.inc
@@ -40,7 +40,7 @@ $handler->display->display_options['style_options']['columns'] = array(
   'status' => 'status',
   'changed' => 'changed',
   'edit_node' => 'edit_node',
-  'delete_node' => 'delete_node',
+  'delete_node' => 'edit_node',
 );
 $handler->display->display_options['style_options']['default'] = 'changed';
 $handler->display->display_options['style_options']['info'] = array(
@@ -91,7 +91,7 @@ $handler->display->display_options['style_options']['info'] = array(
   ),
   'edit_node' => array(
     'align' => '',
-    'separator' => '',
+    'separator' => ' ',
     'empty_column' => 0,
   ),
   'delete_node' => array(
@@ -127,25 +127,27 @@ $handler->display->display_options['fields']['views_bulk_operations']['field'] =
 $handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
 $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
 $handler->display->display_options['fields']['views_bulk_operations']['hide_alter_empty'] = FALSE;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['entity_load_capacity'] = '10';
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['operations'] = array(
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
   'action::node_assign_owner_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Change author',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_delete_item' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 1,
     'label' => 'Delete',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_modify_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Change value',
@@ -155,34 +157,35 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::system_message_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_script_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_make_sticky_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Stick',
+    'postpone_processing' => 0,
   ),
   'action::node_make_unsticky_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Unstick',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -195,65 +198,61 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
   ),
   'action::node_promote_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Promote to front page',
+    'postpone_processing' => 0,
   ),
   'action::node_publish_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Publish',
+    'postpone_processing' => 0,
   ),
   'action::system_goto_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_unpromote_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Demote from front page',
+    'postpone_processing' => 0,
   ),
   'action::node_save_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::system_send_email_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::node_unpublish_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Unpublish',
+    'postpone_processing' => 0,
   ),
   'action::node_unpublish_by_keyword_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
 );
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['enable_select_all_pages'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_type'] = '0';
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_result'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['force_single'] = 0;
 /* Field: Content: Title */
 $handler->display->display_options['fields']['title']['id'] = 'title';
 $handler->display->display_options['fields']['title']['table'] = 'node';
@@ -290,7 +289,7 @@ $handler->display->display_options['fields']['changed']['date_format'] = 'short'
 $handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
 $handler->display->display_options['fields']['edit_node']['table'] = 'views_entity_node';
 $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
-$handler->display->display_options['fields']['edit_node']['label'] = '';
+$handler->display->display_options['fields']['edit_node']['label'] = 'Operations';
 /* Field: Content: Delete link */
 $handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
 $handler->display->display_options['fields']['delete_node']['table'] = 'views_entity_node';
@@ -382,6 +381,7 @@ $translatables['admin_views_node'] = array(
   t('Author'),
   t('Published'),
   t('Updated'),
+  t('Operations'),
   t('Vocabulary'),
   t('System'),
 );
diff --git a/admin_views_default/user.admin-people.inc b/admin_views_default/user.admin-people.inc
index 616fd22..91c6ffd 100644
--- a/admin_views_default/user.admin-people.inc
+++ b/admin_views_default/user.admin-people.inc
@@ -39,7 +39,7 @@ $handler->display->display_options['style_options']['columns'] = array(
   'created' => 'created',
   'access' => 'access',
   'edit_node' => 'edit_node',
-  'cancel_node' => 'cancel_node',
+  'cancel_node' => 'edit_node',
 );
 $handler->display->display_options['style_options']['default'] = 'access';
 $handler->display->display_options['style_options']['info'] = array(
@@ -90,7 +90,7 @@ $handler->display->display_options['style_options']['info'] = array(
   ),
   'edit_node' => array(
     'align' => '',
-    'separator' => '',
+    'separator' => ' ',
     'empty_column' => 0,
   ),
   'cancel_node' => array(
@@ -114,32 +114,34 @@ $handler->display->display_options['fields']['views_bulk_operations']['field'] =
 $handler->display->display_options['fields']['views_bulk_operations']['label'] = '';
 $handler->display->display_options['fields']['views_bulk_operations']['element_label_colon'] = FALSE;
 $handler->display->display_options['fields']['views_bulk_operations']['hide_alter_empty'] = FALSE;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['entity_load_capacity'] = '10';
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['operations'] = array(
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['display_type'] = '0';
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['enable_select_all_pages'] = 1;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['force_single'] = 0;
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_settings']['entity_load_capacity'] = '10';
+$handler->display->display_options['fields']['views_bulk_operations']['vbo_operations'] = array(
   'action::system_block_ip_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Ban IP address of the current user',
+    'postpone_processing' => 0,
   ),
   'action::user_block_user_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_delete_item' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 1,
     'label' => 'Delete',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_modify_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 1,
     'override_label' => 1,
     'label' => 'Change value',
@@ -149,27 +151,28 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
         '_all_' => '_all_',
       ),
     ),
+    'postpone_processing' => 0,
   ),
   'action::system_message_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_script_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_user_roles_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 1,
     'label' => 'Change user roles',
+    'postpone_processing' => 0,
   ),
   'action::views_bulk_operations_argument_selector_action' => array(
     'selected' => 0,
@@ -182,23 +185,19 @@ $handler->display->display_options['fields']['views_bulk_operations']['vbo']['op
   ),
   'action::system_goto_action' => array(
     'selected' => 0,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 0,
     'label' => '',
+    'postpone_processing' => 0,
   ),
   'action::system_send_email_action' => array(
     'selected' => 1,
-    'use_queue' => 0,
     'skip_confirmation' => 0,
     'override_label' => 1,
     'label' => 'Send e-mail',
+    'postpone_processing' => 0,
   ),
 );
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['enable_select_all_pages'] = 1;
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_type'] = '0';
-$handler->display->display_options['fields']['views_bulk_operations']['vbo']['display_result'] = 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';
@@ -235,7 +234,7 @@ $handler->display->display_options['fields']['access']['date_format'] = 'time ag
 $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'] = '';
+$handler->display->display_options['fields']['edit_node']['label'] = 'Operations';
 /* Field: User: Cancel link */
 $handler->display->display_options['fields']['cancel_node']['id'] = 'cancel_node';
 $handler->display->display_options['fields']['cancel_node']['table'] = 'users';
@@ -333,6 +332,7 @@ $translatables['admin_views_user'] = array(
   t('Roles'),
   t('Member for'),
   t('Last access'),
+  t('Operations'),
   t('Username'),
   t('E-mail'),
   t('Role'),