diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 38dcb5823..089c1c2cb 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -8,7 +8,10 @@
 include::getting-started:partial$nav.adoc[]
 
 .Develop & build
-include::architecture:partial$nav.adoc[]
+* Ingestion
+** xref:ingest:overview.adoc[]
+** xref:computing:distributed-computing.adoc[]
+** xref:query:overview.adoc[]
 * xref:cluster-performance:best-practices.adoc[]
 ** xref:capacity-planning.adoc[]
 ** xref:cluster-performance:performance-tips.adoc[]
@@ -19,6 +22,7 @@ include::architecture:partial$nav.adoc[]
 ** xref:cluster-performance:near-cache.adoc[]
 ** xref:cluster-performance:imap-bulk-read-operations.adoc[]
 ** xref:cluster-performance:data-affinity.adoc[]
+include::architecture:partial$nav.adoc[]
 * Member/Client Discovery
 ** xref:clusters:discovery-mechanisms.adoc[]
 ** xref:clusters:discovering-by-tcp.adoc[]
@@ -26,20 +30,11 @@ include::architecture:partial$nav.adoc[]
 ** xref:clusters:discovering-native-clients.adoc[]
 include::kubernetes:partial$nav.adoc[]
 include::data-structures:partial$nav.adoc[]
-// Distributed Computing
-* xref:computing:distributed-computing.adoc[]
-// ** xref:data-structures:entry-processor.adoc[] also dupe, commenting for now
+* Distributed Compute
 ** Executor Services
 include::computing:partial$nav.adoc[]
-// UCN
 ** xref:clusters:user-code-namespaces.adoc[]
 include::clusters:partial$nav.adoc[]
-// Pipelines
-// ** xref:pipelines:overview.adoc[Data Pipelines] this duped in partial nav below
-// Ingestion
-* Data Ingestion & Query
-** xref:ingest:overview.adoc[]
-** xref:query:overview.adoc[]
 include::mapstore:partial$nav.adoc[]
 include::pipelines:partial$nav.adoc[]
 include::query:partial$nav.adoc[]
@@ -102,6 +97,10 @@ include::wan:partial$nav.adoc[]
 
 .Integrate
 * xref:integrate:connectors.adoc[Overview]
+* Files
+// Files need an overview (options, what's available for SQL, what's available for Jet API)
+** xref:integrate:file-connector.adoc[]
+** xref:integrate:legacy-file-connector.adoc[]
 * Integrate with Spring
 ** xref:spring:overview.adoc[Overview]
 ** xref:spring:configuration.adoc[]
@@ -115,34 +114,26 @@ include::wan:partial$nav.adoc[]
 ** xref:integrate:feast-config.adoc[]
 ** xref:integrate:feature-engineering-with-feast.adoc[Get started with Feast batch features]
 ** xref:integrate:streaming-features-with-feast.adoc[Get started with Feast streaming features]
-// Connectors
-* Messaging System Connectors
-* xref:integrate:messaging-system-connectors.adoc[Overview]
-** xref:integrate:kafka-connector.adoc[]
-** xref:integrate:kinesis-connector.adoc[]
-** xref:integrate:jms-connector.adoc[]
-// Database and CDC
-* xref:integrate:database-connectors.adoc[Database & CDC Connectors]
-** xref:integrate:jdbc-connector.adoc[]
-** xref:integrate:cdc-connectors.adoc[]
-** xref:integrate:elasticsearch-connector.adoc[]
-** xref:integrate:mongodb-connector.adoc[]
-* File Connectors
-// Need an overview
-** xref:integrate:file-connector.adoc[]
-** xref:integrate:legacy-file-connector.adoc[]
-* Hazelcast Data Structure Connectors
+* xref:integrate:kafka-connect-connectors.adoc[]
+* Data Structure Connectors
 // Need an overview
 ** xref:integrate:map-connector.adoc[]
 ** xref:integrate:jcache-connector.adoc[]
 ** xref:integrate:list-connector.adoc[]
 ** xref:integrate:reliable-topic-connector.adoc[]
 ** xref:integrate:vector-collection-connector.adoc[]
-// Kafka Connect
+* xref:integrate:database-connectors.adoc[Database Connectors]
+** xref:integrate:jdbc-connector.adoc[]
+** xref:integrate:cdc-connectors.adoc[]
+** xref:integrate:elasticsearch-connector.adoc[]
+** xref:integrate:mongodb-connector.adoc[]
+* xref:integrate:messaging-system-connectors.adoc[Messaging System Connectors]
+** xref:integrate:kafka-connector.adoc[]
+** xref:integrate:kinesis-connector.adoc[]
+** xref:integrate:jms-connector.adoc[]
 * xref:integrate:kafka-connect-connectors.adoc[]
 * xref:integrate:socket-connector.adoc[]
 * xref:integrate:test-connectors.adoc[]
-// Custom & Community
 * xref:integrate:custom-connectors.adoc[]
 * Community Connectors
 // Need an overview