diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
index 8d05f64..f4ea2ab 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
@@ -47,7 +47,7 @@ function testVocabularyInterface() {
     // Edit the vocabulary.
     $this->drupalGet('admin/structure/taxonomy');
     $this->assertText($edit['name'], 'Vocabulary found in the vocabulary overview listing.');
-    $this->clickLink(t('edit vocabulary'));
+    $this->clickLink(t('Edit vocabulary'));
     $edit = array();
     $edit['name'] = $this->randomName();
     $this->drupalPost(NULL, $edit, t('Save'));
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 6305e48..e8c709e 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -30,17 +30,30 @@ function taxonomy_overview_vocabularies($form) {
       '#default_value' => $vocabulary->weight,
     );
     $links = array();
-    $links['edit'] = array(
-      'title' => t('edit vocabulary'),
-      'href' => "admin/structure/taxonomy/{$vocabulary->id()}/edit",
-    );
     $links['list'] = array(
-      'title' => t('list terms'),
+      'title' => t('List terms'),
       'href' => "admin/structure/taxonomy/{$vocabulary->id()}",
+      '#weight' => 0,
     );
     $links['add'] = array(
-      'title' => t('add terms'),
+      'title' => t('Add terms'),
       'href' => "admin/structure/taxonomy/{$vocabulary->id()}/add",
+      '#weight' => 5,
+    );
+    $links['fields'] = array(
+      'title' => t('Manage fields'),
+      'href' => "admin/structure/taxonomy/{$vocabulary->id()}/fields",
+      '#weight' => 10,
+    );
+    $links['display'] = array(
+      'title' => t('Manage display'),
+      'href' => "admin/structure/taxonomy/{$vocabulary->id()}/display",
+      '#weight' => 15,
+    );
+    $links['edit'] = array(
+      'title' => t('Edit vocabulary'),
+      'href' => "admin/structure/taxonomy/{$vocabulary->id()}/edit",
+      '#weight' => 20,
     );
     $form[$vocabulary->id()]['operations'] = array(
       '#type' => 'operations',