diff --git a/index.md b/index.md
index fd7b4819da..ce01b8ee20 100644
--- a/index.md
+++ b/index.md
@@ -36,42 +36,7 @@ environment. Highlights Compose Version 3 new features and swarm mode.
 ## Components
 
 <div class="component-container">
-    <!--start real row-->
-    <div class="row">
-    <!--organic row 1-->
-    <!--cloud-->
-        <div class="col-sm-4 col-md-12 col-lg-3 block">
-            <div class="component">
-                <div class="component-icon">
-                    <a href="docker-cloud/"> <img src="../images/cloud_48.svg" alt="Docker Cloud"> </a>
-                </div>
-                <h3 id="docker-cloud"><a href="docker-cloud/">Docker Cloud</a></h3>
-                <p>A hosted service for building, testing, and deploying Docker images to your hosts.</p>
-            </div>
-        </div>
-    <!--UCP-->
-        <div class="col-sm-4 col-md-12 col-lg-3 block">
-            <div class="component">
-                <div class="component-icon">
-                    <a href="datacenter/ucp/2.1/guides/"> <img src="../images/UCP_48.svg" alt="Docker Universal Control Plane"> </a>
-                </div>
-                <h3 id="ucp"><a href="datacenter/ucp/2.1/guides/">Docker Universal Control Plane</a></h3>
-                <p>(UCP) Manage a cluster of on-premise Docker hosts like a single machine with this enterprise product.</p>
-            </div>
-        </div>
-        <!--DTR-->
-            <div class="col-sm-4 col-md-12 col-lg-3 block">
-                <div class="component">
-                    <div class="component-icon">
-                        <a href="datacenter/dtr/2.2/guides/"> <img src="../images/dtr_48.svg" alt="Docker Trusted Registry"> </a>
-                    </div>
-                    <h3 id="dtr"><a href="datacenter/dtr/2.2/guides/">Docker Trusted Registry</a></h3>
-                    <p>(DTR) An enterprise image storage solution you can install behind a firewall to manage images and access.</p>
-            </div>
-        </div>
-    <!-- end real row-->
-    </div>
-    <!--start real row-->
+    <!--start row-->
     <div class="row">
     <!--organic row 1-->
     <!--Docker for Mac-->
@@ -106,35 +71,66 @@ environment. Highlights Compose Version 3 new features and swarm mode.
         </div>
     <!--organic row 2-->
     <!--editions-->
+    <div class="col-sm-4 col-md-12 col-lg-3 block">
+        <div class="component">
+            <div class="component-icon">
+                <a href="engine/installation/"> <img src="../images/apple_48.svg" alt="Docker Editions"> </a>
+            </div>
+            <h3 id="editions"><a href="engine/installation/">Docker Editions</a></h3>
+            <p>Platform matrix and superset of installers for Docker for desktops, servers, or cloud providers.</p>
+        </div>
+    </div>
+    <!--compose-->
         <div class="col-sm-4 col-md-12 col-lg-3 block">
             <div class="component">
                 <div class="component-icon">
-                    <a href="engine/installation/"> <img src="../images/apple_48.svg" alt="Docker Editions"> </a>
+                    <a href="compose/overview/"> <img src="../images/compose_48.svg" alt="Docker Compose"> </a>
                 </div>
-                <h3 id="editions"><a href="engine/installation/">Docker Editions</a></h3>
-                <p>Platform matrix and superset of installers for Docker for desktops, servers, or cloud providers.</p>
+                <h3 id="compose"><a href="compose/overview/">Docker Compose</a></h3>
+                <p>Define application stacks built using multiple containers, services, and swarm configurations.</p>
+        </div>
+    </div>
+    <!--machine-->
+        <div class="col-sm-4 col-md-12 col-lg-3 block">
+            <div class="component">
+                <div class="component-icon">
+                    <a href="machine/overview/"> <img src="../images/machine_48.svg" alt="Docker Trusted Registry"> </a>
+                </div>
+                <h3 id="machine"><a href="machine/overview/">Docker Machine</a></h3>
+                <p>Automate container provisioning on your network or in the cloud. Available for Windows, macOS, or Linux.</p>
+        </div>
+    </div>
+    <!--organic row 3-->
+    <!--cloud-->
+        <div class="col-sm-4 col-md-12 col-lg-3 block">
+            <div class="component">
+                <div class="component-icon">
+                    <a href="docker-cloud/"> <img src="../images/cloud_48.svg" alt="Docker Cloud"> </a>
+                </div>
+                <h3 id="docker-cloud"><a href="docker-cloud/">Docker Cloud</a></h3>
+                <p>A hosted service for building, testing, and deploying Docker images to your hosts.</p>
             </div>
         </div>
