diff --git a/modules/customer/commerce_customer_ui.info b/modules/customer/commerce_customer_ui.info
index 7aa9ffa..24c8392 100644
--- a/modules/customer/commerce_customer_ui.info
+++ b/modules/customer/commerce_customer_ui.info
@@ -16,6 +16,7 @@ files[] = includes/commerce_customer_ui.profile_types.inc
 
 ; Views includes
 files[] = includes/views/commerce_customer_ui.views_default.inc
+files[] = includes/views/handlers/commerce_customer_profile_ui_handler_area_empty_text.inc
 
 ; Simple tests
 files[] = tests/commerce_customer_ui.test
diff --git a/modules/customer/includes/views/commerce_customer.views.inc b/modules/customer/includes/views/commerce_customer.views.inc
index 3f572d3..694c849 100644
--- a/modules/customer/includes/views/commerce_customer.views.inc
+++ b/modules/customer/includes/views/commerce_customer.views.inc
@@ -253,5 +253,13 @@ function commerce_customer_views_data() {
     ),
   );
 
+  $data['commerce_customer_profile']['empty'] = array(
+    'title' => t('Empty text'),
+    'help' => t('A message to display when there are no customer profiles.'),
+    'area' => array(
+      'handler' => 'commerce_customer_profile_ui_handler_area_empty_text',
+    ),
+  );
+
   return $data;
 }
diff --git a/modules/customer/includes/views/commerce_customer_ui.views_default.inc b/modules/customer/includes/views/commerce_customer_ui.views_default.inc
index 0a5db32..167d03b 100644
--- a/modules/customer/includes/views/commerce_customer_ui.views_default.inc
+++ b/modules/customer/includes/views/commerce_customer_ui.views_default.inc
@@ -98,14 +98,12 @@ function commerce_customer_ui_views_default_views() {
   );
   $handler->display->display_options['style_options']['override'] = 1;
   $handler->display->display_options['style_options']['sticky'] = 0;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
-  /* 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;
-  $handler->display->display_options['empty']['area']['content'] = 'No customer profiles have been created yet.';
-  $handler->display->display_options['empty']['area']['format'] = 'plain_text';
+  $handler->display->display_options['style_options']['empty_table'] = 1;
+  /* No results behavior: Commerce Customer Profile: Empty text */
+  $handler->display->display_options['empty']['empty']['id'] = 'empty';
+  $handler->display->display_options['empty']['empty']['table'] = 'commerce_customer_profile';
+  $handler->display->display_options['empty']['empty']['field'] = 'empty';
+  $handler->display->display_options['empty']['empty']['empty'] = FALSE;
   /* Relationship: Commerce Customer Profile: Owner */
   $handler->display->display_options['relationships']['uid']['id'] = 'uid';
   $handler->display->display_options['relationships']['uid']['table'] = 'commerce_customer_profile';
diff --git a/modules/customer/includes/views/handlers/commerce_customer_profile_ui_handler_area_empty_text.inc b/modules/customer/includes/views/handlers/commerce_customer_profile_ui_handler_area_empty_text.inc
new file mode 100644
index 0000000..f177cdf
--- /dev/null
+++ b/modules/customer/includes/views/handlers/commerce_customer_profile_ui_handler_area_empty_text.inc
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * Area handler to display the empty text message for customer profiles.
+ */
+class commerce_customer_profile_ui_handler_area_empty_text extends views_handler_area {
+  public function render($empty = FALSE) {
+    return t('No customer profiles have been created yet. <a href="!link">Add customer profile</a>.', array('!link' => url('http://commerce.localhost/admin/commerce/customer-profiles/add')));
+  }
+}
\ No newline at end of file
diff --git a/modules/order/commerce_order_ui.info b/modules/order/commerce_order_ui.info
index 71353e9..f399289 100644
--- a/modules/order/commerce_order_ui.info
+++ b/modules/order/commerce_order_ui.info
@@ -13,6 +13,7 @@ configure = admin/commerce/config/order
 
 ; Views handlers
 files[] = includes/views/handlers/commerce_order_ui_handler_area_view_order_form.inc
+files[] = includes/views/handlers/commerce_order_ui_handler_area_empty_text.inc
 
 ; Simple tests
 files[] = tests/commerce_order_ui.test
diff --git a/modules/order/includes/views/commerce_order_ui.views.inc b/modules/order/includes/views/commerce_order_ui.views.inc
index eb7e900..64a85e7 100644
--- a/modules/order/includes/views/commerce_order_ui.views.inc
+++ b/modules/order/includes/views/commerce_order_ui.views.inc
@@ -19,5 +19,13 @@ function commerce_order_ui_views_data() {
     ),
   );
 
+  $data['commerce_order']['empty'] = array(
+    'title' => t('Order empty text'),
+    'help' => t('Display a message when there are no orders.'),
+    'area' => array(
+      'handler' => 'commerce_order_ui_handler_area_empty_text',
+    ),
+  );
+
   return $data;
 }
diff --git a/modules/order/includes/views/commerce_order_ui.views_default.inc b/modules/order/includes/views/commerce_order_ui.views_default.inc
index 16ef56e..5ce7041 100644
--- a/modules/order/includes/views/commerce_order_ui.views_default.inc
+++ b/modules/order/includes/views/commerce_order_ui.views_default.inc
@@ -95,18 +95,16 @@ function commerce_order_ui_views_default_views() {
   );
   $handler->display->display_options['style_options']['override'] = 1;
   $handler->display->display_options['style_options']['sticky'] = 0;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
