diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module
index bcb43cc..1f6989b 100644
--- a/uc_order/uc_order.module
+++ b/uc_order/uc_order.module
@@ -2213,6 +2213,12 @@ function uc_order_action_info() {
       'aggregate' => TRUE,
       'configurable' => FALSE,
     ),
+	'uc_order_action_delete' => array(
+      'label' => t('Delete order'),
+      'type' => 'entity',
+      'configurable' => FALSE,
+	  'behavior' => array('deletes_property'),
+    ),
   );
 }
 
@@ -2249,6 +2255,15 @@ function uc_order_action_set_status_form($context) {
 }
 
 /**
+ * Action implementation: deletes orders.
+ */
+function uc_order_action_delete($entity, $context) {
+  $info = entity_get_info($context['entity_type']);
+  $entity_id = $entity->{$info['entity keys']['id']};
+  uc_order_delete($entity_id);
+}
+
+/**
  * Submit callback: selects the order status to be used.
  */
 function uc_order_action_set_status_submit($form, $form_state) {
diff --git a/uc_order/views/uc_order.views_default.inc b/uc_order/views/uc_order.views_default.inc
index 8fabc60..476ae86 100644
--- a/uc_order/views/uc_order.views_default.inc
+++ b/uc_order/views/uc_order.views_default.inc
@@ -9,7 +9,7 @@
  * Implements hook_views_default_views().
  */
 function uc_order_views_default_views() {
-  $view = new view;
+  $view = new view();
   $view->name = 'uc_orders';
   $view->description = '';
   $view->tag = 'Ubercart';
@@ -18,10 +18,11 @@ function uc_order_views_default_views() {
   $view->core = 0;
   $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
-
+  
   /* Display: Defaults */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->display->display_options['title'] = 'Orders';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'view all orders';
   $handler->display->display_options['cache']['type'] = 'none';
@@ -34,75 +35,142 @@ function uc_order_views_default_views() {
   $handler->display->display_options['pager']['options']['id'] = '0';
   $handler->display->display_options['style_plugin'] = 'table';
   $handler->display->display_options['style_options']['columns'] = array(
-    'actions' => 'actions',
-    'order_id' => 'order_id',
-    'billing_full_name' => 'billing_full_name',
-    'order_status' => 'order_status',
-    'created' => 'created',
-    'order_total' => 'order_total',
+	'actions' => 'actions',
+	'order_id' => 'order_id',
+	'billing_full_name' => 'billing_full_name',
+	'order_status' => 'order_status',
+	'created' => 'created',
+	'order_total' => 'order_total',
   );
   $handler->display->display_options['style_options']['default'] = 'order_id';
   $handler->display->display_options['style_options']['info'] = array(
-    'actions' => array(
-      'align' => '',
-      'separator' => '',
-    ),
-    'order_id' => array(
-      'sortable' => 1,
-      'align' => '',
-      'separator' => '',
-    ),
-    'billing_full_name' => array(
-      'align' => '',
-      'separator' => '',
-    ),
-    'order_status' => array(
-      'sortable' => 1,
-      'align' => '',
-      'separator' => '',
-    ),
-    'created' => array(
-      'sortable' => 1,
-      'align' => '',
-      'separator' => '',
-    ),
-    'order_total' => array(
-      'sortable' => 1,
-      'align' => '',
-      'separator' => '',
-    ),
+	'actions' => array(
+	  'align' => '',
+	  'separator' => '',
+	),
+	'order_id' => array(
+	  'sortable' => 1,
+	  'align' => '',
+	  'separator' => '',
+	),
+	'billing_full_name' => array(
+	  'align' => '',
+	  'separator' => '',
+	),
+	'order_status' => array(
+	  'sortable' => 1,
+	  'align' => '',
+	  'separator' => '',
+	),
+	'created' => array(
+	  'sortable' => 1,
+	  'align' => '',
+	  'separator' => '',
+	),
+	'order_total' => array(
+	  'sortable' => 1,
+	  'align' => '',
+	  'separator' => '',
+	),
   );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 1;
+  $handler->display->display_options['style_options']['sticky'] = TRUE;
   $handler->display->display_options['style_options']['order'] = 'desc';
+  /* Field: Bulk operations: Order */
+  $handler->display->display_options['fields']['views_bulk_operations']['id'] = 'views_bulk_operations';
+  $handler->display->display_options['fields']['views_bulk_operations']['table'] = 'uc_orders';
+  $handler->display->display_options['fields']['views_bulk_operations']['field'] = 'views_bulk_operations';
+  $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']['display_result'] = 1;
+  $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' => 0,
+	  'use_queue' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	),
+	'action::uc_order_action_delete' => array(
+	  'selected' => 1,
+	  'use_queue' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	),
+	'action::system_message_action' => array(
+	  'selected' => 0,
+	  'use_queue' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	),
+	'action::views_bulk_operations_script_action' => array(
+	  'selected' => 0,
+	  'use_queue' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	),
+	'action::views_bulk_operations_modify_action' => array(
+	  'selected' => 0,
+	  'use_queue' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	  'settings' => array(
+		'show_all_tokens' => 1,
+		'display_values' => array(
+		  '_all_' => '_all_',
+		),
+	  ),
+	),
+	'action::views_bulk_operations_argument_selector_action' => array(
+	  'selected' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	  'settings' => array(
+		'url' => '',
+	  ),
+	),
+	'action::uc_order_action_print' => array(
+	  'selected' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	),
+	'action::system_goto_action' => array(
+	  'selected' => 0,
+	  'use_queue' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	),
+	'action::system_send_email_action' => array(
+	  'selected' => 0,
+	  'use_queue' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	),
+	'action::uc_order_action_set_status' => array(
+	  'selected' => 0,
+	  'use_queue' => 0,
+	  'skip_confirmation' => 0,
+	  'override_label' => 0,
+	  'label' => '',
+	),
+  );
   /* Field: Order: Actions */
   $handler->display->display_options['fields']['actions']['id'] = 'actions';
   $handler->display->display_options['fields']['actions']['table'] = 'uc_orders';
   $handler->display->display_options['fields']['actions']['field'] = 'actions';
-  $handler->display->display_options['fields']['actions']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['actions']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['actions']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['actions']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['actions']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['actions']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['actions']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['actions']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['actions']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['actions']['empty_zero'] = 0;
   /* Field: Order: Order ID */
   $handler->display->display_options['fields']['order_id']['id'] = 'order_id';
   $handler->display->display_options['fields']['order_id']['table'] = 'uc_orders';
   $handler->display->display_options['fields']['order_id']['field'] = 'order_id';
-  $handler->display->display_options['fields']['order_id']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['order_id']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['order_id']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['order_id']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['order_id']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['order_id']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['order_id']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['order_id']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['order_id']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['order_id']['empty_zero'] = 0;
   $handler->display->display_options['fields']['order_id']['link_to_order'] = 1;
   /* Field: User: Uid */
   $handler->display->display_options['fields']['uid']['id'] = 'uid';
@@ -110,119 +178,37 @@ function uc_order_views_default_views() {
   $handler->display->display_options['fields']['uid']['field'] = 'uid';
   $handler->display->display_options['fields']['uid']['label'] = '';
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
-  $handler->display->display_options['fields']['uid']['alter']['alter_text'] = 0;
   $handler->display->display_options['fields']['uid']['alter']['text'] = '[billing_full_name]';
-  $handler->display->display_options['fields']['uid']['alter']['make_link'] = 0;
   $handler->display->display_options['fields']['uid']['alter']['path'] = '[uid]';
-  $handler->display->display_options['fields']['uid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['uid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['uid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['uid']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['uid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['uid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['uid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['uid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['uid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['uid']['alter']['html'] = 0;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
-  $handler->display->display_options['fields']['uid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['uid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['uid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['uid']['hide_alter_empty'] = 1;
-  $handler->display->display_options['fields']['uid']['link_to_user'] = 0;
+  $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
   /* Field: Order: Billing address: Full name */
   $handler->display->display_options['fields']['billing_full_name']['id'] = 'billing_full_name';
   $handler->display->display_options['fields']['billing_full_name']['table'] = 'uc_orders';
   $handler->display->display_options['fields']['billing_full_name']['field'] = 'billing_full_name';
   $handler->display->display_options['fields']['billing_full_name']['label'] = 'Customer';
-  $handler->display->display_options['fields']['billing_full_name']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['make_link'] = 1;
+  $handler->display->display_options['fields']['billing_full_name']['alter']['make_link'] = TRUE;
   $handler->display->display_options['fields']['billing_full_name']['alter']['path'] = 'user/[uid]';
-  $handler->display->display_options['fields']['billing_full_name']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['billing_full_name']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['billing_full_name']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['billing_full_name']['hide_alter_empty'] = 1;
   /* Field: Order: Order total */
   $handler->display->display_options['fields']['order_total']['id'] = 'order_total';
   $handler->display->display_options['fields']['order_total']['table'] = 'uc_orders';
   $handler->display->display_options['fields']['order_total']['field'] = 'order_total';
   $handler->display->display_options['fields']['order_total']['label'] = 'Total';
-  $handler->display->display_options['fields']['order_total']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['order_total']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['order_total']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['order_total']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['order_total']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['order_total']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['order_total']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['order_total']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['order_total']['hide_alter_empty'] = 0;
-  $handler->display->display_options['fields']['order_total']['set_precision'] = 0;
+  $handler->display->display_options['fields']['order_total']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['order_total']['precision'] = '0';
-  $handler->display->display_options['fields']['order_total']['format_plural'] = 0;
   /* Field: Order: Creation date */
   $handler->display->display_options['fields']['created']['id'] = 'created';
   $handler->display->display_options['fields']['created']['table'] = 'uc_orders';
   $handler->display->display_options['fields']['created']['field'] = 'created';
   $handler->display->display_options['fields']['created']['label'] = 'Purchase date';
-  $handler->display->display_options['fields']['created']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['created']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['created']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['created']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['created']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['created']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['created']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['created']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['created']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['created']['hide_alter_empty'] = FALSE;
   $handler->display->display_options['fields']['created']['date_format'] = 'uc_store';
   /* Field: Order: Order status */
   $handler->display->display_options['fields']['order_status']['id'] = 'order_status';
   $handler->display->display_options['fields']['order_status']['table'] = 'uc_orders';
   $handler->display->display_options['fields']['order_status']['field'] = 'order_status';
   $handler->display->display_options['fields']['order_status']['label'] = 'Status';
-  $handler->display->display_options['fields']['order_status']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['trim_whitespace'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['order_status']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['order_status']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['order_status']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['order_status']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['order_status']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['order_status']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['order_status']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['order_status']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['order_status']['hide_alter_empty'] = FALSE;
   /* Filter criterion: Order: Order ID */
   $handler->display->display_options['filters']['order_id']['id'] = 'order_id';
   $handler->display->display_options['filters']['order_id']['table'] = 'uc_orders';
@@ -238,7 +224,7 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['order_status']['table'] = 'uc_orders';
   $handler->display->display_options['filters']['order_status']['field'] = 'order_status';
   $handler->display->display_options['filters']['order_status']['value'] = array(
-    '_active' => '_active',
+	'_active' => '_active',
   );
   $handler->display->display_options['filters']['order_status']['group'] = 0;
   $handler->display->display_options['filters']['order_status']['exposed'] = TRUE;
@@ -246,21 +232,23 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['order_status']['expose']['label'] = 'View by status';
   $handler->display->display_options['filters']['order_status']['expose']['operator'] = 'order_status_op';
   $handler->display->display_options['filters']['order_status']['expose']['identifier'] = 'order_status';
-  $handler->display->display_options['filters']['order_status']['expose']['reduce'] = 0;
-
+  
   /* Display: Admin page */
   $handler = $view->new_display('page', 'Admin page', 'admin_page');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['path'] = 'admin/store/orders/view';
   $handler->display->display_options['menu']['type'] = 'normal';
   $handler->display->display_options['menu']['title'] = 'View orders';
   $handler->display->display_options['menu']['description'] = 'View and process the orders received through your website.';
   $handler->display->display_options['menu']['weight'] = '-10';
   $handler->display->display_options['menu']['name'] = 'management';
-
+  
   /* Display: Search */
   $handler = $view->new_display('page', 'Search', 'search');
   $handler->display->display_options['defaults']['title'] = FALSE;
   $handler->display->display_options['title'] = 'Search orders';
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Order: Billing address: First name */
   $handler->display->display_options['filters']['billing_first_name']['id'] = 'billing_first_name';
@@ -273,9 +261,7 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['billing_first_name']['expose']['label'] = 'Billing first name';
   $handler->display->display_options['filters']['billing_first_name']['expose']['operator'] = 'billing_first_name_op';
   $handler->display->display_options['filters']['billing_first_name']['expose']['identifier'] = 'billing_first_name';
-  $handler->display->display_options['filters']['billing_first_name']['expose']['required'] = 0;
-  $handler->display->display_options['filters']['billing_first_name']['expose']['remember'] = 1;
-  $handler->display->display_options['filters']['billing_first_name']['expose']['multiple'] = FALSE;
+  $handler->display->display_options['filters']['billing_first_name']['expose']['remember'] = TRUE;
   /* Filter criterion: Order: Billing address: Last name */
   $handler->display->display_options['filters']['billing_last_name']['id'] = 'billing_last_name';
   $handler->display->display_options['filters']['billing_last_name']['table'] = 'uc_orders';
@@ -287,9 +273,7 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['billing_last_name']['expose']['label'] = 'Billing last name';
   $handler->display->display_options['filters']['billing_last_name']['expose']['operator'] = 'billing_last_name_op';
   $handler->display->display_options['filters']['billing_last_name']['expose']['identifier'] = 'billing_last_name';
-  $handler->display->display_options['filters']['billing_last_name']['expose']['required'] = 0;
-  $handler->display->display_options['filters']['billing_last_name']['expose']['remember'] = 1;
-  $handler->display->display_options['filters']['billing_last_name']['expose']['multiple'] = FALSE;
+  $handler->display->display_options['filters']['billing_last_name']['expose']['remember'] = TRUE;
   /* Filter criterion: Order: Billing address: Company */
   $handler->display->display_options['filters']['billing_company']['id'] = 'billing_company';
   $handler->display->display_options['filters']['billing_company']['table'] = 'uc_orders';
@@ -301,9 +285,7 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['billing_company']['expose']['label'] = 'Billing company';
   $handler->display->display_options['filters']['billing_company']['expose']['operator'] = 'billing_company_op';
   $handler->display->display_options['filters']['billing_company']['expose']['identifier'] = 'billing_company';
-  $handler->display->display_options['filters']['billing_company']['expose']['required'] = 0;
-  $handler->display->display_options['filters']['billing_company']['expose']['remember'] = 1;
-  $handler->display->display_options['filters']['billing_company']['expose']['multiple'] = FALSE;
+  $handler->display->display_options['filters']['billing_company']['expose']['remember'] = TRUE;
   /* Filter criterion: Order: Delivery address: First name */
   $handler->display->display_options['filters']['delivery_first_name']['id'] = 'delivery_first_name';
   $handler->display->display_options['filters']['delivery_first_name']['table'] = 'uc_orders';
@@ -315,9 +297,7 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['delivery_first_name']['expose']['label'] = 'Delivery first name';
   $handler->display->display_options['filters']['delivery_first_name']['expose']['operator'] = 'delivery_first_name_op';
   $handler->display->display_options['filters']['delivery_first_name']['expose']['identifier'] = 'delivery_first_name';
-  $handler->display->display_options['filters']['delivery_first_name']['expose']['required'] = 0;
-  $handler->display->display_options['filters']['delivery_first_name']['expose']['remember'] = 1;
-  $handler->display->display_options['filters']['delivery_first_name']['expose']['multiple'] = FALSE;
+  $handler->display->display_options['filters']['delivery_first_name']['expose']['remember'] = TRUE;
   /* Filter criterion: Order: Delivery address: Last name */
   $handler->display->display_options['filters']['delivery_last_name']['id'] = 'delivery_last_name';
   $handler->display->display_options['filters']['delivery_last_name']['table'] = 'uc_orders';
@@ -329,9 +309,7 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['delivery_last_name']['expose']['label'] = 'Delivery last name';
   $handler->display->display_options['filters']['delivery_last_name']['expose']['operator'] = 'delivery_last_name_op';
   $handler->display->display_options['filters']['delivery_last_name']['expose']['identifier'] = 'delivery_last_name';
-  $handler->display->display_options['filters']['delivery_last_name']['expose']['required'] = 0;
-  $handler->display->display_options['filters']['delivery_last_name']['expose']['remember'] = 1;
-  $handler->display->display_options['filters']['delivery_last_name']['expose']['multiple'] = FALSE;
+  $handler->display->display_options['filters']['delivery_last_name']['expose']['remember'] = TRUE;
   /* Filter criterion: Order: Delivery address: Company */
   $handler->display->display_options['filters']['delivery_company']['id'] = 'delivery_company';
   $handler->display->display_options['filters']['delivery_company']['table'] = 'uc_orders';
@@ -343,28 +321,13 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['delivery_company']['expose']['label'] = 'Delivery company';
   $handler->display->display_options['filters']['delivery_company']['expose']['operator'] = 'delivery_company_op';
   $handler->display->display_options['filters']['delivery_company']['expose']['identifier'] = 'delivery_company';
-  $handler->display->display_options['filters']['delivery_company']['expose']['required'] = 0;
-  $handler->display->display_options['filters']['delivery_company']['expose']['remember'] = 1;
-  $handler->display->display_options['filters']['delivery_company']['expose']['multiple'] = FALSE;
-  if (module_exists('date_views')) {
-    /* Filter criterion: Order: Creation date */
-    $handler->display->display_options['filters']['created']['id'] = 'created';
-    $handler->display->display_options['filters']['created']['table'] = 'uc_orders';
-    $handler->display->display_options['filters']['created']['field'] = 'created';
-    $handler->display->display_options['filters']['created']['operator'] = 'between';
-    $handler->display->display_options['filters']['created']['group'] = 0;
-    $handler->display->display_options['filters']['created']['exposed'] = TRUE;
-    $handler->display->display_options['filters']['created']['expose']['operator_id'] = 'created_op';
-    $handler->display->display_options['filters']['created']['expose']['operator'] = 'created_op';
-    $handler->display->display_options['filters']['created']['expose']['identifier'] = 'created';
-    $handler->display->display_options['filters']['created']['expose']['multiple'] = FALSE;
-  }
+  $handler->display->display_options['filters']['delivery_company']['expose']['remember'] = TRUE;
   /* Filter criterion: Order: Order status */
   $handler->display->display_options['filters']['order_status']['id'] = 'order_status';
   $handler->display->display_options['filters']['order_status']['table'] = 'uc_orders';
   $handler->display->display_options['filters']['order_status']['field'] = 'order_status';
   $handler->display->display_options['filters']['order_status']['value'] = array(
-    '_active' => '_active',
+	'_active' => '_active',
   );
   $handler->display->display_options['filters']['order_status']['group'] = 0;
   $handler->display->display_options['filters']['order_status']['exposed'] = TRUE;
@@ -372,41 +335,38 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['order_status']['expose']['label'] = 'View by status';
   $handler->display->display_options['filters']['order_status']['expose']['operator'] = 'order_status_op';
   $handler->display->display_options['filters']['order_status']['expose']['identifier'] = 'order_status';
-  $handler->display->display_options['filters']['order_status']['expose']['reduce'] = 0;
   $handler->display->display_options['path'] = 'admin/store/orders/search';
   $handler->display->display_options['menu']['type'] = 'normal';
   $handler->display->display_options['menu']['title'] = 'Search orders';
   $handler->display->display_options['menu']['description'] = 'Search existing orders.';
   $handler->display->display_options['menu']['weight'] = '0';
   $handler->display->display_options['menu']['name'] = 'management';
-
+  
   /* Display: By customer */
   $handler = $view->new_display('page', 'By customer', 'by_customer');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['defaults']['arguments'] = FALSE;
   /* Contextual filter: User: Uid */
   $handler->display->display_options['arguments']['uid']['id'] = 'uid';
   $handler->display->display_options['arguments']['uid']['table'] = 'users';
   $handler->display->display_options['arguments']['uid']['field'] = 'uid';
   $handler->display->display_options['arguments']['uid']['default_action'] = 'not found';
-  $handler->display->display_options['arguments']['uid']['title_enable'] = 1;
+  $handler->display->display_options['arguments']['uid']['title_enable'] = TRUE;
   $handler->display->display_options['arguments']['uid']['title'] = 'Customer orders: %1';
   $handler->display->display_options['arguments']['uid']['default_argument_type'] = 'fixed';
-  $handler->display->display_options['arguments']['uid']['default_argument_skip_url'] = 0;
   $handler->display->display_options['arguments']['uid']['summary']['number_of_records'] = '0';
   $handler->display->display_options['arguments']['uid']['summary']['format'] = 'default_summary';
   $handler->display->display_options['arguments']['uid']['summary_options']['items_per_page'] = '25';
-  $handler->display->display_options['arguments']['uid']['specify_validation'] = 1;
+  $handler->display->display_options['arguments']['uid']['specify_validation'] = TRUE;
   $handler->display->display_options['arguments']['uid']['validate']['type'] = 'user';
-  $handler->display->display_options['arguments']['uid']['validate_options']['restrict_roles'] = 0;
-  $handler->display->display_options['arguments']['uid']['break_phrase'] = 0;
-  $handler->display->display_options['arguments']['uid']['not'] = 0;
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Order: Order status */
   $handler->display->display_options['filters']['order_status']['id'] = 'order_status';
   $handler->display->display_options['filters']['order_status']['table'] = 'uc_orders';
   $handler->display->display_options['filters']['order_status']['field'] = 'order_status';
   $handler->display->display_options['filters']['order_status']['value'] = array(
-    '_active' => '_active',
+	'_active' => '_active',
   );
   $handler->display->display_options['filters']['order_status']['group'] = 0;
   $handler->display->display_options['filters']['order_status']['exposed'] = TRUE;
@@ -414,8 +374,48 @@ function uc_order_views_default_views() {
   $handler->display->display_options['filters']['order_status']['expose']['label'] = 'View by status';
   $handler->display->display_options['filters']['order_status']['expose']['operator'] = 'order_status_op';
   $handler->display->display_options['filters']['order_status']['expose']['identifier'] = 'order_status';
-  $handler->display->display_options['filters']['order_status']['expose']['reduce'] = 0;
   $handler->display->display_options['path'] = 'admin/store/customers/orders';
+  $translatables['uc_orders'] = array(
+	t('Defaults'),
+	t('Orders'),
+	t('more'),
+	t('Apply'),
+	t('Reset'),
+	t('Sort by'),
+	t('Asc'),
+	t('Desc'),
+	t('Items per page'),
+	t('- All -'),
+	t('Offset'),
+	t('« first'),
+	t('‹ previous'),
+	t('next ›'),
+	t('last »'),
+	t('Order'),
+	t('Actions'),
+	t('Order ID'),
+	t('[billing_full_name]'),
+	t('Customer'),
+	t('Total'),
+	t('.'),
+	t(','),
+	t('Purchase date'),
+	t('Status'),
+	t('View order number'),
+	t('View by status'),
+	t('Admin page'),
+	t('Search'),
+	t('Search orders'),
+	t('Billing first name'),
+	t('Billing last name'),
+	t('Billing company'),
+	t('Delivery first name'),
+	t('Delivery last name'),
+	t('Delivery company'),
+	t('By customer'),
+	t('All'),
+	t('Customer orders: %1'),
+  );
   $views[$view->name] = $view;
 
   $view = new view;