-        <!--compose-->
-            <div class="col-sm-4 col-md-12 col-lg-3 block">
-                <div class="component">
-                    <div class="component-icon">
-                        <a href="compose/overview/"> <img src="../images/compose_48.svg" alt="Docker Compose"> </a>
-                    </div>
-                    <h3 id="compose"><a href="compose/overview/">Docker Compose</a></h3>
-                    <p>Define application stacks built using multiple containers, services, and swarm configurations.</p>
+    <!--UCP-->
+        <div class="col-sm-4 col-md-12 col-lg-3 block">
+            <div class="component">
+                <div class="component-icon">
+                    <a href="datacenter/ucp/2.1/guides/"> <img src="../images/UCP_48.svg" alt="Docker Universal Control Plane"> </a>
+                </div>
+                <h3 id="ucp"><a href="datacenter/ucp/2.1/guides/">Docker Universal Control Plane</a></h3>
+                <p>(UCP) Manage a cluster of on-premise Docker hosts like a single machine with this enterprise product.</p>
             </div>
         </div>
-        <!--machine-->
-            <div class="col-sm-4 col-md-12 col-lg-3 block">
-                <div class="component">
-                    <div class="component-icon">
-                        <a href="machine/overview/"> <img src="../images/machine_48.svg" alt="Docker Trusted Registry"> </a>
-                    </div>
-                    <h3 id="machine"><a href="machine/overview/">Docker Machine</a></h3>
-                    <p>Automate container provisioning on your network or in the cloud. Available for Windows, macOS, or Linux.</p>
-            </div>
+    <!--DTR-->
+        <div class="col-sm-4 col-md-12 col-lg-3 block">
+            <div class="component">
+                <div class="component-icon">
+                    <a href="datacenter/dtr/2.2/guides/"> <img src="../images/dtr_48.svg" alt="Docker Trusted Registry"> </a>
+                </div>
+                <h3 id="dtr"><a href="datacenter/dtr/2.2/guides/">Docker Trusted Registry</a></h3>
+                <p>(DTR) An enterprise image storage solution you can install behind a firewall to manage images and access.</p>
         </div>
+    </div>
     <!-- end real row-->
     </div>
 <!-- end component-container 2-->
diff --git a/manuals.md b/manuals.md
index d4d2f3b629..de3020167c 100644
--- a/manuals.md
+++ b/manuals.md
@@ -7,19 +7,6 @@ The Docker platform is comprised of a family of tools and products. After
 learning the general principles of the Docker workflow under [Guides](/), you
 can find the documentation for these tools and products here.
 
-## Products
-
-Commercial Docker products that turn your container-based solution into a
-production-ready application.
-
-| Product | Description |
-| ------- | ----------- |
-| [Docker Cloud](/docker-cloud/) | Manages multi-container applications and host resources running on a cloud provider (such as Amazon Web Services) |
-| [Universal Control Plane (UCP)](/datacenter/ucp/2.1/guides/) | Manages multi-container applications on a custom host installation (on-premise, on a cloud provider) |
-| [Docker Trusted Registry (DTR)](/datacenter/dtr/2.2/guides/) | Runs a private repository of container images and makes them available to a UCP instance |
-| [Docker Store](/docker-store/) | Public, Docker-hosted registry that distributes free and paid images from various publishers |
-| [CS Docker Engine](/cs-engine/install) | The commercially-supported version of Docker that excludes experimental features and includes customer support |
-
 ## Tools
 
 Free downloadables that help your device use Docker containers.
@@ -34,6 +21,18 @@ Free downloadables that help your device use Docker containers.
 | [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 |
 
+## Products
+
+Commercial Docker products that turn your container-based solution into a
+production-ready application.
+
+| Product | Description |
+| ------- | ----------- |
+| [Docker Cloud](/docker-cloud/) | Manages multi-container applications and host resources running on a cloud provider (such as Amazon Web Services) |
+| [Universal Control Plane (UCP)](/datacenter/ucp/2.1/guides/) | Manages multi-container applications on a custom host installation (on-premise, on a cloud provider) |
+| [Docker Trusted Registry (DTR)](/datacenter/dtr/2.2/guides/) | Runs a private repository of container images and makes them available to a UCP instance |
+| [Docker Store](/docker-store/) | Public, Docker-hosted registry that distributes free and paid images from various publishers |
+| [CS Docker Engine](/cs-engine/install) | The commercially-supported version of Docker that excludes experimental features and includes customer support |
 
 ## Superseded products and tools