diff --git a/Dockerfile b/Dockerfile
index e68aa097cf..93c693f320 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,15 @@
-FROM docs/base:hugo-github-linking
+FROM docs/base:latest
 MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
 
-# RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
-#RUN svn checkout https://github.com/swarm/opensource/trunk/docs /docs/content/swarm
-# RUN svn checkout https://github.com/docker/compose/trunk/docs /docs/content/compose
-#RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
-#RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
-#RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content/kitematic
-#RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
-#RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
+RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
+RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm
+RUN svn checkout https://github.com/docker/compose/trunk/docs /docs/content/compose
+RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
+RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
+RUN svn checkout https://github.com/docker/notary/trunk/docs /docs/content/notary
+RUN svn checkout https://github.com/docker/kitematic/trunk/docs /docs/content/kitematic
+RUN svn checkout https://github.com/docker/toolbox/trunk/docs /docs/content/toolbox
+RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content/opensource
 
 ENV PROJECT=ucp
 # to get the git info for this repo
diff --git a/index.md b/index.md
index 34b6a6760d..999ff603c4 100644
--- a/index.md
+++ b/index.md
@@ -4,7 +4,6 @@ title ="Universal Control Plane"
 description="Docker Universal Control Plane"
 [menu.main]
 identifier="mn_ucp"
-weight="-100"
 +++
 <![end-metadata]-->
 
diff --git a/manage/monitor-manage-users.md b/manage/monitor-manage-users.md
index f4f57b3c74..a6bc877b79 100644
--- a/manage/monitor-manage-users.md
+++ b/manage/monitor-manage-users.md
@@ -1,11 +1,10 @@
 <!--[metadata]>
 +++
-draft=true
 title = "Users"
 description = "Manage and troubleshoot UCP Users"
 keywords = ["tbd, tbd"]
 [menu.main]
-parent="mn_manage_ucp"
+parent="mn_ucp"
 +++
 <![end-metadata]-->
 
diff --git a/overview.md b/overview.md
index 2c69459019..cec75e193e 100644
--- a/overview.md
+++ b/overview.md
@@ -24,11 +24,10 @@ The current doc theme does not allow us to create a split menu: a menu whose lab
 * [Plan a production installation](plan-production-install.md)
 * [Install UCP for production](production-install.md)
 * [Upgrade a production installation](production-upgrade.md)
-* [Manage, monitor, and troubleshoot UCP and its resources](manage/index.md)
+* [Manage, monitor, and troubleshoot UCP and its resources](manage/monitor-ucp.md)
 * [Commands reference](reference/index.md)
 * [Work with Docker Support](support.md)
 * [UCP Release Notes](release_notes.md)
-<!--[metadata]>Older beta docs may change, stay or go tbd<![end-metadata]-->
 * [UCP Key/Value Store Backend](kv_store.md)
 * [Set up container networking with UCP](networking.md)
 * [Set up high availability](understand_ha.md)