diff --git a/source/getting-started.txt b/source/getting-started.txt
index b92298a5..0422bc78 100644
--- a/source/getting-started.txt
+++ b/source/getting-started.txt
@@ -6,12 +6,12 @@ Getting Started
 
 .. default-domain:: mongodb
 
-This section describes how to install the driver, installation prerequisites
-and compatibility considerations.
-
 .. toctree::
   :titlesonly:
 
-  installation
-  reference/driver-compatibility
-  support
+  Installation <installation>
+  Driver Compatibility <reference/driver-compatibility>
+  Support <support>
+
+This section describes how to install the driver, installation prerequisites,
+and compatibility considerations.
diff --git a/source/index.txt b/source/index.txt
index d8ab98a3..7343cf07 100644
--- a/source/index.txt
+++ b/source/index.txt
@@ -8,6 +8,21 @@ Ruby MongoDB Driver
 
 .. default-domain:: mongodb
 
+.. class:: hidden
+
+  .. toctree::
+    :titlesonly:
+
+    Get Started <getting-started>
+    Tutorials <tutorials>
+    Connection & Configuration <reference/connection-and-configuration>
+    Working with Data <reference/working-with-data>
+    Schema Operations <reference/schema-operations>
+    API <https://mongodb.com/docs/ruby-driver/current/api/>
+    Release Notes <release-notes>
+    Additional Resources <reference/additional-resources>
+    Contribute <contribute>
+
 Welcome to the documentation site for the official MongoDB Ruby driver.
 You can add the driver to your application to work with MongoDB in
 Ruby.
@@ -49,19 +64,4 @@ For tutorials on Mongoid, see the `Mongoid Manual <https://mongodb.com/docs/mong
 .. COMMENT  For the actual build, see mongodb/docs-ruby repo which pulls the documentation source from:
 ..    mongo-ruby-driver,
 ..    bson-ruby, and
-..    mongoid repos.
-
-.. class:: hidden
-
-  .. toctree::
-    :titlesonly:
-
-    getting-started
-    tutorials
-    reference/connection-and-configuration
-    reference/working-with-data
-    reference/schema-operations
-    API <https://mongodb.com/docs/ruby-driver/current/api/>
-    release-notes
-    reference/additional-resources
-    contribute
+..    mongoid repos.
\ No newline at end of file
diff --git a/source/reference/connection-and-configuration.txt b/source/reference/connection-and-configuration.txt
index 7532e73f..ae7842ea 100644
--- a/source/reference/connection-and-configuration.txt
+++ b/source/reference/connection-and-configuration.txt
@@ -6,13 +6,13 @@ Connection & Configuration
 
 .. default-domain:: mongodb
 
-This section describes how to create the client objects and what configuration
-options the driver provides, including authentication.
-
 .. toctree::
   :titlesonly:
 
-  /reference/create-client
-  /reference/authentication
-  /reference/monitoring
-  /reference/user-management
+  Create a Client </reference/create-client>
+  Authentication </reference/authentication>
+  Monitoring </reference/monitoring>
+  User Management </reference/user-management>
+
+This section describes how to create the client objects and what configuration
+options the driver provides, including authentication.
diff --git a/source/reference/in-use-encryption.txt b/source/reference/in-use-encryption.txt
index 165f399b..82406b86 100644
--- a/source/reference/in-use-encryption.txt
+++ b/source/reference/in-use-encryption.txt
@@ -6,12 +6,12 @@ In-Use Encryption
 
 .. default-domain:: mongodb
 
-This section describes the different encryption methods in use by the Ruby
-driver for MongoDB.
-
 .. toctree::
   :titlesonly:
 
-  /reference/in-use-encryption/queryable-encryption
-  /reference/in-use-encryption/client-side-encryption
+  Queryable Encryption </reference/in-use-encryption/queryable-encryption>
+  Client-Side Encryption </reference/in-use-encryption/client-side-encryption>
+
+This section describes the different encryption methods in use by the Ruby
+driver for MongoDB.
   
\ No newline at end of file
diff --git a/source/reference/schema-operations.txt b/source/reference/schema-operations.txt
index 8d67d569..6acbf66b 100644
--- a/source/reference/schema-operations.txt
+++ b/source/reference/schema-operations.txt
@@ -12,8 +12,8 @@ including managing databases, collections, indexes and users.
 .. toctree::
   :titlesonly:
 
-  /reference/database-tasks
-  /reference/collection-tasks
-  /reference/indexing
-  /reference/search-indexes
-  /reference/collations
+  Databases </reference/database-tasks>
+  Collections </reference/collection-tasks>
+  Indexes </reference/indexing>
+  Atlas Search Indexes </reference/search-indexes>
+  Collations </reference/collations>
diff --git a/source/reference/working-with-data.txt b/source/reference/working-with-data.txt
index 0f36c6be..e6a5469b 100644
--- a/source/reference/working-with-data.txt
+++ b/source/reference/working-with-data.txt
@@ -12,16 +12,16 @@ implements for inserting, updating and retrieving data from MongoDB.
 .. toctree::
   :titlesonly:
 
-  /reference/crud-operations
-  /reference/bulk-operations
-  /reference/projection
-  /reference/aggregation
-  /reference/map-reduce
-  /reference/text-search
-  /reference/geospatial-search
-  /reference/query-cache
-  /reference/gridfs
-  /reference/change-streams
-  /reference/sessions
-  /reference/transactions
-  /reference/in-use-encryption
+  CRUD </reference/crud-operations>
+  Bulk Writes </reference/bulk-operations>
+  Projection </reference/projection>
+  Aggregation </reference/aggregation>
+  MapReduce </reference/map-reduce>
+  Text Search </reference/text-search>
+  Geospatial Search </reference/geospatial-search>
+  Query Cache </reference/query-cache>
+  GridFS </reference/gridfs>
+  Change Streams </reference/change-streams>
+  Sessions </reference/sessions>
+  Transactions </reference/transactions>
+  In-Use Encryption </reference/in-use-encryption>
diff --git a/source/tutorials.txt b/source/tutorials.txt
index 143f8edb..bef34aeb 100644
--- a/source/tutorials.txt
+++ b/source/tutorials.txt
@@ -6,14 +6,13 @@ Tutorials
 
 .. default-domain:: mongodb
 
-The tutorials in this section provide examples of some frequently used
-operations. This section is not meant to be an exhaustive list of all
-operations available in the Ruby driver.
-
 .. toctree::
   :titlesonly:
 
   Quick Start <tutorials/quick-start>
-  tutorials/common-errors
-  tutorials/bson
+  Common Errors <tutorials/common-errors>
+  BSON Tutorial <tutorials/bson>
 
+The tutorials in this section provide examples of some frequently used
+operations. This section is not meant to be an exhaustive list of all
+operations available in the Ruby driver.