diff --git a/_data/guides.yml b/_data/guides.yml
index 583deaeedd..cd685afd5a 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -305,7 +305,7 @@ toc:
 
 - title: Administering Federation
   section:
-  - title: Using `kubefed`
-    path: /docs/admin/federation/kubfed/
-  - title: Using `federation-up` and `deploy.sh`
+  - title: Using kubefed
+    path: /docs/admin/federation/kubefed/
+  - title: Using federation-up and deploy.sh
     path: /docs/admin/federation/
diff --git a/docs/admin/federation/kubefed.md b/docs/admin/federation/kubefed.md
index de40263ecb..52d83d3535 100644
--- a/docs/admin/federation/kubefed.md
+++ b/docs/admin/federation/kubefed.md
@@ -3,6 +3,10 @@ assignees:
 - madhusudancs
 
 ---
+
+* TOC
+{:toc}
+
 Kubernetes version 1.5 includes a new command line tool called
 `kubefed` to help you administrate your federated clusters.
 `kubefed` helps you to deploy a new Kubernetes cluster federation
@@ -14,11 +18,6 @@ using `kubefed`.
 
 > Note: `kubefed` is an alpha feature in Kubernetes 1.5.
 
-
-* TOC
-{:toc}
-
-
 ## Prerequisites
 
 This guide assumes that you have a running Kubernetes cluster. Please
@@ -61,8 +60,8 @@ The output should contain an entry corresponding to your host cluster,
 similar to the following:
 
 ```
-CURRENT   NAME                                                               CLUSTER                                                            AUTHINFO                                                           NAMESPACE
-          gke_myproject_asia-east1-b_gce-asia-east1              gke_myproject_asia-east1-b_gce-asia-east1              gke_myproject_asia-east1-b_gce-asia-east1
+CURRENT   NAME                                          CLUSTER                                       AUTHINFO                                      NAMESPACE
+          gke_myproject_asia-east1-b_gce-asia-east1     gke_myproject_asia-east1-b_gce-asia-east1     gke_myproject_asia-east1-b_gce-asia-east1
 ```
 
 
diff --git a/docs/tools/index.md b/docs/tools/index.md
index 482df866b4..6b79c323da 100644
--- a/docs/tools/index.md
+++ b/docs/tools/index.md
@@ -13,6 +13,12 @@ assignees:
 
 [`kubectl`](/docs/user-guide/kubectl/) is the command line tool for Kubernetes. It controls the Kubernetes cluster manager.
 
+### Kubefed
+
+[`kubefed`](/docs/admin/federation/kubefed/) is the command line tool
+to help you administrate your federated clusters.
+
+
 ### Dashboard 
 
 [Dashboard](/docs/user-guide/ui/), the web-based user interface of Kubernetes, allows you to deploy containerized applications