diff --git a/docs/developers/index.md b/docs/developers/index.md
index 44618574fb..b4d6d9af37 100644
--- a/docs/developers/index.md
+++ b/docs/developers/index.md
@@ -11,6 +11,29 @@ This section includes information for builders. If you are building decentralize
 
 Geth has many features that support dapp developers. There are many built-in tracers implemented in Go or Javascript that allow developers to monitor what is happening in Geth from inside an app, and users can build their own custom tracers too. Geth also includes a suite of tools for interacting with Ethereum smart contracts using Geth functions using Go functions inside Go native applications. There is also information for Geth mobile developers.
 
+- [Developer mode](/docs/developers/dapp-developer/dev-mode)
+- [Developing for mobile](/docs/developers/dapp-developer/mobile)
+- [Geth in Go apps](/docs/developers/dapp-developer/native)
+- [Go contract bindings](/docs/developers/dapp-developer/native-bindings)
+- [Account management in Go apps](/docs/developers/dapp-developer/native-accounts)
+
+
 ## Geth developers {#geth-developers}
 
 Geth developers add/remove features and fix bugs in Geth. The `geth-developer` section includes contribution guidelines and documentation relating to testing and disclosing vulnerabilities that willhep you get started with working on Geth.
+
+- [Code review guidelines](/docs/developers/geth-developer/code-review-guidelines)
+- [Contributing to Geth](/docs/developers/geth-developer/contributing)
+- [Developer guide](/docs/developers/geth-developer/dev-guide)
+- [Disclosures](/docs/developers/geth-developer/disclosures)
+- [DNS discovery setup guide](/docs/developers/geth-developer/dns-discovery-setup)
+
+## EVM tracing
+
+Tracing allows developers to analyze precisely what the EVM has done or will do given a certain set of commands. This section outlines the various ways tracing can be implemented in Geth.
+
+- [Introduction](/docs/developers/evm-tracing/)
+- [Basic tracers](/docs/developers/evm-tracing/basic-traces)
+- [Built-in tracers](/docs/developers/evm-tracing/built-in-tracers)
+- [Custom tracers](/docs/developers/evm-tracing/custom-tracer)
+- [Javascript tracing tutorial](/docs/developers/evm-tracing/javascript-tutorial)
\ No newline at end of file
diff --git a/docs/fundamentals/index.md b/docs/fundamentals/index.md
index 2468dc0d71..d6a6bc0a1a 100644
--- a/docs/fundamentals/index.md
+++ b/docs/fundamentals/index.md
@@ -3,8 +3,6 @@ title: Geth fundamentals
 description: Documentation for foundational Geth topics
 ---
 
-## Geth fundamentals {#geth-fundamentals}
-
 This section includes documentation for foundational topics in Geth. The pages here will help you to understand how Geth works from a user perspective and under the hood.
 
 This is where you will find information about how to manage a Geth node and understand how it functions.
@@ -12,3 +10,18 @@ This is where you will find information about how to manage a Geth node and unde
 For example, the pages here will help you to understand the underlying architecture of your Geth node, how to start it in different configurations using command line options, how to sync the blockchain and how to manage accounts. There is a page on security practices that will help you to keep your Geth node safe from adversaries.
 
 Note also that there is a page explaining common log messages that are often queried on the Geth discord and GitHub - this will help users to interpret the messages displayed to the console and know what actions to take.
+
+## In this section
+
+- [Node architecture](/docs/fundamentals/node-architecture): learn about the three components of an Ethereum node and how they fit together
+- [Command line options](/docs/fundamentals/command-line-options): see the various command line options that can be used to configure Geth
+- [Security](/docs/fundamentals/security): learn about basic security best-practises for Geth
+- [Sync-modes](/docs/fundamentals/sync-modes): learn about the different ways Geth can sync the blockchain
+- [Account management](/docs/fundamentals/account-management): read about how to manage accounts using Clef and Geth
+- [Backup and restore](/docs/fundamentals/backup-restore): learn how to backup and restore data for a Geth instance
+- [Logs](/docs/fundamentals/logs): learn how to interpret the main log messages Geth displays in the console
+- [Peer-to-peer](/docs/fundamentals/peer-to-peer): learn about Geth's peer-to-peer networking
+- [Pruning](/docs/fundamentals/pruning): read about Geth's data pruning options
+- [Private networks](/docs/fundamentals/private-network): learn hoe to set up a private network of multiple Geth nodes
+- [Light clients](/docs/fundamentals/les): read about Geth's light mode.
+- [Mining](/docs/fundamentals/mining): read about the minign algorithms Geth used to use to secure Ethereum before the network switched to proof-of-stake.
\ No newline at end of file