diff --git a/docs/index.md b/docs/index.md
index 6cd6769e6..42f36a5cf 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,10 +1,11 @@
 <!--[metadata]>
 +++
-title = "Docker Registry"
+title = "Registry"
 description = "High-level overview of the Registry"
 keywords = ["registry, on-prem, images, tags, repository, distribution"]
 [menu.main]
-parent="smn_registry"
+identifier="smn_registry"
+parent="mn_components"
 +++
 <![end-metadata]-->
 
@@ -63,4 +64,3 @@ Now stop your registry and remove all data
 ## Next
 
 You should now read the [detailed introduction about the registry](introduction.md), or jump directly to [deployment instructions](deploying.md).
- 
\ No newline at end of file
diff --git a/docs/overview.md b/docs/overview.md
new file mode 100644
index 000000000..d3532b62e
--- /dev/null
+++ b/docs/overview.md
@@ -0,0 +1,21 @@
+<!--[metadata]>
++++
+title = "Registry Overview"
+description = "High-level overview of the Registry"
+keywords = ["registry, on-prem, images, tags, repository, distribution"]
+[menu.main]
+parent="smn_registry"
++++
+<![end-metadata]-->
+
+# Overview of Docker Registry Documentation
+
+The Docker Registry documentation includes the following topics:
+
+* [Docker Registry Introduction](index.md)
+* [Understanding the Registry](introduction.md)
+* [Deploying a registry server](deploying.md)
+* [Registry Configuration Reference](configuration.md)
+* [Notifications](notifications.md)
+* [Recipes](recipes.md)
+* [Getting help](help.md)
diff --git a/docs/recipes.md b/docs/recipes.md
index 0b4a4ab50..3335a4fa4 100644
--- a/docs/recipes.md
+++ b/docs/recipes.md
@@ -32,4 +32,4 @@ At this point, it's assumed that:
  * [using Nginx as an authenticating proxy](nginx.md)
  * [running a Registry on OS X](osx-setup-guide.md)
  * [hacking the registry: build instructions](building.md)
- * [mirror the Docker Hub](mirror.md)
\ No newline at end of file
+ * [mirror the Docker Hub](mirror.md)
diff --git a/docs/spec/auth/index.md b/docs/spec/auth/index.md
index b0d312563..2d1740e88 100644
--- a/docs/spec/auth/index.md
+++ b/docs/spec/auth/index.md
@@ -1,10 +1,8 @@
 <!--[metadata]>
 +++
-title = "Docker Regidtry Token Authentication"
+title = "Docker Registry Token Authentication"
 description = "Docker Registry v2 authentication schema"
 keywords = ["registry, on-prem, images, tags, repository, distribution, authentication, advanced"]
-[menu.main]
-parent="smn_registry_ref"
 +++
 <![end-metadata]-->
 
diff --git a/docs/spec/index.md b/docs/spec/index.md
new file mode 100644
index 000000000..dddaa5288
--- /dev/null
+++ b/docs/spec/index.md
@@ -0,0 +1,18 @@
+<!--[metadata]>
++++
+title = "Reference"
+description = "Explains registry JSON objects"
+keywords = ["registry, service, images, repository,  json"]
+[menu.main]
+identifier="smn_registry_ref"
+parent="smn_registry"
+weight=7
++++
+<![end-metadata]-->
+
+# Docker Registry Reference
+
+* [HTTP API V2](api.md)
+* [Storage Driver](../storagedrivers.md)
+* [Token Authentication Specification](auth/token.md)
+* [Token Authentication Implementation](auth/jwt.md)