+  $handler->display->display_options['style_options']['empty_table'] = 1;
   /* Header: Global: View order form */
   $handler->display->display_options['header']['view_order_form']['id'] = 'view_order_form';
   $handler->display->display_options['header']['view_order_form']['table'] = 'views';
   $handler->display->display_options['header']['view_order_form']['field'] = 'view_order_form';
-  /* No results behavior: Global: Text area */
-  $handler->display->display_options['empty']['text']['id'] = 'text';
-  $handler->display->display_options['empty']['text']['table'] = 'views';
-  $handler->display->display_options['empty']['text']['field'] = 'area';
-  $handler->display->display_options['empty']['text']['empty'] = FALSE;
-  $handler->display->display_options['empty']['text']['content'] = 'No orders have been created yet.';
-  $handler->display->display_options['empty']['text']['format'] = 'plain_text';
+  /* No results behavior: Commerce Order: Order empty text */
+  $handler->display->display_options['empty']['empty']['id'] = 'empty';
+  $handler->display->display_options['empty']['empty']['table'] = 'commerce_order';
+  $handler->display->display_options['empty']['empty']['field'] = 'empty';
+  $handler->display->display_options['empty']['empty']['empty'] = FALSE;
   /* Relationship: Commerce Order: Owner */
   $handler->display->display_options['relationships']['uid']['id'] = 'uid';
   $handler->display->display_options['relationships']['uid']['table'] = 'commerce_order';
diff --git a/modules/order/includes/views/handlers/commerce_order_ui_handler_area_empty_text.inc b/modules/order/includes/views/handlers/commerce_order_ui_handler_area_empty_text.inc
new file mode 100644
index 0000000..841cd6c
--- /dev/null
+++ b/modules/order/includes/views/handlers/commerce_order_ui_handler_area_empty_text.inc
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * Area handler to display the empty text message for products.
+ */
+class commerce_order_ui_handler_area_empty_text extends views_handler_area {
+  public function render($empty = FALSE) {
+    return t('No orders have been created yet. <a href="!link">Add order</a>.', array('!link' => url('admin/commerce/orders/add')));
+  }
+}
\ No newline at end of file
diff --git a/modules/product/commerce_product_ui.info b/modules/product/commerce_product_ui.info
index 67b808b..463db9a 100644
--- a/modules/product/commerce_product_ui.info
+++ b/modules/product/commerce_product_ui.info
@@ -10,5 +10,8 @@ dependencies[] = views
 core = 7.x
 configure = admin/commerce/products/types
 
+; Views handlers
+files[] = includes/views/handlers/commerce_product_ui_handler_area_empty_text.inc
+
 ; Simple tests
 files[] = tests/commerce_product_ui.test
diff --git a/modules/product/includes/views/commerce_product.views.inc b/modules/product/includes/views/commerce_product.views.inc
index 622719b..f9a64cb 100644
--- a/modules/product/includes/views/commerce_product.views.inc
+++ b/modules/product/includes/views/commerce_product.views.inc
@@ -299,5 +299,13 @@ function commerce_product_views_data() {
     ),
   );
 
+  $data['commerce_product']['empty'] = array(
+    'title' => t('Empty text'),
+    'help' => t('A message to display when there are no products.'),
+    'area' => array(
+      'handler' => 'commerce_product_ui_handler_area_empty_text',
+    ),
+  );
+
   return $data;
 }
diff --git a/modules/product/includes/views/commerce_product_ui.views_default.inc b/modules/product/includes/views/commerce_product_ui.views_default.inc
index 76b2153..b971a8c 100644
--- a/modules/product/includes/views/commerce_product_ui.views_default.inc
+++ b/modules/product/includes/views/commerce_product_ui.views_default.inc
@@ -90,14 +90,12 @@ function commerce_product_ui_views_default_views() {
   );
   $handler->display->display_options['style_options']['override'] = 1;
   $handler->display->display_options['style_options']['sticky'] = 0;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
-  /* No results behavior: Global: Text area */
-  $handler->display->display_options['empty']['text']['id'] = 'text';
-  $handler->display->display_options['empty']['text']['table'] = 'views';
-  $handler->display->display_options['empty']['text']['field'] = 'area';
-  $handler->display->display_options['empty']['text']['empty'] = FALSE;
-  $handler->display->display_options['empty']['text']['content'] = 'No products have been created yet.';
-  $handler->display->display_options['empty']['text']['format'] = 'plain_text';
+  $handler->display->display_options['style_options']['empty_table'] = 1;
+  /* No results behavior: Commerce Product: Empty text */
+  $handler->display->display_options['empty']['empty']['id'] = 'empty';
+  $handler->display->display_options['empty']['empty']['table'] = 'commerce_product';
+  $handler->display->display_options['empty']['empty']['field'] = 'empty';
+  $handler->display->display_options['empty']['empty']['empty'] = FALSE;
   /* Field: Commerce Product: SKU */
   $handler->display->display_options['fields']['sku']['id'] = 'sku';
   $handler->display->display_options['fields']['sku']['table'] = 'commerce_product';
diff --git a/modules/product/includes/views/handlers/commerce_product_ui_handler_area_empty_text.inc b/modules/product/includes/views/handlers/commerce_product_ui_handler_area_empty_text.inc
new file mode 100644
index 0000000..7d0a553
--- /dev/null
+++ b/modules/product/includes/views/handlers/commerce_product_ui_handler_area_empty_text.inc
@@ -0,0 +1,10 @@
+<?php
+
+/**
+ * Area handler to display the empty text message for products.
+ */
+class commerce_product_ui_handler_area_empty_text extends views_handler_area {
+  public function render($empty = FALSE) {
+    return t('No products have been created yet. <a href="!link">Add product</a>.', array('!link' => url('admin/commerce/products/add')));
+  }
+}
\ No newline at end of file