diff --git a/docs/build/getting-started/sidebars.ts b/docs/build/getting-started/sidebars.ts
index 2640a03fc70..3a8c7233163 100644
--- a/docs/build/getting-started/sidebars.ts
+++ b/docs/build/getting-started/sidebars.ts
@@ -16,24 +16,115 @@ module.exports = {
       },
       items: [
         {
-          type: 'link',
-          label: 'IOTA Sandbox',
-          href: '/iota-sandbox/welcome',
-        },
-        {
-          type: 'link',
-          label: 'CLI Wallet',
-          href: '/cli-wallet/welcome',
-        },
-        {
-          type: 'link',
-          label: 'WASP CLI',
-          href: '/wasp/how-tos/wasp-cli',
-        },
-        {
-          label: 'Schema Tool',
-          type: 'link',
-          href: '/isc/schema/introduction',
+          type: 'category',
+          label: 'EVM Tools',
+          collapsed: false,
+          link: {
+            type: 'generated-index',
+            title: 'EVM Tools',
+            slug: '/tools/evm',
+          },
+          items: [
+            {
+              type: 'category',
+              label: 'IOTA',
+              collapsed: false,
+              link: {
+                type: 'generated-index',
+                title: 'IOTA EVM Tools',
+                slug: '/tools/evm/iota',
+              },
+              items: [
+                {
+                  label: 'Explorer',
+                  type: 'link',
+                  href: 'https://explorer.evm.iota.org',
+                },
+                {
+                  label: 'Toolkit',
+                  type: 'link',
+                  href: 'https://evm-toolkit.evm.iotaledger.net',
+                },
+              ],
+            },
+            {
+              type: 'category',
+              label: 'IOTA Testnet',
+              collapsed: false,
+              link: {
+                type: 'generated-index',
+                title: 'IOTA Testnet EVM Tools',
+                slug: '/tools/evm/iota-testnet',
+              },
+              items: [
+                {
+                  label: 'Explorer',
+                  type: 'link',
+                  href: 'https://explorer.evm.testnet.iota.org',
+                },
+                {
+                  label: 'Toolkit & Faucet',
+                  type: 'link',
+                  href: 'https://evm-toolkit.evm.testnet.iotaledger.net',
+                },
+              ],
+            },
+            {
+              type: 'category',
+              label: 'Shimmer',
+              collapsed: true,
+              link: {
+                type: 'generated-index',
+                title: 'ShimmerEVM Tools',
+                slug: '/tools/evm/shimmer',
+              },
+              items: [
+                {
+                  label: 'Explorer',
+                  type: 'link',
+                  href: 'https://explorer.evm.shimmer.network',
+                },
+                {
+                  label: 'Toolkit',
+                  type: 'link',
+                  href: 'https://evm-toolkit.evm.shimmer.network',
+                },
+              ],
+            },
+            {
+              type: 'category',
+              label: 'Shimmer Testnet',
+              collapsed: true,
+              link: {
+                type: 'generated-index',
+                title: 'ShimmerEVM Testnet Tools',
+                slug: '/tools/evm/shimmer-testnet',
+              },
+              items: [
+                {
+                  label: 'Explorer',
+                  type: 'link',
+                  href: 'https://explorer.evm.testnet.shimmer.network',
+                },
+                {
+                  label: 'EVM Testnet Toolkit & Faucet',
+                  type: 'link',
+                  href: 'https://evm-toolkit.evm.testnet.shimmer.network/',
+                },
+              ],
+            },
+            {
+              label: 'Oracles for IOTA EVM and ShimmerEVM',
+              type: 'doc',
+              id: 'oracles',
+            },
+            {
+              type: 'link',
+              label: 'WASP CLI',
+              description: 'Wasp CLI is a command line tool for interacting with the Wasp node.',
+              href: '/wasp/how-tos/wasp-cli',
+            },
+          ],
         },
         {
           label: 'Explorer',
@@ -41,39 +132,19 @@ module.exports = {
           href: 'https://explorer.iota.org',
         },
         {
-          label: 'IOTA EVM Explorer',
+          label: 'IOTA Testnet Faucet',
           type: 'link',
-          href: 'https://explorer.evm.iota.org',
+          href: 'https://faucet.testnet.iotaledger.net',
         },
         {
-          label: 'IOTA EVM Toolkit',
           type: 'link',
-          href: 'https://evm-toolkit.evm.iotaledger.net/',
-        },
-        {
-          label: 'Shimmer EVM Explorer',
-          type: 'link',
-          href: 'https://explorer.evm.shimmer.network/',
-        },
-        {
-          label: 'Shimmer EVM Toolkit',
-          type: 'link',
-          href: 'https://evm-toolkit.evm.shimmer.network/',
-        },
-        {
-          label: 'EVM Testnet Toolkit & Faucet',
-          type: 'link',
-          href: 'https://evm-toolkit.evm.testnet.shimmer.network/',
-        },
-        {
-          label: 'Oracles for IOTA EVM and ShimmerEVM',
-          type: 'doc',
-          id: 'oracles',
+          label: 'CLI Wallet',
+          href: '/cli-wallet/welcome',
         },
         {
-          label: 'Testnet Faucet',
           type: 'link',
-          href: 'https://faucet.testnet.shimmer.network',
+          label: 'IOTA Sandbox',
+          href: '/iota-sandbox/welcome',
         },
       ],
     },