diff --git a/admin_views/admin_views.css b/admin_views/admin_views.css
index 07ae8d9..8a94f64 100644
--- a/admin_views/admin_views.css
+++ b/admin_views/admin_views.css
@@ -1,22 +1,20 @@
 
-.view-admin-content-comment .views-exposed-form .form-text,
-.view-admin-content-node .views-exposed-form .form-text,
-.view-admin-content-taxonomy .views-exposed-form .form-text,
-.view-admin-user-user .views-exposed-form .form-text {
+.admin-views-view .views-exposed-form .form-text {
   width: 10em;
 }
 
-.view-admin-content-comment .views-exposed-form .description,
-.view-admin-content-node .views-exposed-form .description,
-.view-admin-content-taxonomy .views-exposed-form .description,
-.view-admin-user-user .views-exposed-form .description {
+.admin-views-view .views-exposed-form .description {
   display: none;
 }
 
-.view-admin-content-comment #views-bulk-operations-dropdown .form-item,
-.view-admin-content-node #views-bulk-operations-dropdown .form-item,
-.view-admin-content-taxonomy #views-bulk-operations-dropdown .form-item,
-.view-admin-user-user #views-bulk-operations-dropdown .form-item {
+.admin-views-view .views-exposed-form .views-submit-button,
+.admin-views-view .views-exposed-form .views-reset-button {
+  padding-right: 0;
+}
+
+.admin-views-view .form-item-operation {
+  float: left;
   margin-top: 0;
   margin-bottom: 0;
+  margin-right: 1em;
 }
diff --git a/admin_views/plugins/views_plugin_display_system.inc b/admin_views/plugins/views_plugin_display_system.inc
index 51a9085..61fcd76 100644
--- a/admin_views/plugins/views_plugin_display_system.inc
+++ b/admin_views/plugins/views_plugin_display_system.inc
@@ -43,24 +43,58 @@ class views_plugin_display_system extends views_plugin_display {
     // views_arg_load().
     $bits = explode('/', $this->get_option('path'));
     $page_arguments = array($this->view->name, $this->display->id);
+    $this->view->init_handlers();
+    $view_arguments = $this->view->argument;
 
     // Replace % with %views_arg for menu autoloading and add to the
     // page arguments so the argument actually comes through.
     foreach ($bits as $pos => $bit) {
       if ($bit == '%') {
-        $bits[$pos] = '%views_arg';
+        $argument = array_shift($view_arguments);
+        if (!empty($argument->options['specify_validation']) && $argument->options['validate']['type'] != 'none') {
+          $bits[$pos] = '%views_arg';
+        }
         $page_arguments[] = $pos;
       }
     }
 
     $path = implode('/', $bits);
+    if (!$path) {
+      return $items;
+    }
 
     $access_plugin = $this->get_plugin('access');
     if (!isset($access_plugin)) {
       $access_plugin = views_get_plugin('access', 'none');
     }
-    if (!$path) {
-      return $items;
+
+    // Get access callback might return an array of the callback + the dynamic arguments.
+    $access_plugin_callback = $access_plugin->get_access_callback();
+
+    if (is_array($access_plugin_callback)) {
+      $access_arguments = array();
+
+      // Find the plugin arguments.
+      $access_plugin_method = array_shift($access_plugin_callback);
+      $access_plugin_arguments = array_shift($access_plugin_callback);
+      if (!is_array($access_plugin_arguments)) {
+        $access_plugin_arguments = array();
+      }
+
+      $access_arguments[0] = array($access_plugin_method, &$access_plugin_arguments);
+
+      // Move the plugin arguments to the access arguments array.
+      $i = 1;
+      foreach ($access_plugin_arguments as $key => $value) {
+        if (is_int($value)) {
+          $access_arguments[$i] = $value;
+          $access_plugin_arguments[$key] = $i;
+          $i++;
+        }
+      }
+    }
+    else {
+      $access_arguments = array($access_plugin_callback);
     }
 
     $items[$path] = array(
@@ -69,13 +103,13 @@ class views_plugin_display_system extends views_plugin_display {
       'page arguments' => $page_arguments,
       // Default access check (per display)
       'access callback' => 'views_access',
-      'access arguments' => array($access_plugin->get_access_callback()),
+      'access arguments' => $access_arguments,
       // Identify URL embedded arguments and correlate them to a handler
       'load arguments'  => array($this->view->name, $this->display->id, '%index'),
     );
 
     // Grep all callbacks for router items below the target path.
-    $children = preg_grep('@' . preg_quote($path, '@') . '/.+@', array_keys($callbacks));
+    $children = preg_grep('@^' . preg_quote($path, '@') . '/@', array_keys($callbacks));
     foreach ($children as $child_path) {
       // Only inherit properties from parent, if the child is not a default
       // local task.
@@ -105,7 +139,7 @@ class views_plugin_display_system extends views_plugin_display {
    * Also set the page title, because original page callbacks might do this.
    */
   function execute() {
-    views_set_page_view($this);
+    views_set_page_view($this->view);
 
     // Prior to this being called, the $view should already be set to this
     // display, and arguments should be set on the view.
@@ -137,18 +171,15 @@ class views_plugin_display_system extends views_plugin_display {
       'title' => t('System path settings'),
     );
 
-    $path = $this->get_option('path');
+    $path = strip_tags('/' . $this->get_option('path'));
     if (empty($path)) {
       $path = t('None');
     }
-    else {
-      $path = truncate_utf8($path, 17, FALSE, TRUE);
-    }
 
     $options['path'] = array(
       'category' => 'system',
       'title' => t('Path'),
-      'value' => check_plain($path),
+      'value' => views_ui_truncate($path, 24),
     );
   }
 
diff --git a/admin_views/views_default/admin_content_comment.inc b/admin_views/views_default/admin_content_comment.inc
index ccc8cf4..ab419b0 100644
--- a/admin_views/views_default/admin_content_comment.inc
+++ b/admin_views/views_default/admin_content_comment.inc
@@ -4,361 +4,240 @@ $view = new view;
 $view->name = 'admin_content_comment';
 $view->description = 'List and edit site comments and the comment moderation queue.';
 $view->tag = 'admin';
-$view->view_php = '';
-$view->base_table = 'comments';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
+$view->base_table = 'comment';
+$view->human_name = '';
+$view->core = 0;
+$view->api_version = '3.0-alpha1';
 $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+/* Display: Defaults */
 $handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('relationships', array(
-  'nid' => array(
-    'label' => 'Node',
-    'required' => 0,
-    'id' => 'nid',
-    'table' => 'comments',
-    'field' => 'nid',
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('fields', array(
+$handler->display->display_options['title'] = 'Comments';
+$handler->display->display_options['css_class'] = 'admin-views-view';
+$handler->display->display_options['use_ajax'] = TRUE;
+$handler->display->display_options['access']['type'] = 'perm';
+$handler->display->display_options['access']['perm'] = 'administer comments';
+$handler->display->display_options['cache']['type'] = 'none';
+$handler->display->display_options['query']['type'] = 'views_query';
+$handler->display->display_options['exposed_form']['type'] = 'basic';
+$handler->display->display_options['pager']['type'] = 'full';
+$handler->display->display_options['pager']['options']['items_per_page'] = 50;
+$handler->display->display_options['style_plugin'] = 'bulk';
+$handler->display->display_options['style_options']['columns'] = array(
+  'subject' => 'subject',
+  'name' => 'name',
+  'title' => 'title',
+  'timestamp' => 'timestamp',
+  'edit_comment' => 'edit_comment',
+  'delete_comment' => 'delete_comment',
+);
+$handler->display->display_options['style_options']['default'] = 'timestamp';
+$handler->display->display_options['style_options']['info'] = array(
   'subject' => array(
-    'label' => 'Title',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'link_to_comment' => 1,
-    'exclude' => 0,
-    'id' => 'subject',
-    'table' => 'comments',
-    'field' => 'subject',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'name' => array(
-    'label' => 'Author',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'link_to_user' => 1,
-    'exclude' => 0,
-    'id' => 'name',
-    'table' => 'comments',
-    'field' => 'name',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'title' => array(
-    'label' => 'Posted in',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'target' => '',
-      'help' => '',
-      'trim' => 1,
-      'max_length' => '16',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'empty' => '',
-    'hide_empty' => 0,
-    'empty_zero' => 0,
-    'link_to_node' => 1,
-    'exclude' => 0,
-    'id' => 'title',
-    'table' => 'node',
-    'field' => 'title',
-    'relationship' => 'nid',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'timestamp' => array(
-    'label' => 'Posted',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'date_format' => 'time ago',
-    'custom_date_format' => '',
-    'exclude' => 0,
-    'id' => 'timestamp',
-    'table' => 'comments',
-    'field' => 'timestamp',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'edit_comment' => array(
-    'label' => '',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'target' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'empty' => '',
-    'hide_empty' => 0,
-    'empty_zero' => 0,
-    'text' => '',
-    'exclude' => 0,
-    'id' => 'edit_comment',
-    'table' => 'comments',
-    'field' => 'edit_comment',
-    'relationship' => 'none',
-    'override' => array(
-      'button' => 'Override',
-    ),
+    'align' => '',
+    'separator' => '',
   ),
   'delete_comment' => array(
-    'label' => '',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'target' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'empty' => '',
-    'hide_empty' => 0,
-    'empty_zero' => 0,
-    'text' => '',
-    'exclude' => 0,
-    'id' => 'delete_comment',
-    'table' => 'comments',
-    'field' => 'delete_comment',
-    'override' => array(
-      'button' => 'Override',
-    ),
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('sorts', array(
-  'timestamp' => array(
-    'order' => 'DESC',
-    'granularity' => 'second',
-    'id' => 'timestamp',
-    'table' => 'comments',
-    'field' => 'timestamp',
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('filters', array(
-  'subject' => array(
-    'operator' => 'contains',
-    'value' => '',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'subject_op',
-      'identifier' => 'subject',
-      'label' => 'Title',
-      'optional' => 1,
-      'remember' => 0,
-    ),
-    'case' => 0,
-    'id' => 'subject',
-    'table' => 'comments',
-    'field' => 'subject',
-    'override' => array(
-      'button' => 'Override',
-    ),
-    'relationship' => 'none',
-  ),
-  'name' => array(
-    'operator' => 'contains',
-    'value' => '',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'name_op',
-      'identifier' => 'name',
-      'label' => 'Author',
-      'optional' => 1,
-      'remember' => 0,
-    ),
-    'case' => 0,
-    'id' => 'name',
-    'table' => 'comments',
-    'field' => 'name',
-    'relationship' => 'none',
+    'align' => '',
+    'separator' => '',
   ),
-  'title' => array(
-    'operator' => 'contains',
-    'value' => '',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'title_op',
-      'identifier' => 'title',
-      'label' => 'Posted in',
-      'optional' => 1,
-      'remember' => 0,
-    ),
-    'case' => 0,
-    'id' => 'title',
-    'table' => 'node',
-    'field' => 'title',
-    'relationship' => 'nid',
-    'override' => array(
-      'button' => 'Override',
-    ),
-  ),
-  'status' => array(
-    'operator' => '=',
-    'value' => 'All',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'operator' => '',
-      'identifier' => 'status',
-      'label' => 'Published',
-      'optional' => 1,
-      'remember' => 1,
-    ),
-    'id' => 'status',
-    'table' => 'comments',
-    'field' => 'status',
-    'relationship' => 'none',
-    'override' => array(
-      'button' => 'Override',
-    ),
-  ),
-));
-$handler->override_option('access', array(
-  'type' => 'perm',
-  'perm' => 'administer comments',
-));
-$handler->override_option('cache', array(
-  'type' => 'none',
-));
-$handler->override_option('title', 'Comments');
-$handler->override_option('use_ajax', TRUE);
-$handler->override_option('items_per_page', 50);
-$handler->override_option('use_pager', '1');
-$handler->override_option('style_plugin', 'bulk');
-$handler->override_option('style_options', array(
-  'grouping' => '',
-  'override' => 1,
-  'sticky' => 1,
-  'order' => 'desc',
-  'columns' => array(
-    'subject' => 'subject',
-    'name' => 'name',
-    'title' => 'title',
-    'timestamp' => 'timestamp',
-    'edit_comment' => 'edit_comment',
-    'delete_comment' => 'delete_comment',
-  ),
-  'info' => array(
-    'subject' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'name' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'title' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'timestamp' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'edit_comment' => array(
-      'separator' => '',
-    ),
-    'delete_comment' => array(
-      'separator' => '',
-    ),
-  ),
-  'default' => 'timestamp',
-  'execution_type' => '2',
-  'display_type' => '0',
-  'hide_select_all' => 0,
-  'skip_confirmation' => 0,
-  'display_result' => 1,
-  'merge_single_action' => 0,
-  'selected_operations' => array(
-    'views_bulk_operations_delete_comment_action' => 'views_bulk_operations_delete_comment_action',
-    'system_send_email_action' => 'system_send_email_action',
-    'comment_unpublish_action' => 'comment_unpublish_action',
-    'comment_unpublish_by_keyword_action' => 'comment_unpublish_by_keyword_action',
-    'system_message_action' => 0,
-    'views_bulk_operations_action' => 0,
-    'views_bulk_operations_script_action' => 0,
-    'views_bulk_operations_argument_selector_action' => 0,
-    'system_goto_action' => 0,
-  ),
-));
+);
+$handler->display->display_options['style_options']['override'] = 1;
+$handler->display->display_options['style_options']['sticky'] = 1;
+$handler->display->display_options['style_options']['order'] = 'desc';
+$handler->display->display_options['style_options']['empty_table'] = 1;
+$handler->display->display_options['style_options']['execution_type'] = '2';
+$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'] = 0;
+$handler->display->display_options['style_options']['hide_select_all'] = 0;
+/* Relationship: Comment: Content */
+$handler->display->display_options['relationships']['nid']['id'] = 'nid';
+$handler->display->display_options['relationships']['nid']['table'] = 'comment';
+$handler->display->display_options['relationships']['nid']['field'] = 'nid';
+$handler->display->display_options['relationships']['nid']['label'] = 'Node';
+$handler->display->display_options['relationships']['nid']['required'] = 0;
+/* Field: Comment: Title */
+$handler->display->display_options['fields']['subject']['id'] = 'subject';
+$handler->display->display_options['fields']['subject']['table'] = 'comment';
+$handler->display->display_options['fields']['subject']['field'] = 'subject';
+$handler->display->display_options['fields']['subject']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['subject']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['subject']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['subject']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['subject']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['subject']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['subject']['alter']['html'] = 0;
+$handler->display->display_options['fields']['subject']['link_to_comment'] = 1;
+/* Field: Comment: Author */
+$handler->display->display_options['fields']['name']['id'] = 'name';
+$handler->display->display_options['fields']['name']['table'] = 'comment';
+$handler->display->display_options['fields']['name']['field'] = 'name';
+$handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['name']['alter']['trim'] = 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']['strip_tags'] = 0;
+$handler->display->display_options['fields']['name']['alter']['html'] = 0;
+$handler->display->display_options['fields']['name']['link_to_user'] = 1;
+/* Field: Content: Title */
+$handler->display->display_options['fields']['title']['id'] = 'title';
+$handler->display->display_options['fields']['title']['table'] = 'node';
+$handler->display->display_options['fields']['title']['field'] = 'title';
+$handler->display->display_options['fields']['title']['relationship'] = 'nid';
+$handler->display->display_options['fields']['title']['label'] = 'Posted in';
+$handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['title']['alter']['trim'] = 1;
+$handler->display->display_options['fields']['title']['alter']['max_length'] = '16';
+$handler->display->display_options['fields']['title']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['title']['alter']['html'] = 0;
+$handler->display->display_options['fields']['title']['hide_empty'] = 0;
+$handler->display->display_options['fields']['title']['empty_zero'] = 0;
+$handler->display->display_options['fields']['title']['link_to_node'] = 1;
+/* Field: Comment: Updated date */
+$handler->display->display_options['fields']['timestamp']['id'] = 'timestamp';
+$handler->display->display_options['fields']['timestamp']['table'] = 'comment';
+$handler->display->display_options['fields']['timestamp']['field'] = 'changed';
+$handler->display->display_options['fields']['timestamp']['label'] = 'Posted';
+$handler->display->display_options['fields']['timestamp']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['timestamp']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['timestamp']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['timestamp']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['timestamp']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['timestamp']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['timestamp']['alter']['html'] = 0;
+$handler->display->display_options['fields']['timestamp']['date_format'] = 'time ago';
+/* Field: Comment: Edit link */
+$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']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['edit_comment']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['edit_comment']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['edit_comment']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['edit_comment']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['edit_comment']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['edit_comment']['alter']['html'] = 0;
+$handler->display->display_options['fields']['edit_comment']['hide_empty'] = 0;
+$handler->display->display_options['fields']['edit_comment']['empty_zero'] = 0;
+/* Field: Comment: Delete link */
+$handler->display->display_options['fields']['delete_comment']['id'] = 'delete_comment';
+$handler->display->display_options['fields']['delete_comment']['table'] = 'comment';
+$handler->display->display_options['fields']['delete_comment']['field'] = 'delete_comment';
+$handler->display->display_options['fields']['delete_comment']['label'] = '';
+$handler->display->display_options['fields']['delete_comment']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['delete_comment']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['delete_comment']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['delete_comment']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['delete_comment']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['delete_comment']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['delete_comment']['alter']['html'] = 0;
+$handler->display->display_options['fields']['delete_comment']['hide_empty'] = 0;
+$handler->display->display_options['fields']['delete_comment']['empty_zero'] = 0;
+/* Sort criterion: Comment: Updated date */
+$handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
+$handler->display->display_options['sorts']['timestamp']['table'] = 'comment';
+$handler->display->display_options['sorts']['timestamp']['field'] = 'changed';
+$handler->display->display_options['sorts']['timestamp']['order'] = 'DESC';
+/* Filter criterion: Comment: Title */
+$handler->display->display_options['filters']['subject']['id'] = 'subject';
+$handler->display->display_options['filters']['subject']['table'] = 'comment';
+$handler->display->display_options['filters']['subject']['field'] = 'subject';
+$handler->display->display_options['filters']['subject']['operator'] = 'contains';
+$handler->display->display_options['filters']['subject']['exposed'] = TRUE;
+$handler->display->display_options['filters']['subject']['expose']['operator_id'] = 'subject_op';
+$handler->display->display_options['filters']['subject']['expose']['label'] = 'Title';
+$handler->display->display_options['filters']['subject']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['subject']['expose']['operator'] = 'subject_op';
+$handler->display->display_options['filters']['subject']['expose']['identifier'] = 'subject';
+$handler->display->display_options['filters']['subject']['expose']['required'] = FALSE;
+/* Filter criterion: Comment: Author */
+$handler->display->display_options['filters']['name']['id'] = 'name';
+$handler->display->display_options['filters']['name']['table'] = 'comment';
+$handler->display->display_options['filters']['name']['field'] = 'name';
+$handler->display->display_options['filters']['name']['operator'] = 'contains';
+$handler->display->display_options['filters']['name']['exposed'] = TRUE;
+$handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op';
+$handler->display->display_options['filters']['name']['expose']['label'] = 'Author';
+$handler->display->display_options['filters']['name']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op';
+$handler->display->display_options['filters']['name']['expose']['identifier'] = 'name';
+$handler->display->display_options['filters']['name']['expose']['required'] = FALSE;
+/* Filter criterion: Content: Title */
+$handler->display->display_options['filters']['title']['id'] = 'title';
+$handler->display->display_options['filters']['title']['table'] = 'node';
+$handler->display->display_options['filters']['title']['field'] = 'title';
+$handler->display->display_options['filters']['title']['relationship'] = 'nid';
+$handler->display->display_options['filters']['title']['operator'] = 'contains';
+$handler->display->display_options['filters']['title']['exposed'] = TRUE;
+$handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
+$handler->display->display_options['filters']['title']['expose']['label'] = 'Posted in';
+$handler->display->display_options['filters']['title']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
+$handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
+$handler->display->display_options['filters']['title']['expose']['required'] = FALSE;
+/* Filter criterion: Comment: Approved */
+$handler->display->display_options['filters']['status']['id'] = 'status';
+$handler->display->display_options['filters']['status']['table'] = 'comment';
+$handler->display->display_options['filters']['status']['field'] = 'status';
+$handler->display->display_options['filters']['status']['value'] = 'All';
+$handler->display->display_options['filters']['status']['exposed'] = TRUE;
+$handler->display->display_options['filters']['status']['expose']['label'] = 'Published';
+$handler->display->display_options['filters']['status']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
+$handler->display->display_options['filters']['status']['expose']['required'] = FALSE;
+$handler->display->display_options['filters']['status']['expose']['remember'] = 1;
+
+/* Display: System */
 $handler = $view->new_display('system', 'System', 'system_1');
-$handler->override_option('path', 'admin/content/comment');
+$handler->display->display_options['path'] = 'admin/content/comment';
+$translatables['admin_content_comment'] = array(
+  t('Defaults'),
+  t('Comments'),
+  t('more'),
+  t('Apply'),
+  t('Reset'),
+  t('Sort by'),
+  t('Asc'),
+  t('Desc'),
+  t('Items per page'),
+  t('- All -'),
+  t('Offset'),
+  t('Node'),
+  t('Title'),
+  t('Author'),
+  t('Posted in'),
+  t('Posted'),
+  t('Published'),
+  t('System'),
+);
diff --git a/admin_views/views_default/admin_content_node.inc b/admin_views/views_default/admin_content_node.inc
index 9da04ab..0da35ad 100644
--- a/admin_views/views_default/admin_content_node.inc
+++ b/admin_views/views_default/admin_content_node.inc
@@ -4,442 +4,320 @@ $view = new view;
 $view->name = 'admin_content_node';
 $view->description = 'View, edit, and delete your site\'s content.';
 $view->tag = 'admin';
-$view->view_php = '';
 $view->base_table = 'node';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
+$view->human_name = '';
+$view->core = 0;
+$view->api_version = '3.0-alpha1';
 $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+/* Display: Defaults */
 $handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('relationships', array(
-  'uid' => array(
-    'label' => 'User',
-    'required' => 1,
-    'id' => 'uid',
-    'table' => 'node_revisions',
-    'field' => 'uid',
-    'override' => array(
-      'button' => 'Override',
-    ),
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('fields', array(
+$handler->display->display_options['title'] = 'Content';
+$handler->display->display_options['css_class'] = 'admin-views-view';
+$handler->display->display_options['use_ajax'] = TRUE;
+$handler->display->display_options['access']['type'] = 'perm';
+$handler->display->display_options['access']['perm'] = 'administer nodes';
+$handler->display->display_options['cache']['type'] = 'none';
+$handler->display->display_options['query']['type'] = 'views_query';
+$handler->display->display_options['exposed_form']['type'] = 'basic';
+$handler->display->display_options['exposed_form']['options']['reset_button'] = TRUE;
+$handler->display->display_options['exposed_form']['options']['autosubmit'] = 0;
+$handler->display->display_options['exposed_form']['options']['autosubmit_hide'] = 1;
+$handler->display->display_options['pager']['type'] = 'full';
+$handler->display->display_options['pager']['options']['items_per_page'] = 50;
+$handler->display->display_options['style_plugin'] = 'bulk';
+$handler->display->display_options['style_options']['columns'] = array(
+  'title' => 'title',
+  'type' => 'type',
+  'name' => 'name',
+  'status' => 'status',
+  'changed' => 'changed',
+  'edit_node' => 'edit_node',
+  'delete_node' => 'delete_node',
+);
+$handler->display->display_options['style_options']['default'] = 'changed';
+$handler->display->display_options['style_options']['info'] = array(
   'title' => array(
-    'label' => 'Title',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'link_to_node' => 1,
-    'exclude' => 0,
-    'id' => 'title',
-    'table' => 'node',
-    'field' => 'title',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'type' => array(
-    'label' => 'Type',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'link_to_node' => 0,
-    'exclude' => 0,
-    'id' => 'type',
-    'table' => 'node',
-    'field' => 'type',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'name' => array(
-    'label' => 'Author',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'link_to_user' => 1,
-    'overwrite_anonymous' => 0,
-    'anonymous_text' => '',
-    'exclude' => 0,
-    'id' => 'name',
-    'table' => 'users',
-    'field' => 'name',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'status' => array(
-    'label' => 'Published',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'type' => 'yes-no',
-    'not' => 0,
-    'exclude' => 0,
-    'id' => 'status',
-    'table' => 'node',
-    'field' => 'status',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'desc',
+    'align' => '',
+    'separator' => '',
   ),
   'changed' => array(
-    'label' => 'Updated',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'target' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'empty' => '',
-    'hide_empty' => 0,
-    'empty_zero' => 0,
-    'date_format' => 'small',
-    'custom_date_format' => '',
-    'exclude' => 0,
-    'id' => 'changed',
-    'table' => 'node',
-    'field' => 'changed',
-    'override' => array(
-      'button' => 'Override',
-    ),
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'edit_node' => array(
-    'label' => '',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'target' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'empty' => '',
-    'hide_empty' => 0,
-    'empty_zero' => 0,
-    'text' => '',
-    'exclude' => 0,
-    'id' => 'edit_node',
-    'table' => 'node',
-    'field' => 'edit_node',
-    'relationship' => 'none',
-    'override' => array(
-      'button' => 'Override',
-    ),
+    'align' => '',
+    'separator' => '',
   ),
   'delete_node' => array(
-    'label' => '',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'target' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'empty' => '',
-    'hide_empty' => 0,
-    'empty_zero' => 0,
-    'text' => '',
-    'exclude' => 0,
-    'id' => 'delete_node',
-    'table' => 'node',
-    'field' => 'delete_node',
-    'override' => array(
-      'button' => 'Override',
-    ),
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('sorts', array(
-  'created' => array(
-    'order' => 'DESC',
-    'granularity' => 'second',
-    'id' => 'created',
-    'table' => 'node',
-    'field' => 'created',
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('filters', array(
-  'title' => array(
-    'operator' => 'contains',
-    'value' => '',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'title_op',
-      'identifier' => 'title',
-      'label' => 'Title',
-      'optional' => 1,
-      'remember' => 0,
-    ),
-    'case' => 0,
-    'id' => 'title',
-    'table' => 'node',
-    'field' => 'title',
-    'override' => array(
-      'button' => 'Override',
-    ),
-    'relationship' => 'none',
-  ),
-  'type' => array(
-    'operator' => 'in',
-    'value' => array(),
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'type_op',
-      'identifier' => 'type',
-      'label' => 'Type',
-      'optional' => 1,
-      'single' => 1,
-      'remember' => 1,
-      'reduce' => 0,
-    ),
-    'id' => 'type',
-    'table' => 'node',
-    'field' => 'type',
-    'relationship' => 'none',
-  ),
-  'uid' => array(
-    'operator' => 'in',
-    'value' => '',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'uid_op',
-      'identifier' => 'name',
-      'label' => 'Author',
-      'optional' => 1,
-      'remember' => 0,
-      'reduce' => 0,
-    ),
-    'id' => 'uid',
-    'table' => 'users',
-    'field' => 'uid',
-    'override' => array(
-      'button' => 'Override',
-    ),
-    'relationship' => 'uid',
+    'align' => '',
+    'separator' => '',
   ),
-  'status' => array(
-    'operator' => '=',
-    'value' => 'All',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'operator' => '',
-      'identifier' => 'status',
-      'label' => 'Published',
-      'optional' => 1,
-      'remember' => 1,
-    ),
-    'id' => 'status',
-    'table' => 'node',
-    'field' => 'status',
-    'relationship' => 'none',
-  ),
-  'vid' => array(
-    'operator' => 'in',
-    'value' => array(),
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'vid_op',
-      'identifier' => 'vid',
-      'label' => 'Vocabulary',
-      'optional' => 1,
-      'single' => 1,
-      'remember' => 1,
-      'reduce' => 0,
-    ),
-    'id' => 'vid',
-    'table' => 'term_data',
-    'field' => 'vid',
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('access', array(
-  'type' => 'perm',
-  'perm' => 'administer nodes',
-));
-$handler->override_option('cache', array(
-  'type' => 'none',
-));
-$handler->override_option('title', 'Content');
-$handler->override_option('use_ajax', TRUE);
-$handler->override_option('items_per_page', 50);
-$handler->override_option('use_pager', '1');
-$handler->override_option('style_plugin', 'bulk');
-$handler->override_option('style_options', array(
-  'grouping' => '',
-  'override' => 1,
-  'sticky' => 1,
-  'order' => 'desc',
-  'columns' => array(
-    'title' => 'title',
-    'type' => 'type',
-    'name' => 'name',
-    'status' => 'status',
-    'changed' => 'changed',
-    'edit_node' => 'edit_node',
-    'delete_node' => 'delete_node',
-  ),
-  'info' => array(
-    'title' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'type' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'name' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'status' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'changed' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'edit_node' => array(
-      'separator' => '',
-    ),
-    'delete_node' => array(
-      'separator' => '',
-    ),
-  ),
-  'default' => 'changed',
-  'execution_type' => '2',
-  'display_type' => '0',
-  'hide_select_all' => 0,
-  'skip_confirmation' => 0,
-  'display_result' => 1,
-  'merge_single_action' => 0,
-  'selected_operations' => array(
-    'node_assign_owner_action' => 'node_assign_owner_action',
-    'views_bulk_operations_delete_node_action' => 'views_bulk_operations_delete_node_action',
-    'node_make_sticky_action' => 'node_make_sticky_action',
-    'node_make_unsticky_action' => 'node_make_unsticky_action',
-    'views_bulk_operations_fields_action' => 'views_bulk_operations_fields_action',
-    'views_bulk_operations_taxonomy_action' => 'views_bulk_operations_taxonomy_action',
-    'node_promote_action' => 'node_promote_action',
-    'node_publish_action' => 'node_publish_action',
-    'node_unpromote_action' => 'node_unpromote_action',
-    'node_unpublish_action' => 'node_unpublish_action',
-    'node_unpublish_by_keyword_action' => 'node_unpublish_by_keyword_action',
-    'node_mass_update:a27b9efabcd054685a549378b174ad11' => 0,
-    'system_message_action' => 0,
-    'views_bulk_operations_action' => 0,
-    'views_bulk_operations_script_action' => 0,
-    'node_mass_update:c4d3b28efb86fd703619a50b74d43794' => 0,
-    'views_bulk_operations_argument_selector_action' => 0,
-    'node_mass_update:14de7d028b4bffdf2b4a266562ca18ac' => 0,
-    'node_mass_update:9c585624b9b3af0b4687d5f97f35e047' => 0,
-    'image_operations_rebuild' => 0,
-    'system_goto_action' => 0,
-    'node_mass_update:8ce21b08bb8e773d10018b484fe4815e' => 0,
-    'node_save_action' => 0,
-    'system_send_email_action' => 0,
-    'node_mass_update:0ccad85c1ebe4c9ceada1aa64293b080' => 0,
-  ),
-  'views_bulk_operations_fields_action' => array(
-    'php_code' => 0,
-    'display_fields' => array(
-      'field_whatever' => 'field_whatever',
-    ),
-    '_error_element_base' => 'style_options][views_bulk_operations_fields_action][',
-  ),
-));
+);
+$handler->display->display_options['style_options']['override'] = 1;
+$handler->display->display_options['style_options']['sticky'] = 1;
+$handler->display->display_options['style_options']['order'] = 'desc';
+$handler->display->display_options['style_options']['empty_table'] = 1;
+$handler->display->display_options['style_options']['selected_operations'] = array(
+  'node_assign_owner_action' => 'node_assign_owner_action',
+  'views_bulk_operations_delete_node_action' => 'views_bulk_operations_delete_node_action',
+  'views_bulk_operations_taxonomy_action' => 'views_bulk_operations_taxonomy_action',
+  'node_publish_action' => 'node_publish_action',
+  'node_unpublish_action' => 'node_unpublish_action',
+  'node_mass_update:a27b9efabcd054685a549378b174ad11' => 0,
+  'system_message_action' => 0,
+  'views_bulk_operations_action' => 0,
+  'views_bulk_operations_script_action' => 0,
+  'node_make_sticky_action' => 0,
+  'node_make_unsticky_action' => 0,
+  'node_mass_update:8ce21b08bb8e773d10018b484fe4815e' => 0,
+  'node_mass_update:c4d3b28efb86fd703619a50b74d43794' => 0,
+  'views_bulk_operations_argument_selector_action' => 0,
+  'node_promote_action' => 0,
+  'node_mass_update:14de7d028b4bffdf2b4a266562ca18ac' => 0,
+  'node_mass_update:9c585624b9b3af0b4687d5f97f35e047' => 0,
+  'system_goto_action' => 0,
+  'node_unpromote_action' => 0,
+  'node_save_action' => 0,
+  'system_send_email_action' => 0,
+  'node_unpublish_by_keyword_action' => 0,
+  'node_mass_update:0ccad85c1ebe4c9ceada1aa64293b080' => 0,
+);
+$handler->display->display_options['style_options']['execution_type'] = '2';
+$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';
+$handler->display->display_options['empty']['area']['field'] = 'area';
+$handler->display->display_options['empty']['area']['empty'] = FALSE;
+/* Relationship: Content revision: User */
+$handler->display->display_options['relationships']['uid_1']['id'] = 'uid_1';
+$handler->display->display_options['relationships']['uid_1']['table'] = 'node_revision';
+$handler->display->display_options['relationships']['uid_1']['field'] = 'uid';
+$handler->display->display_options['relationships']['uid_1']['label'] = 'User';
+$handler->display->display_options['relationships']['uid_1']['required'] = 1;
+/* Relationship: Content: Taxonomy terms on node */
+$handler->display->display_options['relationships']['term_node_tid']['id'] = 'term_node_tid';
+$handler->display->display_options['relationships']['term_node_tid']['table'] = 'node';
+$handler->display->display_options['relationships']['term_node_tid']['field'] = 'term_node_tid';
+/* Field: Content: Title */
+$handler->display->display_options['fields']['title']['id'] = 'title';
+$handler->display->display_options['fields']['title']['table'] = 'node';
+$handler->display->display_options['fields']['title']['field'] = 'title';
+$handler->display->display_options['fields']['title']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['title']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['title']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['title']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['title']['alter']['html'] = 0;
+$handler->display->display_options['fields']['title']['link_to_node'] = 1;
+/* Field: Content: Type */
+$handler->display->display_options['fields']['type']['id'] = 'type';
+$handler->display->display_options['fields']['type']['table'] = 'node';
+$handler->display->display_options['fields']['type']['field'] = 'type';
+$handler->display->display_options['fields']['type']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['type']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['type']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['type']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['type']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['type']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['type']['alter']['html'] = 0;
+$handler->display->display_options['fields']['type']['link_to_node'] = 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'] = 'Author';
+$handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['name']['alter']['trim'] = 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']['strip_tags'] = 0;
+$handler->display->display_options['fields']['name']['alter']['html'] = 0;
+$handler->display->display_options['fields']['name']['link_to_user'] = 1;
+$handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
+/* Field: Content: Published */
+$handler->display->display_options['fields']['status']['id'] = 'status';
+$handler->display->display_options['fields']['status']['table'] = 'node';
+$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']['trim'] = 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']['strip_tags'] = 0;
+$handler->display->display_options['fields']['status']['alter']['html'] = 0;
+$handler->display->display_options['fields']['status']['not'] = 0;
+/* Field: Content: Updated date */
+$handler->display->display_options['fields']['changed']['id'] = 'changed';
+$handler->display->display_options['fields']['changed']['table'] = 'node';
+$handler->display->display_options['fields']['changed']['field'] = 'changed';
+$handler->display->display_options['fields']['changed']['label'] = 'Updated';
+$handler->display->display_options['fields']['changed']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['absolute'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['external'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['replace_spaces'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['trim_whitespace'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['nl2br'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['changed']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['changed']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['changed']['alter']['html'] = 0;
+$handler->display->display_options['fields']['changed']['element_label_colon'] = 1;
+$handler->display->display_options['fields']['changed']['element_default_classes'] = 1;
+$handler->display->display_options['fields']['changed']['hide_empty'] = 0;
+$handler->display->display_options['fields']['changed']['empty_zero'] = 0;
+$handler->display->display_options['fields']['changed']['date_format'] = 'short';
+/* Field: Content: Edit link */
+$handler->display->display_options['fields']['edit_node']['id'] = 'edit_node';
+$handler->display->display_options['fields']['edit_node']['table'] = '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']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['edit_node']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['edit_node']['alter']['trim'] = 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']['html'] = 0;
+$handler->display->display_options['fields']['edit_node']['hide_empty'] = 0;
+$handler->display->display_options['fields']['edit_node']['empty_zero'] = 0;
+/* Field: Content: Delete link */
+$handler->display->display_options['fields']['delete_node']['id'] = 'delete_node';
+$handler->display->display_options['fields']['delete_node']['table'] = 'node';
+$handler->display->display_options['fields']['delete_node']['field'] = 'delete_node';
+$handler->display->display_options['fields']['delete_node']['label'] = '';
+$handler->display->display_options['fields']['delete_node']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['delete_node']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['delete_node']['alter']['trim'] = 0;
+$handler->display->display_options['fields']['delete_node']['alter']['word_boundary'] = 1;
+$handler->display->display_options['fields']['delete_node']['alter']['ellipsis'] = 1;
+$handler->display->display_options['fields']['delete_node']['alter']['strip_tags'] = 0;
+$handler->display->display_options['fields']['delete_node']['alter']['html'] = 0;
+$handler->display->display_options['fields']['delete_node']['hide_empty'] = 0;
+$handler->display->display_options['fields']['delete_node']['empty_zero'] = 0;
+/* Sort criterion: Content: Post date */
+$handler->display->display_options['sorts']['created']['id'] = 'created';
+$handler->display->display_options['sorts']['created']['table'] = 'node';
+$handler->display->display_options['sorts']['created']['field'] = 'created';
+$handler->display->display_options['sorts']['created']['order'] = 'DESC';
+/* Filter criterion: Content: Title */
+$handler->display->display_options['filters']['title']['id'] = 'title';
+$handler->display->display_options['filters']['title']['table'] = 'node';
+$handler->display->display_options['filters']['title']['field'] = 'title';
+$handler->display->display_options['filters']['title']['operator'] = 'contains';
+$handler->display->display_options['filters']['title']['exposed'] = TRUE;
+$handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
+$handler->display->display_options['filters']['title']['expose']['label'] = 'Title';
+$handler->display->display_options['filters']['title']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
+$handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
+$handler->display->display_options['filters']['title']['expose']['remember'] = 1;
+/* Filter criterion: Content: Type */
+$handler->display->display_options['filters']['type']['id'] = 'type';
+$handler->display->display_options['filters']['type']['table'] = 'node';
+$handler->display->display_options['filters']['type']['field'] = 'type';
+$handler->display->display_options['filters']['type']['exposed'] = TRUE;
+$handler->display->display_options['filters']['type']['expose']['operator_id'] = 'type_op';
+$handler->display->display_options['filters']['type']['expose']['label'] = 'Type';
+$handler->display->display_options['filters']['type']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['type']['expose']['operator'] = 'type_op';
+$handler->display->display_options['filters']['type']['expose']['identifier'] = 'type';
+$handler->display->display_options['filters']['type']['expose']['remember'] = 1;
+$handler->display->display_options['filters']['type']['expose']['reduce'] = 0;
+/* Filter criterion: User: Name */
+$handler->display->display_options['filters']['uid']['id'] = 'uid';
+$handler->display->display_options['filters']['uid']['table'] = 'users';
+$handler->display->display_options['filters']['uid']['field'] = 'uid';
+$handler->display->display_options['filters']['uid']['relationship'] = 'uid_1';
+$handler->display->display_options['filters']['uid']['value'] = '';
+$handler->display->display_options['filters']['uid']['exposed'] = TRUE;
+$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
+$handler->display->display_options['filters']['uid']['expose']['label'] = 'Author';
+$handler->display->display_options['filters']['uid']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
+$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'name';
+$handler->display->display_options['filters']['uid']['expose']['remember'] = 1;
+$handler->display->display_options['filters']['uid']['expose']['reduce'] = 0;
+/* Filter criterion: Content: Published */
+$handler->display->display_options['filters']['status']['id'] = 'status';
+$handler->display->display_options['filters']['status']['table'] = 'node';
+$handler->display->display_options['filters']['status']['field'] = 'status';
+$handler->display->display_options['filters']['status']['value'] = 'All';
+$handler->display->display_options['filters']['status']['exposed'] = TRUE;
+$handler->display->display_options['filters']['status']['expose']['operator_id'] = '';
+$handler->display->display_options['filters']['status']['expose']['label'] = 'Published';
+$handler->display->display_options['filters']['status']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op';
+$handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
+$handler->display->display_options['filters']['status']['expose']['remember'] = 1;
+$handler->display->display_options['filters']['status']['expose']['multiple'] = FALSE;
+/* Filter criterion: Taxonomy term: Vocabulary */
+$handler->display->display_options['filters']['vid']['id'] = 'vid';
+$handler->display->display_options['filters']['vid']['table'] = 'taxonomy_term_data';
+$handler->display->display_options['filters']['vid']['field'] = 'vid';
+$handler->display->display_options['filters']['vid']['relationship'] = 'term_node_tid';
+$handler->display->display_options['filters']['vid']['exposed'] = TRUE;
+$handler->display->display_options['filters']['vid']['expose']['operator_id'] = 'vid_op';
+$handler->display->display_options['filters']['vid']['expose']['label'] = 'Vocabulary';
+$handler->display->display_options['filters']['vid']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['vid']['expose']['operator'] = 'vid_op';
+$handler->display->display_options['filters']['vid']['expose']['identifier'] = 'vid';
+$handler->display->display_options['filters']['vid']['expose']['remember'] = 1;
+$handler->display->display_options['filters']['vid']['expose']['reduce'] = 0;
+
+/* Display: System */
 $handler = $view->new_display('system', 'System', 'system_1');
-$handler->override_option('path', 'admin/content/node');
+$handler->display->display_options['path'] = 'admin/content';
+$translatables['admin_content_node'] = array(
+  t('Defaults'),
+  t('Content'),
+  t('more'),
+  t('Apply'),
+  t('Reset'),
+  t('Sort by'),
+  t('Asc'),
+  t('Desc'),
+  t('Items per page'),
+  t('- All -'),
+  t('Offset'),
+  t('User'),
+  t('term'),
+  t('Title'),
+  t('Type'),
+  t('Author'),
+  t('Published'),
+  t('Updated'),
+  t('Vocabulary'),
+  t('System'),
+);
diff --git a/admin_views/views_default/admin_user_user.inc b/admin_views/views_default/admin_user_user.inc
index e5fc150..3558062 100644
--- a/admin_views/views_default/admin_user_user.inc
+++ b/admin_views/views_default/admin_user_user.inc
@@ -4,349 +4,239 @@ $view = new view;
 $view->name = 'admin_user_user';
 $view->description = 'List, add, and edit users.';
 $view->tag = 'admin';
-$view->view_php = '';
 $view->base_table = 'users';
-$view->is_cacheable = FALSE;
-$view->api_version = 2;
+$view->human_name = '';
+$view->core = 0;
+$view->api_version = '3.0-alpha1';
 $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+/* Display: Defaults */
 $handler = $view->new_display('default', 'Defaults', 'default');
-$handler->override_option('fields', array(
+$handler->display->display_options['title'] = 'Users';
+$handler->display->display_options['css_class'] = 'admin-views-view';
+$handler->display->display_options['use_ajax'] = TRUE;
+$handler->display->display_options['access']['type'] = 'perm';
+$handler->display->display_options['access']['perm'] = 'administer users';
+$handler->display->display_options['cache']['type'] = 'none';
+$handler->display->display_options['query']['type'] = 'views_query';
+$handler->display->display_options['exposed_form']['type'] = 'basic';
+$handler->display->display_options['exposed_form']['options']['reset_button'] = TRUE;
+$handler->display->display_options['exposed_form']['options']['autosubmit'] = 0;
+$handler->display->display_options['exposed_form']['options']['autosubmit_hide'] = 1;
+$handler->display->display_options['pager']['type'] = 'full';
+$handler->display->display_options['pager']['options']['items_per_page'] = 50;
+$handler->display->display_options['style_plugin'] = 'bulk';
+$handler->display->display_options['style_options']['columns'] = array(
+  'name' => 'name',
+  'status' => 'status',
+  'rid' => 'rid',
+  'created' => 'created',
+  'access' => 'access',
+  'edit_node' => 'edit_node',
+  'delete_node' => 'delete_node',
+);
+$handler->display->display_options['style_options']['default'] = 'created';
+$handler->display->display_options['style_options']['info'] = array(
   'name' => array(
-    'label' => 'Name',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'link_to_user' => 1,
-    'overwrite_anonymous' => 0,
-    'anonymous_text' => '',
-    'exclude' => 0,
-    'id' => 'name',
-    'table' => 'users',
-    'field' => 'name',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'status' => array(
-    'label' => 'Active',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'type' => 'yes-no',
-    'not' => 0,
-    'exclude' => 0,
-    'id' => 'status',
-    'table' => 'users',
-    'field' => 'status',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'rid' => array(
-    'label' => 'Roles',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'type' => 'ul',
-    'separator' => ', ',
-    'empty' => '',
-    'exclude' => 0,
-    'id' => 'rid',
-    'table' => 'users_roles',
-    'field' => 'rid',
-    'relationship' => 'none',
+    'align' => '',
+    'separator' => '',
   ),
   'created' => array(
-    'label' => 'Member for',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'date_format' => 'time ago',
-    'custom_date_format' => '',
-    'exclude' => 0,
-    'id' => 'created',
-    'table' => 'users',
-    'field' => 'created',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'access' => array(
-    'label' => 'Last access',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'date_format' => 'time ago',
-    'custom_date_format' => '',
-    'exclude' => 0,
-    'id' => 'access',
-    'table' => 'users',
-    'field' => 'access',
-    'relationship' => 'none',
+    'sortable' => 1,
+    'default_sort_order' => 'asc',
+    'align' => '',
+    'separator' => '',
   ),
   'edit_node' => array(
-    'label' => '',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'text' => '',
-    'exclude' => 0,
-    'id' => 'edit_node',
-    'table' => 'users',
-    'field' => 'edit_node',
-    'relationship' => 'none',
+    'align' => '',
+    'separator' => '',
   ),
   'delete_node' => array(
-    'label' => '',
-    'alter' => array(
-      'alter_text' => 0,
-      'text' => '',
-      'make_link' => 0,
-      'path' => '',
-      'link_class' => '',
-      'alt' => '',
-      'prefix' => '',
-      'suffix' => '',
-      'target' => '',
-      'help' => '',
-      'trim' => 0,
-      'max_length' => '',
-      'word_boundary' => 1,
-      'ellipsis' => 1,
-      'strip_tags' => 0,
-      'html' => 0,
-    ),
-    'empty' => '',
-    'hide_empty' => 0,
-    'empty_zero' => 0,
-    'text' => '',
-    'exclude' => 0,
-    'id' => 'delete_node',
-    'table' => 'users',
-    'field' => 'delete_node',
-    'override' => array(
-      'button' => 'Override',
-    ),
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('sorts', array(
-  'created' => array(
-    'order' => 'DESC',
-    'granularity' => 'second',
-    'id' => 'created',
-    'table' => 'users',
-    'field' => 'created',
-    'relationship' => 'none',
-  ),
-));
-$handler->override_option('filters', array(
-  'uid' => array(
-    'operator' => 'in',
-    'value' => '',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'uid_op',
-      'identifier' => 'name',
-      'label' => 'Name',
-      'optional' => 1,
-      'remember' => 1,
-      'reduce' => 0,
-    ),
-    'id' => 'uid',
-    'table' => 'users',
-    'field' => 'uid',
-    'relationship' => 'none',
-  ),
-  'status' => array(
-    'operator' => '=',
-    'value' => 'All',
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'operator' => '',
-      'identifier' => 'status',
-      'label' => 'Active',
-      'optional' => 1,
-      'remember' => 1,
-    ),
-    'id' => 'status',
-    'table' => 'users',
-    'field' => 'status',
-    'relationship' => 'none',
+    'align' => '',
+    'separator' => '',
   ),
-  'rid' => array(
-    'operator' => 'and',
-    'value' => array(),
-    'group' => '0',
-    'exposed' => TRUE,
-    'expose' => array(
-      'use_operator' => 0,
-      'operator' => 'rid_op',
-      'identifier' => 'rid',
-      'label' => 'Roles',
-      'optional' => 1,
-      'single' => 0,
-      'remember' => 1,
-      'reduce' => 0,
-    ),
-    'id' => 'rid',
-    'table' => 'users_roles',
-    'field' => 'rid',
-    'relationship' => 'none',
-    'reduce_duplicates' => 0,
-  ),
-));
-$handler->override_option('access', array(
-  'type' => 'perm',
-  'perm' => 'administer users',
-));
-$handler->override_option('cache', array(
-  'type' => 'none',
-));
-$handler->override_option('title', 'Users');
-$handler->override_option('use_ajax', TRUE);
-$handler->override_option('items_per_page', 50);
-$handler->override_option('use_pager', '1');
-$handler->override_option('style_plugin', 'bulk');
-$handler->override_option('style_options', array(
-  'grouping' => '',
-  'override' => 1,
-  'sticky' => 1,
-  'order' => 'desc',
-  'columns' => array(
-    'name' => 'name',
-    'status' => 'status',
-    'rid' => 'rid',
-    'created' => 'created',
-    'access' => 'access',
-    'edit_node' => 'edit_node',
-  ),
-  'info' => array(
-    'name' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'status' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'rid' => array(
-      'separator' => '',
-    ),
-    'created' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'access' => array(
-      'sortable' => 1,
-      'separator' => '',
-    ),
-    'edit_node' => array(
-      'separator' => '',
-    ),
-  ),
-  'default' => 'created',
-  'execution_type' => '2',
-  'display_type' => '0',
-  'hide_select_all' => 0,
-  'skip_confirmation' => 0,
-  'display_result' => 1,
-  'merge_single_action' => 0,
-  'selected_operations' => array(
-    'user_user_operations_block' => 'user_user_operations_block',
-    'views_bulk_operations_delete_user_action' => 'views_bulk_operations_delete_user_action',
-    'views_bulk_operations_user_roles_action' => 'views_bulk_operations_user_roles_action',
-    'system_send_email_action' => 'system_send_email_action',
-    'user_user_operations_unblock' => 'user_user_operations_unblock',
-    'user_block_ip_action' => 0,
-    'user_block_user_action' => 0,
-    'system_message_action' => 0,
-    'views_bulk_operations_action' => 0,
-    'views_bulk_operations_script_action' => 0,
-    'views_bulk_operations_argument_selector_action' => 0,
-    'system_goto_action' => 0,
-  ),
-));
+);
+$handler->display->display_options['style_options']['override'] = 1;
+$handler->display->display_options['style_options']['sticky'] = 1;
+$handler->display->display_options['style_options']['order'] = 'desc';
+$handler->display->display_options['style_options']['empty_table'] = 1;
+$handler->display->display_options['style_options']['selected_operations'] = array(
+  'user_user_operations_block' => 'user_user_operations_block',
+  'views_bulk_operations_delete_user_action' => 'views_bulk_operations_delete_user_action',
+  'views_bulk_operations_user_roles_action' => 'views_bulk_operations_user_roles_action',
+  'system_send_email_action' => 'system_send_email_action',
+  'user_user_operations_unblock' => 'user_user_operations_unblock',
+  'system_block_ip_action' => 0,
+  'user_block_user_action' => 0,
+  'system_message_action' => 0,
+  'views_bulk_operations_action' => 0,
+  'views_bulk_operations_script_action' => 0,
+  'views_bulk_operations_argument_selector_action' => 0,
+  'system_goto_action' => 0,
+);
+$handler->display->display_options['style_options']['execution_type'] = '2';
+$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'] = 0;
+$handler->display->display_options['style_options']['hide_select_all'] = 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']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['name']['alter']['trim'] = 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']['strip_tags'] = 0;
+$handler->display->display_options['fields']['name']['alter']['html'] = 0;
+$handler->display->display_options['fields']['name']['link_to_user'] = 1;
+$handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
+/* 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']['trim'] = 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']['strip_tags'] = 0;
+$handler->display->display_options['fields']['status']['alter']['html'] = 0;
+$handler->display->display_options['fields']['status']['not'] = 0;
+/* Field: User: Roles */
+$handler->display->display_options['fields']['rid']['id'] = 'rid';
+$handler->display->display_options['fields']['rid']['table'] = 'users_roles';
+$handler->display->display_options['fields']['rid']['field'] = 'rid';
+$handler->display->display_options['fields']['rid']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['rid']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['rid']['alter']['trim'] = 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']['html'] = 0;
+$handler->display->display_options['fields']['rid']['type'] = 'ul';
+/* 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'] = 'Member for';
+$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']['trim'] = 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']['strip_tags'] = 0;
+$handler->display->display_options['fields']['created']['alter']['html'] = 0;
+$handler->display->display_options['fields']['created']['date_format'] = 'time ago';
+/* 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']['trim'] = 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']['strip_tags'] = 0;
+$handler->display->display_options['fields']['access']['alter']['html'] = 0;
+$handler->display->display_options['fields']['access']['date_format'] = 'time ago';
+/* 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'] = '';
+$handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = 0;
+$handler->display->display_options['fields']['edit_node']['alter']['make_link'] = 0;
+$handler->display->display_options['fields']['edit_node']['alter']['trim'] = 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']['html'] = 0;
+/* Sort criterion: User: Created date */
+$handler->display->display_options['sorts']['created']['id'] = 'created';
+$handler->display->display_options['sorts']['created']['table'] = 'users';
+$handler->display->display_options['sorts']['created']['field'] = 'created';
+$handler->display->display_options['sorts']['created']['order'] = 'DESC';
+/* Filter criterion: User: Name */
+$handler->display->display_options['filters']['uid']['id'] = 'uid';
+$handler->display->display_options['filters']['uid']['table'] = 'users';
+$handler->display->display_options['filters']['uid']['field'] = 'uid';
+$handler->display->display_options['filters']['uid']['value'] = '';
+$handler->display->display_options['filters']['uid']['exposed'] = TRUE;
+$handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
+$handler->display->display_options['filters']['uid']['expose']['label'] = 'Name';
+$handler->display->display_options['filters']['uid']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
+$handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+$handler->display->display_options['filters']['uid']['expose']['remember'] = 1;
+$handler->display->display_options['filters']['uid']['expose']['multiple'] = FALSE;
+$handler->display->display_options['filters']['uid']['expose']['reduce'] = 0;
+/* Filter criterion: User: Active */
+$handler->display->display_options['filters']['status']['id'] = 'status';
+$handler->display->display_options['filters']['status']['table'] = 'users';
+$handler->display->display_options['filters']['status']['field'] = 'status';
+$handler->display->display_options['filters']['status']['value'] = 'All';
+$handler->display->display_options['filters']['status']['exposed'] = TRUE;
+$handler->display->display_options['filters']['status']['expose']['operator_id'] = '';
+$handler->display->display_options['filters']['status']['expose']['label'] = 'Active';
+$handler->display->display_options['filters']['status']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op';
+$handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
+$handler->display->display_options['filters']['status']['expose']['remember'] = 1;
+$handler->display->display_options['filters']['status']['expose']['multiple'] = FALSE;
+/* Filter criterion: User: Roles */
+$handler->display->display_options['filters']['rid']['id'] = 'rid';
+$handler->display->display_options['filters']['rid']['table'] = 'users_roles';
+$handler->display->display_options['filters']['rid']['field'] = 'rid';
+$handler->display->display_options['filters']['rid']['exposed'] = TRUE;
+$handler->display->display_options['filters']['rid']['expose']['operator_id'] = 'rid_op';
+$handler->display->display_options['filters']['rid']['expose']['label'] = 'Roles';
+$handler->display->display_options['filters']['rid']['expose']['use_operator'] = FALSE;
+$handler->display->display_options['filters']['rid']['expose']['operator'] = 'rid_op';
+$handler->display->display_options['filters']['rid']['expose']['identifier'] = 'rid';
+$handler->display->display_options['filters']['rid']['expose']['remember'] = 1;
+$handler->display->display_options['filters']['rid']['expose']['reduce'] = 0;
+$handler->display->display_options['filters']['rid']['reduce_duplicates'] = 0;
+
+/* Display: System */
 $handler = $view->new_display('system', 'System', 'system_1');
-$handler->override_option('path', 'admin/user/user');
+$handler->display->display_options['path'] = 'admin/people';
+$translatables['admin_user_user'] = array(
+  t('Defaults'),
+  t('Users'),
+  t('more'),
+  t('Apply'),
+  t('Reset'),
+  t('Sort by'),
+  t('Asc'),
+  t('Desc'),
+  t('Items per page'),
+  t('- All -'),
+  t('Offset'),
+  t('Name'),
+  t('Active'),
+  t('Roles'),
+  t('Member for'),
+  t('Last access'),
+  t('System'),
+);