diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index 6c2f9b7..f8e6d9c 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -224,7 +224,8 @@ function fieldable_panels_panes_menu() {
     'file' => 'includes/admin.inc',
   );
 
-  // Legacy paths to support the old method of providing bundles via entity_hook_info().
+  // Legacy paths to support the old method of providing bundles via
+  // entity_hook_info().
   $items['admin/structure/fieldable-panels-panes/view/%fieldable_panels_panes'] = array(
     'title callback' => 'fieldable_panels_panes_entity_title',
     'title arguments' => array(4),
@@ -255,7 +256,7 @@ function fieldable_panels_panes_menu() {
     'weight' => -9,
   ) + $base;
 
-  // Access control
+  // Access control.
   $items['admin/structure/fieldable-panels-panes/view/%fieldable_panels_panes/access'] = array(
     'title' => 'Access control',
     'type' => MENU_LOCAL_TASK,
@@ -391,27 +392,21 @@ function fieldable_panels_panes_menu() {
     );
   }
 
-  $items['admin/structure/fieldable-panels-panes/manage/%fieldable_panels_pane_type'] = array(
+  $items['admin/structure/fieldable-panels-panes/%fieldable_panels_pane_type'] = array(
     'title callback' => 'fieldable_panels_panes_entities_title',
     'title arguments' => array(4),
     'page callback' => 'fieldable_panels_panes_entities_list_page',
     'page arguments' => array(4),
+    // 'type' => MENU_LOCAL_TASK,
   ) + $base;
 
-  $items['admin/structure/fieldable-panels-panes/manage/%fieldable_panels_pane_type/list'] = array(
-    'title' => 'List',
-    'type' => MENU_LOCAL_TASK,
-    'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
-    'weight' => -10,
-  );
-
-  $items['admin/structure/fieldable-panels-panes/manage/%fieldable_panels_pane_type/add'] = array(
-    'title' => 'Add fieldable panel pane',
+  $items['admin/structure/fieldable-panels-panes/%fieldable_panels_pane_type/add'] = array(
+    'title' => 'Add fieldable panels pane',
     'page callback' => 'fieldable_panels_panes_entities_add_page',
     'page arguments' => array(4),
     'access callback' => 'fieldable_panels_panes_access',
     'access arguments' => array('create', 4),
-    'type' => MENU_LOCAL_TASK,
+    'type' => MENU_LOCAL_ACTION,
     'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
   ) + $base;
 
@@ -421,20 +416,11 @@ function fieldable_panels_panes_menu() {
     'page arguments' => array(3),
     'access callback' => 'fieldable_panels_panes_access_callback',
     'access arguments' => array(),
-    'type' => MENU_LOCAL_TASK,
+    'type' => MENU_DEFAULT_LOCAL_TASK,
     'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
     'weight' => -10,
   ) + $base;
 
-  $items['admin/structure/fieldable-panels-panes/%fieldable_panels_pane_type/add'] = array(
-    'title' => 'Add',
-    'page callback' => 'fieldable_panels_panes_entities_add_page',
-    'page arguments' => array(3),
-    'access callback' => 'fieldable_panels_panes_access',
-    'access arguments' => array('create', 3),
-    'type' => MENU_LOCAL_TASK,
-    'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
-  ) + $base;
 
   // Settings.
   $items['admin/structure/fieldable-panels-panes/settings'] = array(
diff --git a/plugins/export_ui/fieldable_panels_pane.class.php b/plugins/export_ui/fieldable_panels_pane.class.php
index 2e79076..b7b1ec0 100644
--- a/plugins/export_ui/fieldable_panels_pane.class.php
+++ b/plugins/export_ui/fieldable_panels_pane.class.php
@@ -178,13 +178,13 @@ function list_footer($form_state) {
         if (user_access('administer fieldable panels panes') || user_access('access fieldable panels panes master list')) {
           $operations['list'] = array(
             'title' => t('list'),
-            'href' => 'admin/structure/fieldable-panels-panes/manage/' . $bundle,
+            'href' => 'admin/structure/fieldable-panels-panes/' . $bundle,
           );
         }
         if (user_access('administer fieldable panels panes')) {
           $operations['add'] = array(
             'title' => t('add'),
-            'href' => 'admin/structure/fieldable-panels-panes/manage/' . $bundle . '/add',
+            'href' => 'admin/structure/fieldable-panels-panes/' . $bundle . '/add',
           );
           $operations['edit'] = array(
             'title' => t('edit'),