diff --git a/bean_admin_ui/bean_admin_ui.module b/bean_admin_ui/bean_admin_ui.module
index 6512757..89383d3 100644
--- a/bean_admin_ui/bean_admin_ui.module
+++ b/bean_admin_ui/bean_admin_ui.module
@@ -32,27 +32,31 @@ function bean_admin_ui_menu() {
     'access arguments' => array('administer bean types'),
     'type' => MENU_LOCAL_ACTION,
     'file' => 'bean_admin_ui.admin.inc',
+    'weight' => -9,
   );
 
-  $items['admin/structure/block-types/manage/%bean_type'] = array(
-    'title' => 'Edit block type',
-    'title arguments' => array(4),
-    'title callback' => 'bean_admin_ui_page_title',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('bean_admin_ui_type_form', 4),
-    'access arguments' => array('administer bean types'),
-    'file' => 'bean_admin_ui.admin.inc',
-  );
-  $items['admin/structure/block-types/manage/%bean_type/edit'] = array(
-    'title' => 'Edit',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  $items['admin/structure/block-types/manage/%bean_type/delete'] = array(
-    'title' => 'Delete',
-    'page arguments' => array('bean_admin_ui_type_delete_confirm', 4),
-    'access arguments' => array('administer bean types'),
-    'file' => 'bean_admin_ui.admin.inc',
-  );
+  foreach (bean_admin_ui_get_types() as $bean_type) {
+    $items["admin/structure/block-types/manage/{$bean_type->name}"] = array(
+      'title' => 'Edit block type',
+      'title arguments' => array(4),
+      'title callback' => 'bean_admin_ui_page_title',
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('bean_admin_ui_type_form', 4),
+      'access arguments' => array('administer bean types'),
+      'file' => 'bean_admin_ui.admin.inc',
+    );
+
+    $items["admin/structure/block-types/manage/{$bean_type->name}/edit"] = array(
+      'title' => 'Edit',
+      'type' => MENU_DEFAULT_LOCAL_TASK,
+    );
+    $items["admin/structure/block-types/manage/{$bean_type->name}/delete"] = array(
+      'title' => 'Delete',
+      'page arguments' => array('bean_admin_ui_type_delete_confirm', 4),
+      'access arguments' => array('administer bean types'),
+      'file' => 'bean_admin_ui.admin.inc',
+    );
+  }
 
   return $items;
 }
@@ -61,7 +65,11 @@ function bean_admin_ui_menu() {
  * Page title for block types
  */
 function bean_admin_ui_page_title($block_type) {
-  return $block_type->type;
+  if (is_string($block_type)) {
+    $bean_types = bean_admin_ui_get_types();
+    $block_type = $bean_types[$block_type];
+  }
+  return $block_type->label;
 }
 
 /**