diff --git a/_data/toc.yaml b/_data/toc.yaml
index 8f94f7b83b..64c4e922fc 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -1105,18 +1105,18 @@ manuals:
       title: unpause
     - path: /compose/reference/up/
       title: up
-    - sectiontitle: Compose File Reference
-      section:
-      - path: /compose/compose-file/
-        title: Version 3
-      - path: /compose/compose-file/compose-file-v2/
-        title: Version 2
-      - path: /compose/compose-file/compose-file-v1/
-        title: Version 1
-      - path: /compose/compose-file/compose-versioning/
-        title: About versions and upgrading
-      - path: /compose/faq/
-        title: Frequently Asked Questions
+  - sectiontitle: Compose File Reference
+    section:
+    - path: /compose/compose-file/
+      title: Version 3
+    - path: /compose/compose-file/compose-file-v2/
+      title: Version 2
+    - path: /compose/compose-file/compose-file-v1/
+      title: Version 1
+    - path: /compose/compose-file/compose-versioning/
+      title: About versions and upgrading
+    - path: /compose/faq/
+      title: Frequently Asked Questions
   - path: /compose/bundles/
     title: Docker Stacks and Distributed Application Bundles
   - path: /compose/swarm/
diff --git a/compose/index.md b/compose/index.md
index 2d07ff5812..962cc7ade4 100644
--- a/compose/index.md
+++ b/compose/index.md
@@ -2,6 +2,7 @@
 description: Introduction and Overview of Compose
 keywords: documentation, docs,  docker, compose, orchestration,  containers
 title: Docker Compose
+notoc: true
 ---
 
 Compose is a tool for defining and running multi-container Docker applications. To learn more about Compose refer to the following documentation:
diff --git a/manuals.md b/manuals.md
index 23ca33d6d6..5569a922b2 100644
--- a/manuals.md
+++ b/manuals.md
@@ -29,13 +29,13 @@ Free downloadables that help your device use Docker containers.
 | [Docker for Mac](/docker-for-mac/) | Docker desktop solution that includes everything a developer needs to create and test applications on a Mac |
 | [Docker for Windows](/docker-for-windows) | Docker desktop solution that includes everything a developer needs to create and test applications on a Windows system|
 | [Docker for Linux](/engine/installation/#on-linux) | Installation guides for running Docker on all supported Linux distros. |
-| [Docker Compose](/compose/) | Enables you to define, build, and run multi-container applications |
-| [Docker Notary](/notary/) | Allows the signing of container images to enable Docker Content Trust |
+| [Docker Compose](/compose/overview/) | Enables you to define, build, and run multi-container applications |
+| [Docker Notary](/notary/getting_started/) | Allows the signing of container images to enable Docker Content Trust |
 | [Docker Registry](/registry/) | The software that powers Docker Hub and Docker Store, Registry stores and distributes container images |
 
 
 ## Superseded products and tools
 
 * [Docker Hub](/docker-hub/) - Superseded by Docker Store and Docker Cloud
-* [Docker Swarm](/swarm/) - Functionality folded directly into native Docker, no longer a standalone tool
+* [Docker Swarm](/swarm/overview/) - Functionality folded directly into native Docker, no longer a standalone tool
 * [Docker Toolbox](/toolbox/overview/) - Superseded by Docker for Mac and Windows
diff --git a/notary/index.md b/notary/index.md
index 227dd6a606..6a1b972f51 100644
--- a/notary/index.md
+++ b/notary/index.md
@@ -2,6 +2,7 @@
 description: List of Notary Documentation
 keywords: docker, notary, trust, image, signing, repository, tuf
 title: Docker Notary
+notoc: true
 ---
 
 * [Getting Started](getting_started.md)
@@ -9,4 +10,4 @@ title: Docker Notary
 * [Service Architecture](service_architecture.md)
 * [Running a Service](running_a_service.md)
 * [Configuration files](reference/index.md)
-* [Changelog](changelog.md)
\ No newline at end of file
+* [Changelog](changelog.md)
diff --git a/swarm/index.md b/swarm/index.md
index 67ccf4824e..04f795026a 100644
--- a/swarm/index.md
+++ b/swarm/index.md
@@ -4,6 +4,7 @@ hide_from_sitemap: true
 description: 'Swarm: a Docker-native clustering system'
 keywords: docker, swarm,  clustering
 title: Docker Swarm
+notoc: true
 ---
 
 If you decide to use standalone Docker Swarm, use these links to get started.