diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index 6c2f9b7..d3e0b0d 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -73,7 +73,7 @@ function fieldable_panels_panes_entity_info() {
     'save callback' => 'fieldable_panels_panes_save',
     'deletion callback' => 'fieldable_panels_panes_delete',
 
-    // Entity translation support
+    // Entity translation support.
     'translation' => array(
       'entity_translation' => array(
         'class' => 'EntityTranslationFieldablePanelsPaneHandler',
@@ -83,7 +83,7 @@ function fieldable_panels_panes_entity_info() {
       ),
     ),
 
-    // Title module support
+    // Title module support.
     'field replacement' => array(
       'title' => array(
         'field' => array(
@@ -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,20 @@ 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),
+    'title arguments' => array(3),
     'page callback' => 'fieldable_panels_panes_entities_list_page',
-    'page arguments' => array(4),
+    'page arguments' => array(3),
   ) + $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),
+    'page arguments' => array(3),
     'access callback' => 'fieldable_panels_panes_access',
-    'access arguments' => array('create', 4),
-    'type' => MENU_LOCAL_TASK,
+    'access arguments' => array('create', 3),
+    'type' => MENU_LOCAL_ACTION,
     'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
   ) + $base;
 
@@ -421,20 +415,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(
@@ -632,6 +617,19 @@ function fieldable_panels_pane_type_load($type) {
   if (isset($entity_info['bundles'][$type])) {
     return $type;
   }
+  else {
+    // Special handling for two legacy paths:
+    // * admin/structure/fieldable-panels-panes/manage/FPPTYPE/fields
+    // * admin/structure/fieldable-panels-panes/manage/FPPTYPE/display
+    // Redirect these paths as appropriate.
+    if ($type == 'manage' && (arg(5) == 'fields' || arg(5) == 'display')) {
+      drupal_goto('admin/structure/fieldable-panels-panes/' . arg(4) . '/' . arg(5));
+    }
+
+    // If nothing else was found, redirect to the main FPP admin page.
+    drupal_set_message(t('Unable to load the "@type" Fieldable Panels Pane type.', array('@type' => $type)));
+    drupal_goto('admin/structure/fieldable-panels-panes');
+  }
 }
 
 /**
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'),
diff --git a/tests/fpp.permissions.test b/tests/fpp.permissions.test
index 1d485d4..7e502e5 100644
--- a/tests/fpp.permissions.test
+++ b/tests/fpp.permissions.test
@@ -77,14 +77,13 @@ function testAdminPermission() {
     $this->assertResponse(200, 'Loaded the Manage Display page for the default FPP type.');
     $this->assertText(t('Use custom display settings for the following view modes'));
 
-    // These two paths don't exist.
+    // These two legacy paths should redirect to the correct paths.
     $this->drupalGet('admin/structure/fieldable-panels-panes/manage/' . $this->bundle . '/fields');
     $this->assertResponse(200);
-    $this->assertText(t('There are currently no entities of this type.'), 'The old(?) FPP manage fields URL no longer works.');
-
+    $this->assertEqual($this->getUrl(), url('admin/structure/fieldable-panels-panes/' . $this->bundle . '/fields', array('absolute' => TRUE)));
     $this->drupalGet('admin/structure/fieldable-panels-panes/manage/' . $this->bundle . '/display');
     $this->assertResponse(200);
-    $this->assertText(t('There are currently no entities of this type.'), 'The old(?) FPP manage display URL no longer works.');
+    $this->assertEqual($this->getUrl(), url('admin/structure/fieldable-panels-panes/' . $this->bundle . '/display', array('absolute' => TRUE)));
   }
 
   /**
@@ -110,7 +109,7 @@ function testListPermission() {
   function testCreateBundlePermission() {
     // Create a user with the admin permission.
     $permissions = array(
-      'create fieldable ' . $this->bundle,
+      "create fieldable {$this->bundle}",
     );
     $this->user = $this->createUser($permissions);
     $this->drupalLogin($this->user);
@@ -150,7 +149,7 @@ function testCreateBundlePermission() {
   function testEditBundlePermission() {
     // Create a user with edit permission.
     $permissions = array(
-      'edit fieldable ' . $this->bundle,
+      "edit fieldable {$this->bundle}",
     );
     $this->user = $this->createUser($permissions);
     $this->drupalLogin($this->user);
@@ -166,8 +165,8 @@ function testEditBundlePermission() {
   function testCreateEditBundlePermission() {
     // Create a user with create & edit permission.
     $permissions = array(
-      'create fieldable ' . $this->bundle,
-      'edit fieldable ' . $this->bundle,
+      "create fieldable {$this->bundle}",
+      "edit fieldable {$this->bundle}",
     );
     $this->user = $this->createUser($permissions);
     $this->drupalLogin($this->user);
@@ -200,8 +199,8 @@ function testCreateEditBundlePermission() {
   function testDeleteBundlePermission() {
     // Create a user with the admin permission.
     $permissions = array(
-      'create fieldable ' . $this->bundle,
-      'delete fieldable ' . $this->bundle,
+      "create fieldable {$this->bundle}",
+      "delete fieldable {$this->bundle}",
     );
     $this->user = $this->createUser($permissions);
     $this->drupalLogin($this->user);