diff --git a/commerce_ui.module b/commerce_ui.module
index 571a2b8..7701ea8 100644
--- a/commerce_ui.module
+++ b/commerce_ui.module
@@ -17,28 +17,18 @@ function commerce_ui_menu() {
   $items['admin/commerce'] = array(
     'title' => 'Store',
     'description' => 'Administer your store.',
-    'position' => 'right',
-    'weight' => 1,
-    'page callback' => 'commerce_ui_dashboard',
+    'page callback' => 'system_admin_menu_block_page',
     'access arguments' => array('access administration pages'),
     'file path' => drupal_get_path('module', 'system'),
     'file' => 'system.admin.inc',
   );
-  $items['admin/commerce/dashboard'] = array(
-    'title' => 'Dashboard',
-    'description' => 'Display a dashboard of store information.',
-    'weight' => -10,
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
   $items['admin/commerce/config'] = array(
     'title' => 'Configuration',
     'description' => 'Configure settings and business rules for your store.',
-    'position' => 'right',
-    'weight' => 10,
-    'page callback' => 'commerce_ui_configuration_overview',
+    'page callback' => 'system_admin_menu_block_page',
     'access arguments' => array('access administration pages'),
-    'type' => MENU_LOCAL_TASK,
-    'weight' => 5,
+    'type' => MENU_NORMAL_ITEM,
+    'weight' => 10,
     'file path' => drupal_get_path('module', 'system'),
     'file' => 'system.admin.inc',
   );
@@ -61,34 +51,9 @@ function commerce_ui_menu() {
 function commerce_ui_admin_paths() {
   $paths = array(
     'admin/commerce' => TRUE,
-    'admin/commerce/dashboard' => TRUE,
     'admin/commerce/config' => TRUE,
+    'admin/commerce/config/currency' => TRUE,
   );
 
   return $paths;
 }
-
-/**
- * Displays the store dashboard tab.
- */
-function commerce_ui_dashboard() {
-  // Get rid of the normal admin Dashboard breadcrumb.
-  drupal_set_breadcrumb(array(l(t('Home'), '<front>')));
-
-  return system_admin_menu_block_page();
-}
-
-/**
- * Displays the store configuration overview.
- */
-function commerce_ui_configuration_overview() {
-  // Get rid of the normal admin Dashboard breadcrumb.
-  $breadcrumb = array(
-    l(t('Home'), '<front>'),
-    l(t('Store'), 'admin/commerce'),
-  );
-
-  drupal_set_breadcrumb($breadcrumb);
-
-  return system_admin_menu_block_page();
-}
diff --git a/modules/order/commerce_order_ui.module b/modules/order/commerce_order_ui.module
index 25e34d1..a6b8c7a 100644
--- a/modules/order/commerce_order_ui.module
+++ b/modules/order/commerce_order_ui.module
@@ -21,6 +21,8 @@ function commerce_order_ui_menu() {
     'page arguments' => array('commerce_order_ui_order_form', commerce_order_new()),
     'access callback' => 'commerce_order_access',
     'access arguments' => array('create'),
+    'type' => MENU_LOCAL_ACTION,
+    'weight' => 10,
     'file' => 'includes/commerce_order_ui.orders.inc',
   );
   $items['admin/commerce/orders/add/%user'] = array(
@@ -30,6 +32,7 @@ function commerce_order_ui_menu() {
     'page arguments' => array('commerce_order_ui_order_form', commerce_order_new(), 4),
     'access callback' => 'commerce_order_access',
     'access arguments' => array('create'),
+    'type' => MENU_CALLBACK,
     'file' => 'includes/commerce_order_ui.orders.inc',
   );
 
@@ -109,34 +112,22 @@ function commerce_order_ui_menu_alter(&$items) {
 }
 
 /**
- * Implements hook_menu_local_tasks_alter().
- */
-function commerce_order_ui_menu_local_tasks_alter(&$data, $router_item, $root_path) {
-  // Add action link to 'admin/commerce/orders/add' on 'admin/commerce/orders' page.
-  if ($root_path == 'admin/commerce/orders') {
-    $item = menu_get_item('admin/commerce/orders/add');
-    if ($item['access']) {
-      $item['title'] = t('Create an order');
-      $data['actions']['output'][] = array(
-        '#theme' => 'menu_local_action',
-        '#link' => $item,
-      );
-    }
-  }
-}
-
-/**
  * Implements hook_admin_paths().
  */
 function commerce_order_ui_admin_paths() {
   $paths = array(
     'admin/commerce/orders' => TRUE,
+    'admin/commerce/orders/list' => TRUE,
     'admin/commerce/orders/add' => TRUE,
     'admin/commerce/orders/add/*' => TRUE,
+    'admin/commerce/orders/*' => TRUE,
+    'admin/commerce/orders/*/view' => TRUE,
     'admin/commerce/orders/*/edit' => TRUE,
     'admin/commerce/orders/*/delete' => TRUE,
+    'admin/commerce/config/order' => TRUE,
     'admin/commerce/config/order/settings' => TRUE,
-    'admin/commerce/config/order/settings/*' => TRUE,
+    'admin/commerce/config/order/settings/fields' => TRUE,
+    'admin/commerce/config/order/settings/display' => TRUE,
   );
 
   return $paths;
@@ -182,9 +173,10 @@ function commerce_order_ui_views_api() {
 /**
  * Sets the breadcrumb for administrative order pages.
  */
-function commerce_order_set_breadcrumb() {
+function commerce_order_ui_set_breadcrumb() {
   $breadcrumb = array(
     l(t('Home'), '<front>'),
+    l(t('Dashboard'), 'admin'),
     l(t('Store'), 'admin/commerce'),
     l(t('Orders'), 'admin/commerce/orders'),
   );
diff --git a/modules/order/includes/commerce_order_ui.orders.inc b/modules/order/includes/commerce_order_ui.orders.inc
index 70af9e2..557eebf 100644
--- a/modules/order/includes/commerce_order_ui.orders.inc
+++ b/modules/order/includes/commerce_order_ui.orders.inc
@@ -19,10 +19,10 @@ function commerce_order_settings_form() {
 }
 
 /**
- * Display a view of an order entity.
+ * Displays a view of an order entity.
  */
 function commerce_order_ui_order_view($mode, $order) {
-  commerce_order_set_breadcrumb();
+  commerce_order_ui_set_breadcrumb();
 
   return '<pre>' . print_r($order, TRUE) . '</pre>';
 }
@@ -42,14 +42,18 @@ function commerce_order_ui_order_view($mode, $order) {
  */
 function commerce_order_ui_order_form($form, &$form_state, $order, $account = NULL, $breadcrumb = TRUE) {
   if ($breadcrumb) {
-    commerce_order_set_breadcrumb();
+    commerce_order_ui_set_breadcrumb();
   }
 
   $form = array();
 
-  // Set the default customer if necessary.
-  if (empty($order->order_id) && !empty($account)) {
-    $order->customer_uid = $account->uid;
+  // Set the page title and a default customer if necessary.
+  if (empty($order->order_id)) {
+    drupal_set_title(t('Create an order'));
+
+    if (!empty($account)) {
+      $order->customer_uid = $account->uid;
+    }
   }
 
   // Add the field related form elements.
@@ -149,7 +153,7 @@ function commerce_order_ui_order_form_submit($form, &$form_state) {
  */
 function commerce_order_ui_order_delete_form($form, &$form_state, $order, $breadcrumb = TRUE) {
   if ($breadcrumb) {
-    commerce_order_set_breadcrumb();
+    commerce_order_ui_set_breadcrumb();
   }
 
   $form_state['order'] = $order;
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 5554720..3c2163b 100644
--- a/modules/order/includes/views/commerce_order_ui.views_default.inc
+++ b/modules/order/includes/views/commerce_order_ui.views_default.inc
@@ -24,7 +24,7 @@ function commerce_order_ui_views_default_views() {
 
   /* Display: Defaults */
   $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->display->display_options['title'] = 'Store';
+  $handler->display->display_options['title'] = 'Orders';
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'administer orders';
   $handler->display->display_options['cache']['type'] = 'none';
@@ -177,12 +177,13 @@ function commerce_order_ui_views_default_views() {
   $handler = $view->new_display('page', 'Admin page', 'admin_page');
   $handler->display->display_options['path'] = 'admin/commerce/orders/list';
   $handler->display->display_options['menu']['type'] = 'default tab';
-  $handler->display->display_options['menu']['title'] = 'Orders';
-  $handler->display->display_options['menu']['weight'] = '-5';
-  $handler->display->display_options['tab_options']['type'] = 'tab';
+  $handler->display->display_options['menu']['title'] = 'List';
+  $handler->display->display_options['menu']['weight'] = '-10';
+  $handler->display->display_options['tab_options']['type'] = 'normal';
   $handler->display->display_options['tab_options']['title'] = 'Orders';
   $handler->display->display_options['tab_options']['description'] = 'Manage orders in the store.';
   $handler->display->display_options['tab_options']['weight'] = '';
+  $handler->display->display_options['tab_options']['name'] = 'management';
 
   $views[$view->name] = $view;
 
diff --git a/modules/product/commerce_product_ui.module b/modules/product/commerce_product_ui.module
index 4a313bc..6c3556b 100644
--- a/modules/product/commerce_product_ui.module
+++ b/modules/product/commerce_product_ui.module
@@ -19,12 +19,14 @@ function commerce_product_ui_menu() {
     'description' => 'Add a new product for sale.',
     'page callback' => 'commerce_product_ui_add_page',
     'access callback' => 'commerce_product_ui_product_add_any_access',
+    'type' => MENU_LOCAL_ACTION,
+    'weight' => 10,
     'file' => 'includes/commerce_product_ui.products.inc',
   );
   foreach (commerce_product_types() as $type => $product_type) {
     $items['admin/commerce/products/add/' . $type] = array(
-      'title' => $product_type->name,
-      'title callback' => 'check_plain',
+      'title' => 'Create @name',
+      'title arguments' => array('@name' => $product_type->name),
       'description' => $product_type->description,
       'page callback' => 'drupal_get_form',
       'page arguments' => array('commerce_product_ui_product_form', commerce_product_new($type)),
@@ -34,6 +36,22 @@ function commerce_product_ui_menu() {
     );
   }
 
+  $items['admin/commerce/products/%commerce_product'] = array(
+    'title callback' => 'commerce_product_ui_product_title',
+    'title arguments' => array(3),
+    'page callback' => 'commerce_product_ui_product_view',
+    'page arguments' => array('administrator', 3),
+    'access callback' => 'commerce_product_access',
+    'access arguments' => array('view', 3),
+    'type' => MENU_CALLBACK,
+    'file' => 'includes/commerce_product_ui.products.inc',
+  );
+  $items['admin/commerce/products/%commerce_order/view'] = array(
+    'title' => 'View',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+    'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
+  );
   $items['admin/commerce/products/%commerce_product/edit'] = array(
     'title' => 'Edit',
     'page callback' => 'drupal_get_form',
@@ -41,6 +59,7 @@ function commerce_product_ui_menu() {
     'access callback' => 'commerce_product_access',
     'access arguments' => array('update', 3),
     'type' => MENU_LOCAL_TASK,
+    'weight' => 0,
     'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
     'file' => 'includes/commerce_product_ui.products.inc',
   );
@@ -50,6 +69,7 @@ function commerce_product_ui_menu() {
     'page arguments' => array('commerce_product_ui_product_delete_form', 3),
     'access callback' => 'commerce_product_access',
     'access arguments' => array('update', 3),
+    'type' => MENU_CALLBACK,
     'file' => 'includes/commerce_product_ui.products.inc',
   );
 
@@ -59,7 +79,7 @@ function commerce_product_ui_menu() {
     'page callback' => 'commerce_product_ui_types_overview',
     'access arguments' => array('administer products'),
     'type' => MENU_LOCAL_TASK,
-    'weight' => 10,
+    'weight' => 0,
     'file' => 'includes/commerce_product_ui.types.inc',
   );
   $items['admin/commerce/products/types/add'] = array(
@@ -99,6 +119,18 @@ function commerce_product_ui_menu() {
 }
 
 /**
+ * Menu item title callback: returns the SKU of a product for its pages.
+ *
+ * @param $product
+ *   The product object as loaded via the URL wildcard.
+ * @return
+ *   A page title of the format "Product: [SKU]".
+ */
+function commerce_product_ui_product_title($product) {
+  return t('Product: @sku', array('@sku' => $product->sku));
+}
+
+/**
  * Access callback: determine if the user can create any type of product.
  */
 function commerce_product_ui_product_add_any_access() {
@@ -127,30 +159,16 @@ function commerce_product_ui_menu_alter(&$items) {
 }
 
 /**
- * Implements hook_menu_local_tasks_alter().
- */
-function commerce_product_ui_menu_local_tasks_alter(&$data, $router_item, $root_path) {
-  // Add action link to 'admin/commerce/products/add' on 'admin/commerce/products' page.
-  if ($root_path == 'admin/commerce/products') {
-    $item = menu_get_item('admin/commerce/products/add');
-    if ($item['access']) {
-      $item['title'] = t('Add a product');
-      $data['actions']['output'][] = array(
-        '#theme' => 'menu_local_action',
-        '#link' => $item,
-      );
-    }
-  }
-}
-
-/**
  * Implements hook_admin_paths().
  */
 function commerce_product_ui_admin_paths() {
   $paths = array(
     'admin/commerce/products' => TRUE,
+    'admin/commerce/products/list' => TRUE,
     'admin/commerce/products/add' => TRUE,
     'admin/commerce/products/add/*' => TRUE,
+    'admin/commerce/products/*' => TRUE,
+    'admin/commerce/products/*/view' => TRUE,
     'admin/commerce/products/*/edit' => TRUE,
     'admin/commerce/products/*/delete' => TRUE,
     'admin/commerce/products/types' => TRUE,
@@ -158,6 +176,8 @@ function commerce_product_ui_admin_paths() {
     'admin/commerce/products/types/*' => TRUE,
     'admin/commerce/products/types/*/edit' => TRUE,
     'admin/commerce/products/types/*/delete' => TRUE,
+    'admin/commerce/products/types/*/fields' => TRUE,
+    'admin/commerce/products/types/*/display' => TRUE,
   );
 
   return $paths;
@@ -239,3 +259,17 @@ function commerce_product_ui_views_api() {
     'path' => drupal_get_path('module', 'commerce_product_ui') . '/includes/views',
   );
 }
+
+/**
+ * Sets the breadcrumb for administrative product pages.
+ */
+function commerce_product_ui_set_breadcrumb() {
+  $breadcrumb = array(
+    l(t('Home'), '<front>'),
+    l(t('Dashboard'), 'admin'),
+    l(t('Store'), 'admin/commerce'),
+    l(t('Products'), 'admin/commerce/products'),
+  );
+
+  drupal_set_breadcrumb($breadcrumb);
+}
diff --git a/modules/product/includes/commerce_product_ui.products.inc b/modules/product/includes/commerce_product_ui.products.inc
index 54e153f..b5718ae 100644
--- a/modules/product/includes/commerce_product_ui.products.inc
+++ b/modules/product/includes/commerce_product_ui.products.inc
@@ -2,6 +2,15 @@
 // $Id$
 
 /**
+ * Displays a view of a product entity.
+ */
+function commerce_product_ui_product_view($mode, $product) {
+  commerce_product_ui_set_breadcrumb();
+
+  return '<pre>' . print_r($product, TRUE) . '</pre>';
+}
+
+/**
  * Menu callback: display a list of product types that the user can create.
  */
 function commerce_product_ui_add_page() {
@@ -50,7 +59,11 @@ function theme_product_add_list($variables) {
 /**
  * Form callback: create or edit a product.
  */
-function commerce_product_ui_product_form($form, &$form_state, $product) {
+function commerce_product_ui_product_form($form, &$form_state, $product, $breadcrumb = TRUE) {
+  if ($breadcrumb) {
+    commerce_product_ui_set_breadcrumb();
+  }
+
   $form = array();
 
   // Add the default field elements.
@@ -188,7 +201,11 @@ function commerce_product_ui_product_form_submit($form, &$form_state) {
 /**
  * Confirmation form for deleting a product.
  */
-function commerce_product_ui_product_delete_form($form, &$form_state, $product) {
+function commerce_product_ui_product_delete_form($form, &$form_state, $product, $breadcrumb = TRUE) {
+  if ($breadcrumb) {
+    commerce_product_ui_set_breadcrumb();
+  }
+
   $form_state['product'] = $product;
 
   // TODO: Replace the SKU in the description parameter with the product view
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 008a735..b57d12b 100644
--- a/modules/product/includes/views/commerce_product_ui.views_default.inc
+++ b/modules/product/includes/views/commerce_product_ui.views_default.inc
@@ -19,12 +19,12 @@ function commerce_product_ui_views_default_views() {
   $view->view_php = '';
   $view->base_table = 'commerce_product';
   $view->is_cacheable = FALSE;
-  $view->api_version = '3.0-alpha1';
+  $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->display->display_options['title'] = 'Store';
+  $handler->display->display_options['title'] = 'Products';
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'administer products';
   $handler->display->display_options['cache']['type'] = 'none';
@@ -165,12 +165,13 @@ function commerce_product_ui_views_default_views() {
   $handler = $view->new_display('page', 'Admin page', 'admin_page');
   $handler->display->display_options['path'] = 'admin/commerce/products/list';
   $handler->display->display_options['menu']['type'] = 'default tab';
-  $handler->display->display_options['menu']['title'] = 'Products';
-  $handler->display->display_options['menu']['weight'] = '0';
-  $handler->display->display_options['tab_options']['type'] = 'tab';
+  $handler->display->display_options['menu']['title'] = 'List';
+  $handler->display->display_options['menu']['weight'] = '-10';
+  $handler->display->display_options['tab_options']['type'] = 'normal';
   $handler->display->display_options['tab_options']['title'] = 'Products';
-  $handler->display->display_options['tab_options']['description'] = 'Manage products from the store.';
+  $handler->display->display_options['tab_options']['description'] = 'Manage products and product types in the store.';
   $handler->display->display_options['tab_options']['weight'] = '';
+  $handler->display->display_options['tab_options']['name'] = 'management';
 
   $views[$view->name] = $view;