diff --git a/docs/about/integrate-with-astar/add-to-portal.md b/docs/about/integrate-with-astar/add-to-portal.md
index 01b4910..f11c36b 100644
--- a/docs/about/integrate-with-astar/add-to-portal.md
+++ b/docs/about/integrate-with-astar/add-to-portal.md
@@ -2,7 +2,7 @@
sidebar_position: 5
---
-# Add assets to Astar Portal
+# Add Assets to Astar Portal
Once a channel is opened between parachains and assets have been registered, developers can create a PR on [Astar Portal](https://github.com/AstarNetwork/astar-apps) Github, to have their assets added. Here’s what you need to know about the integration of the XCM assets into Astar Portal.
diff --git a/docs/about/integrate-with-astar/multilocation.md b/docs/about/integrate-with-astar/multilocation.md
index b546e15..4f85dbc 100644
--- a/docs/about/integrate-with-astar/multilocation.md
+++ b/docs/about/integrate-with-astar/multilocation.md
@@ -36,4 +36,4 @@ You can use these `MultiLocation` values to add Astar native assets to a paracha
`{ parents: 1, interior: X3(Parachain(2006/7), PalletInstance(36), GeneralIndex(*asset_id*) }`
- Please note that these assets can be created by any user.
-- Asset metadata (if available) can be found on-chain, by consulting the asset owner, or in our [official asset list](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/asset-list.md).
+- Asset metadata (if available) can be found on-chain, by consulting the asset owner, or in our [official asset list](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/asset-list.md).
diff --git a/docs/about/products/dapp-staking/dapp-staking-protocol.md b/docs/about/products/dapp-staking/dapp-staking-protocol.md
index 7c9fb45..b919072 100644
--- a/docs/about/products/dapp-staking/dapp-staking-protocol.md
+++ b/docs/about/products/dapp-staking/dapp-staking-protocol.md
@@ -1,6 +1,6 @@
---
sidebar_position: 1
-title: dApp Staking v3 Technical Overview
+title: dApp Staking Technical Overview
---
## Introduction
diff --git a/docs/about/products/dapp-staking/for-devs/create-promotion.md b/docs/about/products/dapp-staking/for-devs/create-promotion.md
index 9f79c4e..5dd4f40 100644
--- a/docs/about/products/dapp-staking/for-devs/create-promotion.md
+++ b/docs/about/products/dapp-staking/for-devs/create-promotion.md
@@ -4,11 +4,13 @@ sidebar_position: 4
import Figure from '/src/components/figure'
-# Create a promotion card on top page
+# Create a Promotion Card
-If you have a campaign or new product you would like to share in the community, this will help you spread the news. It will create a card which will be shown on the top of the dApp Staking page as well as the Portal asset page.
+If you have a campaign or new product you would like to share in the community, this will help you spread the news. Following this procedure will create a card shown on the top of the dApp Staking page, as well as the Portal asset page.
-You can create a PR once a month, at most.
+:::note
+Promotion cards may only be updated or changed **once a month**.
+:::
diff --git a/docs/about/products/dapp-staking/for-devs/manage-dApp-Staking.md b/docs/about/products/dapp-staking/for-devs/manage-dApp-Staking.md
index d1da0fe..fc9cd22 100644
--- a/docs/about/products/dapp-staking/for-devs/manage-dApp-Staking.md
+++ b/docs/about/products/dapp-staking/for-devs/manage-dApp-Staking.md
@@ -4,7 +4,7 @@ sidebar_position: 3
import Figure from "/src/components/figure"
-# Manage dApp & claim rewards
+# Manage dApp & Claim Rewards
As a dApp owner, a new panel will appear in the Asset page of the Astar portal: **Your Project** ;
diff --git a/docs/about/products/dapp-staking/for-stakers/manage-dApp-Staking.md b/docs/about/products/dapp-staking/for-stakers/manage-dApp-Staking.md
index 441e73c..67b848b 100644
--- a/docs/about/products/dapp-staking/for-stakers/manage-dApp-Staking.md
+++ b/docs/about/products/dapp-staking/for-stakers/manage-dApp-Staking.md
@@ -4,7 +4,7 @@ sidebar_position: 2
import Figure from "/src/components/figure"
-# Manage dApp Staking & claim rewards
+# Manage dApp Staking & Claim Rewards
Once you have staked, a new panel named **Staking** will appear in the [Assets Page](https://portal.astar.network/astar/assets).
diff --git a/docs/about/products/dapp-staking/for-stakers/move-staked-tokens.md b/docs/about/products/dapp-staking/for-stakers/move-staked-tokens.md
index 7e38190..64dd033 100644
--- a/docs/about/products/dapp-staking/for-stakers/move-staked-tokens.md
+++ b/docs/about/products/dapp-staking/for-stakers/move-staked-tokens.md
@@ -4,7 +4,7 @@ sidebar_position: 3
import Figure from "/src/components/figure"
-# Move staked tokens between dApps
+# Move Staked Tokens Between dApps
Once your tokens have been staked on a dApp, you always have the option of reconsidering your decisions and moving them to another dApp.
diff --git a/docs/build/build-on-layer-1/category.json b/docs/build/build-on-layer-1/category.json
deleted file mode 100644
index 03a62c3..0000000
--- a/docs/build/build-on-layer-1/category.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "label": "Build on Astar Substrate - Layer 1",
- "position": 1
-}
\ No newline at end of file
diff --git a/docs/build/build-on-layer-1/environment/_category_.json b/docs/build/build-on-layer-1/environment/_category_.json
index 0f43ced..0816676 100644
--- a/docs/build/build-on-layer-1/environment/_category_.json
+++ b/docs/build/build-on-layer-1/environment/_category_.json
@@ -1,4 +1,4 @@
{
- "label": "Build Environment",
+ "label": "Environment",
"position": 2
}
diff --git a/docs/build/build-on-layer-1/environment/index.md b/docs/build/build-on-layer-1/environment/index.md
index ecf2d61..d5399e7 100644
--- a/docs/build/build-on-layer-1/environment/index.md
+++ b/docs/build/build-on-layer-1/environment/index.md
@@ -1,3 +1,8 @@
+---
+title: Environment
+position: 2
+---
+
import Figure from "/src/components/figure"
# Set up the Development Environment
diff --git a/docs/build/build-on-layer-1/environment/zombienet-testing.md b/docs/build/build-on-layer-1/environment/zombienet-testing.md
index f70358c..674de51 100644
--- a/docs/build/build-on-layer-1/environment/zombienet-testing.md
+++ b/docs/build/build-on-layer-1/environment/zombienet-testing.md
@@ -90,7 +90,7 @@ For all steps, encoded call data will be provided to simplify the process for th
After completing the previous steps, cross-chain SDN and SBY wrappers are configured as payable and sufficient assets.
The following steps will explain how to execute a cross-chain remote call. `Alice` will send an instruction from `Shiden` to execute `System::remark_with_event` on `Shibuya`.
-`Alice` isn't able to directly control `Alice` on the destination chain, instead a new account will be derived. More information can be found [INSERT LINK TO GUIDE] (/docs/build/build-on-layer-1/smart-contracts/buildiing-cross-chain-contracts/xcm/building-with-xcm/xc-remote-transact.md#derived-remote-accounts).
+`Alice` isn't able to directly control `Alice` on the destination chain, instead a new account will be derived. More information can be found [INSERT LINK TO GUIDE] (/docs/build/build-on-layer-1/smart-contracts/buildiing-cross-chain-contracts/building-with-xcm/xc-remote-transact.md#derived-remote-accounts).
1. Calculate `Alice's` derived account on `Shibuya` when sending instructions from `Shiden`.
```
diff --git a/docs/build/build-on-layer-1/index.md b/docs/build/build-on-layer-1/index.md
index 714f4da..4d287aa 100644
--- a/docs/build/build-on-layer-1/index.md
+++ b/docs/build/build-on-layer-1/index.md
@@ -1,5 +1,6 @@
---
title: Build on Astar Substrate
+position: 1
---
import Figure from '/src/components/figure'
diff --git a/docs/build/build-on-layer-1/integrations/_category_.json b/docs/build/build-on-layer-1/integrations/_category_.json
index 8900a04..235e4e2 100644
--- a/docs/build/build-on-layer-1/integrations/_category_.json
+++ b/docs/build/build-on-layer-1/integrations/_category_.json
@@ -1,4 +1,4 @@
{
- "label": "Integrate Toolings",
- "position": 9
+ "label": "Integration",
+ "position": 4
}
\ No newline at end of file
diff --git a/docs/build/build-on-layer-1/integrations/index.md b/docs/build/build-on-layer-1/integrations/index.md
index 59db61e..90b6d59 100644
--- a/docs/build/build-on-layer-1/integrations/index.md
+++ b/docs/build/build-on-layer-1/integrations/index.md
@@ -1,3 +1,7 @@
+---
+position: 4
+---
+
# Integrations
Here you will find some common services available to developers building dApps on Astar Network, including sample configurations, and guides for many important elements of our infrastructure. For zkEVM-specific integrations please visit [this section](/docs/build/build-on-layer-2/integrations/index.md).
diff --git a/docs/build/build-on-layer-1/introduction/index.md b/docs/build/build-on-layer-1/introduction/index.md
index e16cbb1..c718d46 100644
--- a/docs/build/build-on-layer-1/introduction/index.md
+++ b/docs/build/build-on-layer-1/introduction/index.md
@@ -1,3 +1,7 @@
+---
+position: 1
+---
+
import Figure from '/src/components/figure'
# Introduction
diff --git a/docs/build/build-on-layer-1/nodes/_category_.json b/docs/build/build-on-layer-1/nodes/_category_.json
index bac62f9..c17c9b3 100644
--- a/docs/build/build-on-layer-1/nodes/_category_.json
+++ b/docs/build/build-on-layer-1/nodes/_category_.json
@@ -1,4 +1,4 @@
{
- "label": "Run A Node",
- "position": 9
+ "label": "Run a Node",
+ "position": 3
}
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/building_node.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/building_node.md
index fde7787..687201b 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/building_node.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/building_node.md
@@ -2,7 +2,7 @@
sidebar_position: 4
---
-# 4. Building Your Collator
+# Building Your Collator
import Tabs from '@theme/Tabs';
import TabItem from '@theme/TabItem';
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/configuration.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/configuration.md
index 053058c..a09b23c 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/configuration.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/configuration.md
@@ -2,7 +2,7 @@
sidebar_position: 6
---
-# 6. Configuration
+# Configuration
:::tip
There is a lot of copy/paste in this section, but it is highly recommended that you try to understand each step. Please use our official discord for support.
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/create_environnement.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/create_environnement.md
index 5c72267..ffa9f20 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/create_environnement.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/create_environnement.md
@@ -2,7 +2,7 @@
sidebar_position: 1
---
-# 1. Create Your Environment
+# Create Your Environment
## Overview
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/launch_services.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/launch_services.md
index e2f6ca8..a3c50ed 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/launch_services.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/launch_services.md
@@ -2,7 +2,7 @@
sidebar_position: 8
---
-# 8. Launch Services
+# Launch Services
## Launch Services
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/node_monitoring.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/node_monitoring.md
index ad63029..867c4ff 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/node_monitoring.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/node_monitoring.md
@@ -2,7 +2,7 @@
sidebar_position: 5
---
-# 5. Node Monitoring
+# Node Monitoring
## Installation of Node Monitoring
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/secure_connection.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/secure_connection.md
index 4515f44..d1122b0 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/secure_connection.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/secure_connection.md
@@ -2,7 +2,7 @@
sidebar_position: 2
---
-# 2. Secure SSH Connection
+# Secure SSH Connection
**SSH access** is the most standard attack vector for an online server. An incredible number of robots and hackers scan the default port 22 and gain access, with basic and elaborated credentials.
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/services.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/services.md
index d2cfdba..7436294 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/services.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/services.md
@@ -2,7 +2,7 @@
sidebar_position: 7
---
-# 7. Services
+# Services
## Systemd
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/ssh_tunneling.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/ssh_tunneling.md
index e48f7d6..5df8caa 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/ssh_tunneling.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/ssh_tunneling.md
@@ -2,7 +2,7 @@
sidebar_position: 3
---
-# 3. SSH Tunneling
+# SSH Tunneling
# SSH Tunneling
diff --git a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/start_monitoring.md b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/start_monitoring.md
index 388b354..82f9f1e 100644
--- a/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/start_monitoring.md
+++ b/docs/build/build-on-layer-1/nodes/collator/secure_setup_guide/start_monitoring.md
@@ -2,7 +2,7 @@
sidebar_position: 9
---
-# 9. Run Monitor Dashboard
+# Run Monitor Dashboard
## Run Grafana dashboard
diff --git a/docs/build/build-on-layer-1/nodes/index.md b/docs/build/build-on-layer-1/nodes/index.md
index 9146c5f..075e39b 100644
--- a/docs/build/build-on-layer-1/nodes/index.md
+++ b/docs/build/build-on-layer-1/nodes/index.md
@@ -1,3 +1,7 @@
+---
+position: 3
+---
+
# Node Operators
**Node SDK** is broken down into the following pages:
diff --git a/docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/Truffle.md b/docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/Truffle.md
deleted file mode 100644
index c1490b4..0000000
--- a/docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/Truffle.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Truffle
-
-### Create an Ethereum Account
-
-We recommend using the `@truffle/hdwallet-provider` package for key management. Instructions can be found [here](https://github.com/trufflesuite/truffle/blob/develop/packages/hdwallet-provider/README.md).
-
-### Add Networks to `truffle-config.js`
-
-To deploy and interact with Astar, modify `networks` in `truffle-config.js` to include Astar's networks:
-
-```js
-// truffle-config.js
-module.exports = {
- networks: {
- // ... any existing networks (development, test, etc.)
-
- // Shibuya faucet: use #shibuya-faucet room in https://discord.gg/astarnetwork
- shibuya: {
- url: "https://evm.shibuya.astar.network",
- network_id: 81,
- },
-
- // Astar community faucet (please don't abuse): https://as-faucet.xyz/en/astar#
- astar: {
- url: "https://evm.astar.network",
- network_id: 592,
- },
-
- // Shiden community faucet (please don't abuse): https://as-faucet.xyz/en/shiden#
- shiden: {
- url: "https://evm.shiden.astar.network",
- network_id: 336,
- },
- },
-
- // ...
-};
-```
-
-Deploy/Migrate by running `truffle migrate --network shibuya`, replacing `shibuya` with your chosen network. If `--network` is not specified, the network values under`development` will be used.
\ No newline at end of file
diff --git a/docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/own-RPC.md b/docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/self-hosted-RPC.md
similarity index 97%
rename from docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/own-RPC.md
rename to docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/self-hosted-RPC.md
index e493150..92f32d3 100644
--- a/docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/own-RPC.md
+++ b/docs/build/build-on-layer-1/smart-contracts/EVM/developer-tooling/self-hosted-RPC.md
@@ -1,7 +1,7 @@
---
sidebar_position: 4
---
-# Your Own RPC Server
+# Self-Hosted RPC Server
For EVM developers and projects, it is not an unreasonable expectation that they should have their own managed EVM endpoints. Relying on public endpoints can introduce additional risk due to centralizaion or improper maintenance, and make them single points of failure.
diff --git a/docs/build/build-on-layer-1/smart-contracts/EVM/precompiles/xc20.md b/docs/build/build-on-layer-1/smart-contracts/EVM/precompiles/xc20.md
index c38885c..fbb1b09 100644
--- a/docs/build/build-on-layer-1/smart-contracts/EVM/precompiles/xc20.md
+++ b/docs/build/build-on-layer-1/smart-contracts/EVM/precompiles/xc20.md
@@ -2,7 +2,7 @@
XC20 standard, created by the Moonbeam team, ensures compatibility between the EVM and Substrate framework that powers Polkadot via precompiles — special built-in smart contracts made to look like ERC20s. Calling functions on an XC20 invokes underlying Substrate functionality, which could be instructions to move tokens to another chain, or send them to another local address. This compatibility layer connects the world of EVM and smart contracts to advanced Substrate-based interoperability scenarios.
-For XC20 overview see the following [page] (/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/create-xc20-assets). [INSERT LINK]
+For XC20 overview see the following [page] (/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/create-xc20-assets). [INSERT LINK]
# See also
diff --git a/docs/build/build-on-layer-1/smart-contracts/EVM/precompiles/xcm/native-transfer.md b/docs/build/build-on-layer-1/smart-contracts/EVM/precompiles/xcm/native-transfer.md
index 8282255..3a35dcd 100644
--- a/docs/build/build-on-layer-1/smart-contracts/EVM/precompiles/xcm/native-transfer.md
+++ b/docs/build/build-on-layer-1/smart-contracts/EVM/precompiles/xcm/native-transfer.md
@@ -1,4 +1,4 @@
-# Transfer native token
+# Transfer Native Token
Let's use `transfer_multiasset` to:
diff --git a/docs/build/build-on-layer-1/smart-contracts/_category_.json b/docs/build/build-on-layer-1/smart-contracts/_category_.json
index 669e062..0cbe83c 100644
--- a/docs/build/build-on-layer-1/smart-contracts/_category_.json
+++ b/docs/build/build-on-layer-1/smart-contracts/_category_.json
@@ -1,4 +1,4 @@
{
"label": "Smart Contracts",
- "position": 1
+ "position": 5
}
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/_category_.json b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/_category_.json
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/_category_.json
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/_category_.json
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/client-applications.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/client-applications.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/client-applications.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/client-applications.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/create-xc20-assets.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/create-xc20-assets.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/create-xc20-assets.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/create-xc20-assets.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/erc20-cross-chain-compatible.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/erc20-cross-chain-compatible.md
similarity index 96%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/erc20-cross-chain-compatible.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/erc20-cross-chain-compatible.md
index 91911df..aad8fb9 100644
--- a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/erc20-cross-chain-compatible.md
+++ b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/erc20-cross-chain-compatible.md
@@ -87,13 +87,13 @@ contract XcBurrito is Xc20Plus, ERC20Wrapper, BURRITO{
## Procedure
### 1. Create an XC20 asset
-Follow the documentation on how to [Create XC20 Assets](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/create-xc20-assets.md).
+Follow the documentation on how to [Create XC20 Assets](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/create-xc20-assets.md).
### 2. Deploy the xcBurrito.sol smart contract
To deploy the XcBurrito contract you will need 2 input parameters
- Burrito ERC20 token address (H160)
- **XC20** asset address (H160)
- - Follow the instructions about how to [Calculate an XC20 Address](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/create-xc20-assets.md#calculate-xc20-precompile-address). For example, if the asset_id is 17 (=0x11), the resulting EVM address will be `0xffffffff00000000000000000000000000000011`
+ - Follow the instructions about how to [Calculate an XC20 Address](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/create-xc20-assets.md#calculate-xc20-precompile-address). For example, if the asset_id is 17 (=0x11), the resulting EVM address will be `0xffffffff00000000000000000000000000000011`
### 3. Transfer XC Asset Ownership to the xcBurrito Smart Contract
To allow the **xcBurrito** contract to be able to mint/burn you need to call the `setTeam()` extrinsic on pallet-assets, and configure the `issuer` and `admin` to be **xcBurrito**. This will allow the contract to issue wrapped **XC20** assets, but since the EVM contract has 24 bytes (H160), we will need to transform the EVM address to ss58 format before we can call the extrinsic.
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/faq-for-smart-contracts.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/faq-for-smart-contracts.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/faq-for-smart-contracts.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/faq-for-smart-contracts.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/1.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/1.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/1.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/1.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/10.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/10.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/10.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/10.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/11.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/11.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/11.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/11.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/12.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/12.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/12.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/12.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/13.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/13.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/13.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/13.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/14.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/14.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/14.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/14.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/15.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/15.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/15.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/15.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/16.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/16.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/16.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/16.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/17.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/17.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/17.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/17.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/2.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/2.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/2.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/2.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/3.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/3.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/3.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/3.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/4.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/4.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/4.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/4.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/5.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/5.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/5.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/5.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/6.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/6.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/6.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/6.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/7.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/7.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/7.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/7.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/8.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/8.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/8.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/8.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/9.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/9.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/9.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/9.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/erc20-cross-chain-compatible-1.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/erc20-cross-chain-compatible-1.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/erc20-cross-chain-compatible-1.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/erc20-cross-chain-compatible-1.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/erc20-cross-chain-compatible-2.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/erc20-cross-chain-compatible-2.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/erc20-cross-chain-compatible-2.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/erc20-cross-chain-compatible-2.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/001_dapps_staking_claim.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/001_dapps_staking_claim.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/001_dapps_staking_claim.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/001_dapps_staking_claim.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/002_unsigned_transaction.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/002_unsigned_transaction.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/002_unsigned_transaction.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/002_unsigned_transaction.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/003_non_signed_tx_data.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/003_non_signed_tx_data.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/003_non_signed_tx_data.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/003_non_signed_tx_data.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/004_rpc_query_info_weight_transact_call.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/004_rpc_query_info_weight_transact_call.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/004_rpc_query_info_weight_transact_call.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/004_rpc_query_info_weight_transact_call.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/005_xcm_execute_weight_hack.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/005_xcm_execute_weight_hack.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/005_xcm_execute_weight_hack.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/005_xcm_execute_weight_hack.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/006_total_fee_for_execution.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/006_total_fee_for_execution.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/006_total_fee_for_execution.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/006_total_fee_for_execution.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/007_wasm_flipper_call.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/007_wasm_flipper_call.png
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/img/remote-transact/007_wasm_flipper_call.png
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/img/remote-transact/007_wasm_flipper_call.png
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/index.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/index.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/index.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/index.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/native-transactions.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/native-transactions.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/native-transactions.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/native-transactions.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/send-xc20-evm.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/send-xc20-evm.md
similarity index 96%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/send-xc20-evm.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/send-xc20-evm.md
index 7b753cf..4aa0f93 100644
--- a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/send-xc20-evm.md
+++ b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/send-xc20-evm.md
@@ -24,14 +24,14 @@ XC20s can interact through an ERC20 interface, so have the additional benefit of
First, let’s approach this at a high level, and move on to a more technical example for dApps.
-Let’s say we want to transfer some KSM token from Kusama to `0xd2C6929A72e466213D1c2Df8359194784650A50e`. From the Kusama side of things, the payload for sending the KSM tokens will be similar to the ones we used in the previous [section](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/native-transactions.md).
+Let’s say we want to transfer some KSM token from Kusama to `0xd2C6929A72e466213D1c2Df8359194784650A50e`. From the Kusama side of things, the payload for sending the KSM tokens will be similar to the ones we used in the previous [section](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/native-transactions.md).
However, the `Beneficiary` address `AccountId` will be a mapped ss58 address of the recipient’s EVM address, as that is the only address format that XCM will accept. You can read [this article](https://medium.com/astar-network/using-astar-network-account-between-substrate-and-evm-656643df22a0) about how to create the mapped address. To keep things short, the address mappings are:
- **H160**: `0xd2C6929A72e466213D1c2Df8359194784650A50e`
- **ss58**: `YPRZVFHaRvXdnbAQsXcgqiJokpoHNkUXzR6XTBBJQKHtorT` (with prefix 5 for Shiden/Astar)
- **Public key**: `0x6c65500b73e2cec702f06dcd5299b31e4d0b6cf7728937b7d5edac79611292f2`
-To obtain the asset address on the EVM, we will need to retrieve its asset `Id`. In our case, we will be using KSM, which has the asset `Id` `340282366920938463463374607431768211455`. Now we will need to convert the `Id` to hex, and append it to `0xffffffff`. In this example, the resulting address is `0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF`, which we can now use directly within Solidity smart contracts, or MetaMask. More info in previous [section](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/send-xc20-evm.md#step-1-obtain-the-ss58-native-address-mapped-to-your-evm-address)
+To obtain the asset address on the EVM, we will need to retrieve its asset `Id`. In our case, we will be using KSM, which has the asset `Id` `340282366920938463463374607431768211455`. Now we will need to convert the `Id` to hex, and append it to `0xffffffff`. In this example, the resulting address is `0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF`, which we can now use directly within Solidity smart contracts, or MetaMask. More info in previous [section](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/send-xc20-evm.md#step-1-obtain-the-ss58-native-address-mapped-to-your-evm-address)
## Import Assets on MetaMask
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/xc-assets-withdraw.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/xc-assets-withdraw.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/xc-assets-withdraw.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/xc-assets-withdraw.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/xc-remote-transact.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/xc-remote-transact.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/xc-remote-transact.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/xc-remote-transact.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/xc-reserve-transfer.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/xc-reserve-transfer.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/xc-reserve-transfer.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/xc-reserve-transfer.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/xc20-smart-contracts.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/xc20-smart-contracts.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/xc20-smart-contracts.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/xc20-smart-contracts.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/index.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/index.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/index.md
rename to docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/index.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/_category_.json b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/_category_.json
deleted file mode 100644
index c29ac21..0000000
--- a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/_category_.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "label": "Cross-Chain Messaging - XCM",
- "position": 5
-}
\ No newline at end of file
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/asset-list.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/asset-list.md
deleted file mode 100644
index b878f52..0000000
--- a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/asset-list.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-sidebar_position: 4
----
-
-# XCM Asset List
-
-## XC20
-
-We can differentiate between managed project's XC20 assets which have been tested by Astar and Shiden Network maintainers and other permissionless XC20 assets created on-chain.
-
-Currently, this is a list of managed XC20 assets:
-
-### Astar
-
-Asset | Symbol | Decimals | EVM Address | Asset Id
----| --- | --- | --- | ---
-Polkadot | `DOT` | 10 | `0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF` | `340282366920938463463374607431768211455`
-Tether USD | `USDT` | 6 | `0xFFFFFFFF000000000000000000000001000007C0` | `4294969280`
-Circle USDC | `USDC` | 6 | `0xFFFFFFFF000000000000000000000001000007C1` | `4294969281`
-Acala | `ACA` | 12 | `0xFFFFFFFF00000000000000010000000000000000` | `18446744073709551616`
-Acala Dollar | `aUSD` | 12 | `0xFFFFFFFF00000000000000010000000000000001` | `18446744073709551617`
-Liquid DOT | `LDOT` | 10 | `0xFFFFFFFF00000000000000010000000000000002` | `18446744073709551618`
-Glimmer | `GLMR` | 18 | `0xFFFFFFFF00000000000000010000000000000003` | `18446744073709551619`
-Inter iBTC | `iBTC` | 8 | `0xFFFFFFFF00000000000000010000000000000004` | `18446744073709551620`
-INTR | `INTR` | 10 | `0xFFFFFFFF00000000000000010000000000000005` | `18446744073709551621`
-Phala Token | `PHA` | 12 | `0xFFFFFFFF00000000000000010000000000000006` | `18446744073709551622`
-Bifrost Native Token | `BNC` | 12 | `0xFFFFFFFF00000000000000010000000000000007` | `18446744073709551623`
-Voucher DOT | `vDOT` | 10 | `0xFFFFFFFF00000000000000010000000000000008` | `18446744073709551624`
-Clover Finance | `CLV` | 18 | `0xFFFFFFFF00000000000000010000000000000009` | `18446744073709551625`
-Voucher Slot DOT | `vsDOT` | 10 | `0xFFFfFffF0000000000000001000000000000000A` | `18446744073709551626`
-Darwinia Native Token | `RING` | 18 | `0xFFFfFffF0000000000000001000000000000000B` | `18446744073709551627`
-Equilibrium Native Token | `EQ` | 9 | `0xFFFfFffF0000000000000001000000000000000C` | `18446744073709551628`
-Equilibrium USD | `EQD` | 9 | `0xFFFfFffF0000000000000001000000000000000D` | `18446744073709551629`
-HydraDX | `HDX` | 12 | `0xFFFfFffF0000000000000001000000000000000E` | `18446744073709551630`
-Unique Network | `UNQ` | 18 | `0xFFFfFffF0000000000000001000000000000000F` | `18446744073709551631`
-Voucher ASTR | `vASTR` | 18 | `0xFFFfFffF00000000000000010000000000000010` | `18446744073709551632`
-PINK Token | 'PINK' | 10 | `0xFFFFFFFF00000000000000010000000000000011` | `18446744073709551633`
-
-### Shiden
-
-Asset | Symbol | Decimals | EVM Address | Asset Id
----| --- | --- | --- | ---
-Kusama | `KSM` | 12 | `0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF` | `340282366920938463463374607431768211455`
-Tether USD | `USDT` | 6 | `0xFFFFFFFF000000000000000000000001000007C0` | `4294969280`
-Circle USDC | `USDC` | 6 | `0xFFFFFFFF000000000000000000000001000007C1` | `4294969281`
-Acala Dollar | `aUSD` | 12 | `0xFFFFFFFF00000000000000010000000000000000` | `18446744073709551616`
-Karura | `KAR` | 12 | `0xFFFFFFFF00000000000000010000000000000002` | `18446744073709551618`
-Liquid KSM | `LKSM` | 12 | `0xFFFFFFFF00000000000000010000000000000003` | `18446744073709551619`
-Moonriver | `MOVR` | 18 | `0xFFFFFFFF00000000000000010000000000000004` | `18446744073709551620`
-Kintsugi iBTC | `KBTC` | 8 | `0xFFFFFFFF00000000000000010000000000000005` | `18446744073709551621`
-KINT | `KINT` | 12 | `0xFFFFFFFF00000000000000010000000000000006` | `18446744073709551622`
-Phala Token | `PHA` | 12 | `0xFFFFFFFF00000000000000010000000000000007` | `18446744073709551623`
-Crust Shadow Native Token | `CSM` | 12 | `0xFFFFFFFF00000000000000010000000000000008` | `18446744073709551624`
-Sakura | `SKU` | 18 | `0xFFFfFffF0000000000000001000000000000000A` | `18446744073709551626`
-Bifrost Native Coin | `BNC` | 12 | `0xFFFfFffF0000000000000001000000000000000B` | `18446744073709551627`
-Voucher KSM | `vKSM` | 12 | `0xFFFfFffF0000000000000001000000000000000C` | `18446744073709551628`
-Voucher Slot KSM | `vsKSM` | 12 | `0xFFFfFffF0000000000000001000000000000000D` | `18446744073709551629`
-Genshiro Native Token | `GENS` | 9 | `0xFFFfFffF0000000000000001000000000000000E` | `18446744073709551630`
-Equilibrium USD | `EQD` | 9 | `0xFFFfFffF0000000000000001000000000000000F` | `18446744073709551631`
-Metaverse.Network Pioneer | `NEER` | 18 | `0xFFFFFFFF00000000000000010000000000000010` | `18446744073709551632`
-Quartz | `QTZ` | 18 | `0xFFFFFFFF00000000000000010000000000000011` | `18446744073709551633`
-
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/faq.md b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/faq.md
deleted file mode 100644
index 1477f7f..0000000
--- a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/faq.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-sidebar_position: 5
----
-
-# FAQ
-
-## Q: Is there a way to see my DOT/SDN balance (on Astar/Shiden) on the Polkadot.js?
-
-Yes. visit Polkadot.js, connect your wallet and go to Network > Balances and select the token you are interested in. The example below demonstrates how to view the SDN balance:
-
-![Viewing KSM balance on Shiden Network](img/1.png)
-
-## Q: I used XCM to transfer 5 DOT from Polkadot to Astar, but only received 4.999
-
-Please note that the gas amount will be deducted from the amount entered, so the amount transferred should be adjusted according to account for the gas fee estimate. For more information, visit [here](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/index.md)
-
-## Q: My balance should be 1.00012 DOT but the Portal is displaying 1 DOT, where are they?
-
-The current version of Astar Portal rounds balances to the 3rd decimal. If you have a similar issue please refer to the [previous FAQ entry](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/faq-for-smart-contracts.md) and instructions on how to use Polkadot.js to find your exact balance.
-
-## Q: Can I send my DOT token to other Parachains?
-
-Not at the moment.
-
-## Q: How can I send my DOT token back to Polkadot?
-
-You can send back DOT/KSM to the Relay Chain using both EVM and native wallets. Visit the Assets Page and choose the XCM link of the relevant token.
-
-## Q: Why is the XCM button for DOT/KSM disabled when I connect my wallet on the Astar Portal?
-
-Ensure you have a non-zero balance of the native token.
-
-## Q: I transferred X tokens to another account, but the amount transferred and received by the target account is greater than X. What is going on?
-
-XC20 assets have a defined minimum-balance. The minimum-balance is the minimum balance of an asset that any single account must have. In this specific case, if an account's balance would be reduced below that amount in an asset transfer transaction, then the amount actually transferred would include the remaining amount of specific asset on the initiating account.
-
-Take a look at an example of a transaction in case of an asset whose minimum-balance is 10: Alice has 10.9 tokens and tries to send Bob 10 tokens. Alice's remaining balance in that case would become 0.9, which is less than minimum amount, so the amount transferred would be set to 10.9 tokens, so Alice's balance will become 0, to avoid any funds being reaped by not fulfilling the Existential Deposit.
-
-For more information, check out this [section within our documentation](/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/send-xc20-evm.md).
-
-## Q: Where can I find other chains' addresses?
-
-You can find all the different chains' addresses in Polkadot/Kusama :
-
-1. Using [Sub ID](https://sub.id/)
-
-Simply input your Astar native address and you will be able to see all the related addresses of the account.
-
-2. Display it on Polkadot.js extension by selecting the chain you would like to know the address of.
-
-Please note that you will only be able to make an XCM withdrawal if the receiver's Relay Chain account balance is greater than the Minimum Balance (1.1 DOT for Polkadot and 0.01 KSM for Kusama).
-
-
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/img/1.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/img/1.png
deleted file mode 100644
index 97f007b..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/img/1.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/1.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/1.png
deleted file mode 100644
index 73274d5..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/1.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/2.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/2.png
deleted file mode 100644
index 3442c3d..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/2.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/3.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/3.png
deleted file mode 100644
index 7cb7dbf..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/3.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/4.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/4.png
deleted file mode 100644
index f22d91f..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/4.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/5.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/5.png
deleted file mode 100644
index fbced39..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/5.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/6.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/6.png
deleted file mode 100644
index 9ddd6b7..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/6.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/7.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/7.png
deleted file mode 100644
index 3a28b06..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/7.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/8.png b/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/8.png
deleted file mode 100644
index cb38cb5..0000000
Binary files a/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/using-xcm/img/8.png and /dev/null differ
diff --git a/docs/build/build-on-layer-1/smart-contracts/index.md b/docs/build/build-on-layer-1/smart-contracts/index.md
index 2dd1d50..6892af4 100644
--- a/docs/build/build-on-layer-1/smart-contracts/index.md
+++ b/docs/build/build-on-layer-1/smart-contracts/index.md
@@ -1,5 +1,6 @@
---
title: Smart Contracts
+postion: 5
---
# Overview
diff --git a/docs/build/build-on-layer-1/smart-contracts/wasm/contract_environment/chain-extension/chain_extensions.md b/docs/build/build-on-layer-1/smart-contracts/wasm/contract_environment/chain-extension/index.md
similarity index 100%
rename from docs/build/build-on-layer-1/smart-contracts/wasm/contract_environment/chain-extension/chain_extensions.md
rename to docs/build/build-on-layer-1/smart-contracts/wasm/contract_environment/chain-extension/index.md
diff --git a/docs/build/build-on-layer-1/smart-contracts/wasm/index.md b/docs/build/build-on-layer-1/smart-contracts/wasm/index.md
index e05e93d..fce1d70 100644
--- a/docs/build/build-on-layer-1/smart-contracts/wasm/index.md
+++ b/docs/build/build-on-layer-1/smart-contracts/wasm/index.md
@@ -1,6 +1,6 @@
# Wasm Smart Contracts
-![Wasm Smart Contracts]https://docs.astar.network/build/img/wasm.png)
+![Wasm Smart Contracts](https://docs.astar.network/build/img/wasm.png)
The **Wasm** section covers the Wasm stack on Astar/Shiden, some more advanced topics, and contains a few tutorials to help you build and deploy Wasm smart contracts.
diff --git a/docs/build/build-on-layer-1/smart-contracts/wasm/ink-rediblenft-architecture.md b/docs/build/build-on-layer-1/smart-contracts/wasm/ink-rediblenft-architecture.md
index 952a37c..6c79cb5 100644
--- a/docs/build/build-on-layer-1/smart-contracts/wasm/ink-rediblenft-architecture.md
+++ b/docs/build/build-on-layer-1/smart-contracts/wasm/ink-rediblenft-architecture.md
@@ -1,4 +1,4 @@
-# ink!redible NFT architecture
+# ink!redible NFT Architecture
This guide will give a brief overview of the !inkredible NFT on Astar.
diff --git a/docs/build/builder-guides/_category_.json b/docs/build/builder-guides/_category_.json
deleted file mode 100644
index 2779b8a..0000000
--- a/docs/build/builder-guides/_category_.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "label": "Builder Guides and Tutorials",
- "position": 3
-}
\ No newline at end of file
diff --git a/docs/build/builder-guides/index.md b/docs/build/builder-guides/index.md
new file mode 100644
index 0000000..00bc1a2
--- /dev/null
+++ b/docs/build/builder-guides/index.md
@@ -0,0 +1,4 @@
+---
+title: Builder Guides
+position: 3
+---
\ No newline at end of file
diff --git a/docs/build/builder-guides/layer-1/astar-beta-labs/_category_.json b/docs/build/builder-guides/layer-1/astar-beta-labs/_category_.json
deleted file mode 100644
index 49fd9c9..0000000
--- a/docs/build/builder-guides/layer-1/astar-beta-labs/_category_.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "label": "Astar Beta Labs",
- "position": 11
-}
\ No newline at end of file
diff --git a/docs/build/builder-guides/layer-1/astar-beta-labs/account-unification/users_guide.md b/docs/build/builder-guides/layer-1/astar-beta-labs/account-unification/users_guide.md
index d660af9..3f1d7c5 100644
--- a/docs/build/builder-guides/layer-1/astar-beta-labs/account-unification/users_guide.md
+++ b/docs/build/builder-guides/layer-1/astar-beta-labs/account-unification/users_guide.md
@@ -1,4 +1,5 @@
---
+title: How to Create a Unified Account
sidebar_position: 2
---
# How to create a unified account
diff --git a/docs/build/builder-guides/layer-1/astar-beta-labs/index.md b/docs/build/builder-guides/layer-1/astar-beta-labs/index.md
index 757ac7d..8418c91 100644
--- a/docs/build/builder-guides/layer-1/astar-beta-labs/index.md
+++ b/docs/build/builder-guides/layer-1/astar-beta-labs/index.md
@@ -1,3 +1,8 @@
+---
+title: Astar Beta Labs
+position: 3
+---
+
# Astar Beta Labs
## Overview
diff --git a/docs/build/builder-guides/layer-1/astar-beta-labs/metamask-snaps/_category_.json b/docs/build/builder-guides/layer-1/astar-beta-labs/metamask-snaps/_category_.json
index 085760b..f620e8f 100644
--- a/docs/build/builder-guides/layer-1/astar-beta-labs/metamask-snaps/_category_.json
+++ b/docs/build/builder-guides/layer-1/astar-beta-labs/metamask-snaps/_category_.json
@@ -1,4 +1,4 @@
{
- "label": "MetaMask Snaps",
+ "label": "MetaMask Snap",
"position": 2
}
\ No newline at end of file
diff --git a/docs/build/builder-guides/layer-1/astar-beta-labs/metamask-snaps/index.md b/docs/build/builder-guides/layer-1/astar-beta-labs/metamask-snaps/index.md
index b265afb..472c52b 100644
--- a/docs/build/builder-guides/layer-1/astar-beta-labs/metamask-snaps/index.md
+++ b/docs/build/builder-guides/layer-1/astar-beta-labs/metamask-snaps/index.md
@@ -1,4 +1,4 @@
-# MetaMask Snaps
+# MetaMask Snap
## Overview
diff --git a/docs/build/builder-guides/layer-1/evm/category.json b/docs/build/builder-guides/layer-1/evm/category.json
deleted file mode 100644
index 226439e..0000000
--- a/docs/build/builder-guides/layer-1/evm/category.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "label": "Building EVM Smart Contracts",
- "position": 1
-}
\ No newline at end of file
diff --git a/docs/build/builder-guides/layer-1/evm/index.md b/docs/build/builder-guides/layer-1/evm/index.md
new file mode 100644
index 0000000..609e4cc
--- /dev/null
+++ b/docs/build/builder-guides/layer-1/evm/index.md
@@ -0,0 +1,4 @@
+---
+title: Build EVM Smart Contracts
+position: 2
+---
\ No newline at end of file
diff --git a/docs/build/builder-guides/layer-1/wasm/_category_.json b/docs/build/builder-guides/layer-1/wasm/_category_.json
deleted file mode 100644
index 70c386d..0000000
--- a/docs/build/builder-guides/layer-1/wasm/_category_.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "label": "Building Wasm Smart Contracts",
- "position": 1
-}
diff --git a/docs/build/builder-guides/layer-1/wasm/dex/_category_.json b/docs/build/builder-guides/layer-1/wasm/dex/_category_.json
index 1cabd0f..f799cde 100644
--- a/docs/build/builder-guides/layer-1/wasm/dex/_category_.json
+++ b/docs/build/builder-guides/layer-1/wasm/dex/_category_.json
@@ -1,4 +1,4 @@
{
- "label": "Build Uniswap V2 core DEX",
+ "label": "Uniswap V2 Core DEX",
"position": 4
}
diff --git a/docs/build/builder-guides/layer-1/wasm/dex/dex.md b/docs/build/builder-guides/layer-1/wasm/dex/dex.md
index 90fc8b2..0f48ed3 100644
--- a/docs/build/builder-guides/layer-1/wasm/dex/dex.md
+++ b/docs/build/builder-guides/layer-1/wasm/dex/dex.md
@@ -11,7 +11,7 @@ Experience gained from following the previous guides will be beneficial for this
| Tutorial | Difficulty |
|----------------------------------------------------------------------------|--------------------------------|
-| [Your First Flipper Contract](../flipper-contract/flipper-contract.md) | Basic ink! - Basic Rust |
+| [Your First Flipper Contract](../flipper-contract/flipper.md) | Basic ink! - Basic Rust |
| [NFT contract with PSP34](../nft/nft.md) | Intermediate ink! - Basic Rust |
In addition to:
diff --git a/docs/build/builder-guides/layer-1/wasm/flipper-contract/_category_.json b/docs/build/builder-guides/layer-1/wasm/flipper-contract/_category_.json
index b2eade6..99feea0 100644
--- a/docs/build/builder-guides/layer-1/wasm/flipper-contract/_category_.json
+++ b/docs/build/builder-guides/layer-1/wasm/flipper-contract/_category_.json
@@ -1,4 +1,4 @@
{
- "label": "Your First Flipper Contract",
+ "label": "Flipper Contract",
"position": 1
}
diff --git a/docs/build/builder-guides/layer-1/wasm/flipper-contract/flipper.md b/docs/build/builder-guides/layer-1/wasm/flipper-contract/flipper.md
index 25fcee8..b162b9b 100644
--- a/docs/build/builder-guides/layer-1/wasm/flipper-contract/flipper.md
+++ b/docs/build/builder-guides/layer-1/wasm/flipper-contract/flipper.md
@@ -2,14 +2,14 @@
sidebar_position: 2
---
-# Flipper Contract
+# Flipper
This is step-by-step explanation of the process behind building an ink! smart contract, using a simple app called Flipper. The examples provided within this guide will help you develop an understanding of the basic elements and structure of ink! smart contracts.
## What is Flipper?
Flipper is a basic smart contract that allows the user to toggle a boolean value located in storage to either `true` or `false`. When the flip function is called, the value will change from one to the other.
## Prerequisites
-Please refer to the [previous section](./flipper-contract.md) for the list of prerequisites.
+Please refer to the [previous section](./index.md) for the list of prerequisites.
## Flipper Smart Contract
In a new project folder, execute the following:
diff --git a/docs/build/builder-guides/layer-1/wasm/flipper-contract/flipper-contract.md b/docs/build/builder-guides/layer-1/wasm/flipper-contract/index.md
similarity index 100%
rename from docs/build/builder-guides/layer-1/wasm/flipper-contract/flipper-contract.md
rename to docs/build/builder-guides/layer-1/wasm/flipper-contract/index.md
diff --git a/docs/build/builder-guides/layer-1/wasm/index.md b/docs/build/builder-guides/layer-1/wasm/index.md
index c764eeb..ebc139d 100644
--- a/docs/build/builder-guides/layer-1/wasm/index.md
+++ b/docs/build/builder-guides/layer-1/wasm/index.md
@@ -1,3 +1,8 @@
+---
+title: Build Wasm Smart Contracts
+position: 1
+---
+
# From Zero to ink! Hero
```mdx-code-block
diff --git a/docs/build/builder-guides/layer-1/wasm/manic-minter/manic-minter.md b/docs/build/builder-guides/layer-1/wasm/manic-minter/manic-minter.md
index 7cc9ab6..99ab311 100644
--- a/docs/build/builder-guides/layer-1/wasm/manic-minter/manic-minter.md
+++ b/docs/build/builder-guides/layer-1/wasm/manic-minter/manic-minter.md
@@ -7,7 +7,7 @@ This tutorial is suitable for developers with **intermediate** knowledge of ink!
| Tutorial | Difficulty |
|----------------------------------------------------------------------------|--------------------------------|
-| [Your First Flipper Contract](../flipper-contract/flipper-contract.md) | Basic ink! - Basic Rust |
+| [Your First Flipper Contract](../flipper-contract/flipper.md) | Basic ink! - Basic Rust |
| [NFT contract with PSP34](../nft/nft.md) | Intermediate ink! - Basic Rust |
diff --git a/docs/build/builder-guides/layer-1/wasm/nft/nft.md b/docs/build/builder-guides/layer-1/wasm/nft/nft.md
index 4f77e51..5c9c937 100644
--- a/docs/build/builder-guides/layer-1/wasm/nft/nft.md
+++ b/docs/build/builder-guides/layer-1/wasm/nft/nft.md
@@ -11,7 +11,7 @@ This tutorial is suitable for developers with **intermediate** knowledge of ink!
| Tutorial | Difficulty |
|----------------------------------------------------------------------------|--------------------------------|
-| [Your First Flipper Contract](../flipper-contract/flipper-contract.md) | Basic ink! - Basic Rust |
+| [Your First Flipper Contract](../flipper-contract/flipper.md) | Basic ink! - Basic Rust |
| [Implement Uniswap V2 core DEX](../dex/dex.md) | Advanced ink! - Basic Rust |
## How to Start
diff --git a/docs/getting-started.md b/docs/getting-started.md
index e906523..7443eae 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -15,9 +15,16 @@ The Astar documentation portal serves as the official repository of current info
## Developer Quickstart Guides
-- [**Deploy on Astar Substrate EVM Network**](build/build-on-layer-1/smart-contracts/EVM/index.md) [INSERT QUICKSTART EVM]
-- [**Deploy on Astar Substrate Native (Wasm) Network**](build/build-on-layer-1/smart-contracts/wasm/index.md) [INSERT QUICKSTART WASM]
-- [**Deploy on Astar zkEVM**](build/build-on-layer-2/index.md)
+Learn more about the differences between Astar's Layer 1 and Layer 2 networks, visit the [About Section](/about/networks.md)
+
+### Build and Deploy on Layer 1
+
+- [**Build on Astar Substrate EVM Network**](build/build-on-layer-1/smart-contracts/EVM/quickstart-evm.md).
+- [**Build on Astar Substrate Native Network**](build/build-on-layer-1/smart-contracts/wasm/index.md).
+
+### Build and Deploy on Layer 2
+
+- [**Deploy Smart Contracts on Astar zkEVM**](build/build-on-layer-2/index.md)
## User Guides
diff --git a/docs/use/_category_.json b/docs/use/_category_.json
index 5b59494..54a543e 100644
--- a/docs/use/_category_.json
+++ b/docs/use/_category_.json
@@ -1,4 +1,4 @@
{
- "label": "Interact with Astar Network",
+ "label": "How to Use the Network",
"position": 3
}
diff --git a/docs/use/astar.md b/docs/use/astar.md
deleted file mode 100644
index 73d28d9..0000000
--- a/docs/use/astar.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-sidebar_position: 1
----
-
-# About Astar Network
-
-[Astar Network]: https://astar.network/
-
-Astar Network is Japan's most popular smart contract platform, supporting both EVM and WebAssembly (Wasm) environments, and interoperability between them using a Cross-Virtual Machine. Astar Network is friendly to all kinds of developers, and the tools and languages they already know. Backed by the shared security of Polkadot, Astar shines brilliantly on its own within a vibrant and healthy ecosystem, and in the blockchain industry overall driving international corporate adoption, and consumer interest in Web3 technologies.
-
-## Lack of developer incentives
-
-Astar's Build2Earn system is designed to grow the network in an innovative way, while simultaneously rewarding participants and builders. It allows developers to earn incentives for building and maintaining their decentralized applications, and users to earn incentives for supporting their favorite projects, all while encouraging growth of the ecosystem overall.
-
-## Scalability
-
-Blockchains do not scale by design, mostly due to the security assurances inherent in their decentralized consensus mechanisms. If blockchains were faster, they would be less secure. There is an upper limit to the amount of data that can be stored in individual blocks, and at times of network saturation, users of typical blockchains may notice their transactions sitting unconfirmed or in a pending state for long periods of time, resulting in a poor user experience.
-
-The solution to the issue, up until now, has been a patchwork of independent blockchains loosely connected by bridges - often subject to attack due to their reliance on custodial elements, with no common security standards or methods of interoperability between all. The idea of 'cross-chain', therefore, has mostly been to copy and paste a smart contract from one blockchain, to another. Projects that create real value are quickly copied and deployed elsewhere for better, or for worse, with almost no real innovation taking place overall.
-
-Astar Network is changing that, and ushering in the next generation of multichain smart contracts uniquely able to utilize the best features from both EVM and WebAssembly Virtual Machines, and any number of application-specific blockchains across the broader Polkadot ecosystem. All while being future-proof.
-
-## Interoperability
-
-This interoperability framework, empowered by the shared security of Polkadot coupled with Astar XVM, allows developers to use and build smart contracts in ways they never have before. By fostering cooperation and integrations across multiple blockchains and applications, complex synergies can be developed, leading to the realization of truly innovative solutions that can't be replicated in any other environment.
-
-Many different blockchains exist, but few have interoperability as their defining feature. Welcome to Astar Network.
diff --git a/docs/use/get-started/astar-evm-wallet/wallet/metamask/manage-xc20-with-metamask.md b/docs/use/get-started/astar-evm-wallet/wallet/metamask/manage-xc20-with-metamask.md
index 5cae607..15ef3dd 100644
--- a/docs/use/get-started/astar-evm-wallet/wallet/metamask/manage-xc20-with-metamask.md
+++ b/docs/use/get-started/astar-evm-wallet/wallet/metamask/manage-xc20-with-metamask.md
@@ -31,4 +31,4 @@ Click on **Import Tokens** in MetaMask popup.
When you are finished adding and importing DOT, you will see them in your wallet. You can find the full list of supported XCM assets [(/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/asset-list)].**[INSERT LINK]**
-To manually import assets that are not listed on the *Assets page*, follow [this guide] (/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/xcm/building-with-xcm/send-xc20-evm.md#import-assets-on-metamask). **[INSERT LINK]**
+To manually import assets that are not listed on the *Assets page*, follow [this guide] (/docs/build/build-on-layer-1/smart-contracts/building-cross-chain-contracts/building-with-xcm/send-xc20-evm.md#import-assets-on-metamask). **[INSERT LINK]**
diff --git a/docs/use/get-started/blockchain-smart-contracts.md b/docs/use/get-started/blockchain-smart-contracts.md
index c6725b8..7140268 100644
--- a/docs/use/get-started/blockchain-smart-contracts.md
+++ b/docs/use/get-started/blockchain-smart-contracts.md
@@ -1,8 +1,8 @@
---
sidebar_position: 1
-sidebar_label: Smart Contracts Blockchain
-title: High-Level Blockchain & Smart Contracts Overview
+title: What are Smart Contracts on the Blockchain?
---
+# Blockchain & Smart Contracts Overview
Astar is a platform for smart contracts deployment. Developers can create and deploy smart contracts on Astar Network using a variety of programming languages, including Solidity, which is compatible with Ethereum smart contracts or ink!, a Rust-based smart contract language for Polkadot ecosystem. This compatibility ensures a seamless transition for developers from other blockchain ecosystems, fostering interoperability and encouraging the adoption of Astar Network.
diff --git a/docs/use/index.md b/docs/use/index.md
index 294aeae..de0af27 100644
--- a/docs/use/index.md
+++ b/docs/use/index.md
@@ -1,8 +1,28 @@
---
-title: Use Astar Network
+title: How to Use the Network
position: 4
---
-# How to Interact with Astar Network
+# About Astar Network
-If this is your first time here, Welcome! This section is tailored to equip you with the knowledge and skills necessary to navigate through both our Layer 1 and Layer 2 networks confidently. Whether you're new to blockchain or an experienced web3 developer we aim to answer all your basic questions about interacting with the network here.
\ No newline at end of file
+[Astar Network]: https://astar.network/
+
+Astar Network is Japan's most popular smart contract platform, supporting both EVM and WebAssembly (Wasm) environments, and interoperability between them using a Cross-Virtual Machine. Astar Network is friendly to all kinds of developers, and the tools and languages they already know. Backed by the shared security of Polkadot, Astar shines brilliantly on its own within a vibrant and healthy ecosystem, and in the blockchain industry overall driving international corporate adoption, and consumer interest in Web3 technologies.
+
+## Lack of developer incentives
+
+Astar's Build2Earn system is designed to grow the network in an innovative way, while simultaneously rewarding participants and builders. It allows developers to earn incentives for building and maintaining their decentralized applications, and users to earn incentives for supporting their favorite projects, all while encouraging growth of the ecosystem overall.
+
+## Scalability
+
+Blockchains do not scale by design, mostly due to the security assurances inherent in their decentralized consensus mechanisms. If blockchains were faster, they would be less secure. There is an upper limit to the amount of data that can be stored in individual blocks, and at times of network saturation, users of typical blockchains may notice their transactions sitting unconfirmed or in a pending state for long periods of time, resulting in a poor user experience.
+
+The solution to the issue, up until now, has been a patchwork of independent blockchains loosely connected by bridges - often subject to attack due to their reliance on custodial elements, with no common security standards or methods of interoperability between all. The idea of 'cross-chain', therefore, has mostly been to copy and paste a smart contract from one blockchain, to another. Projects that create real value are quickly copied and deployed elsewhere for better, or for worse, with almost no real innovation taking place overall.
+
+Astar Network is changing that, and ushering in the next generation of multichain smart contracts uniquely able to utilize the best features from both EVM and WebAssembly Virtual Machines, and any number of application-specific blockchains across the broader Polkadot ecosystem. All while being future-proof.
+
+## Interoperability
+
+This interoperability framework, empowered by the shared security of Polkadot coupled with Astar XVM, allows developers to use and build smart contracts in ways they never have before. By fostering cooperation and integrations across multiple blockchains and applications, complex synergies can be developed, leading to the realization of truly innovative solutions that can't be replicated in any other environment.
+
+Many different blockchains exist, but few have interoperability as their defining feature. Welcome to Astar Network.
diff --git a/docs/use/polkadot/index.md b/docs/use/polkadot/index.md
new file mode 100644
index 0000000..abc4c04
--- /dev/null
+++ b/docs/use/polkadot/index.md
@@ -0,0 +1,3 @@
+---
+title: Polkadot
+---