diff --git a/core-concepts/fees.md b/core-concepts/fees.md
index 5bc51034..aa16b8f6 100644
--- a/core-concepts/fees.md
+++ b/core-concepts/fees.md
@@ -3,28 +3,29 @@ title: Fees
 description: The Ocean Protocol defines various fees for creating a sustainability loop.
 ---
 
-## Path to sustainability
+# Fees
+
+### Path to sustainability
 
 Ocean Protocol achieves sustainability via the [Web3 sustainability loop](https://blog.oceanprotocol.com/the-web3-sustainability-loop-b2a4097a36e).
 
-- The project grows and improves through the efforts of OceanDAO grant recipients.
-- The OceanDAO votes to decide which proposals receive grants.
-- Grant funds are sourced from the Ocean Protocol community treasury.
-- The Ocean Protocol community collects fees when users interact with the protocol, thus completing the sustainability loop.
+* The project grows and improves through the efforts of OceanDAO grant recipients.
+* The OceanDAO votes to decide which proposals receive grants.
+* Grant funds are sourced from the Ocean Protocol community treasury.
+* The Ocean Protocol community collects fees when users interact with the protocol, thus completing the sustainability loop.
 
-## Fee types
+### Fee types
 
-### Swap fee
+#### Swap fee
 
-Swap fees are collected whenever someone swaps a datatoken for base token (e.g., OCEAN) or base token for a datatoken. The swap can be conducted using a a fixed-rate exchange.
-These are the fees that are applied whenever a user swaps base token or datatoken:
+Swap fees are collected whenever someone swaps a datatoken for base token (e.g., OCEAN) or base token for a datatoken. The swap can be conducted using a a fixed-rate exchange. These are the fees that are applied whenever a user swaps base token or datatoken:
 
-- Publisher Marketplace swap fee
-- Consumer Marketplace swap fee
-- Provider Consumption Fees
-- [Ocean Community Fee](#ocean-community-fee)
+* Publisher Marketplace swap fee
+* Consumer Marketplace swap fee
+* Provider Consumption Fees
+* [Ocean Community Fee](fees.md#ocean-community-fee)
 
-### Publish fee
+#### Publish fee
 
 Publish fees can be charged to a publisher when they publish an asset.
 
@@ -32,18 +33,18 @@ Currently, the Ocean marketplace does not charge a publishing fee. Custom market
 
 Based on the use case of the marketplace, the marketplace owner can decide if this fee should be charged or not.
 
-### Consume fee
+#### Consume fee
 
 Consume fees (aka. Order fees) are charged when a user holding a datatoken exchanges it for the right to download an asset or to start a compute job that uses the asset.
 
 These are the fees that are applied whenever a user pays to access an asset:
 
-- Consume Market Consumption Fee
-- Publisher Market Consumption Fee
-- Provider Consumption Fees
-- [Ocean Community Fee](#ocean-community-fee)
+* Consume Market Consumption Fee
+* Publisher Market Consumption Fee
+* Provider Consumption Fees
+* [Ocean Community Fee](fees.md#ocean-community-fee)
 
-### Ocean Community fee
+#### Ocean Community fee
 
 Ocean's smart contracts collect **Ocean Community fees** during swap and order operations. These fees are reinvested in community projects via OceanDAO and other initiatives.
 
@@ -51,7 +52,7 @@ For swaps involving approved base tokens like OCEAN and H2O, the Ocean Community
 
 These fees can be updated by the Ocean Protocol Foundation.
 
-### Provider fee
+#### Provider fee
 
 Provider is a component of Ocean Protocol's ecosystem that facilitates data consumption, starts compute jobs, encrypts DDOs, and decrypts DDOs. Provider also validates if the user can access a particular data asset or service. To learn more about Provider, click [here](https://github.com/oceanprotocol/provider).
 
@@ -61,31 +62,44 @@ Provider fees can also be used to charge for computing resources. Based on the c
 
 These fees incentivize individuals and organizations to run their provider instances and charge consumers according to resource usage.
 
-## Fee values
+### Fee values
 
 The table is periodically updated. Users are advised to confirm new values through the [contracts](https://github.com/oceanprotocol/contracts) and the [market](https://github.com/oceanprotocol/market).
 
-| Swap Fees                                                      | Value in Ocean Market, using any Provider | Value in Other Markets                                                                                                                            |
-| :------------------------------------------------------------- | :---------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------ |
-| publishMarket: FixedRate                                       |                    0%                     | Set in the market config, by the publishing market.<br>Min = 0.001%<br>Max = 50%                                                                  |
-| consumeMarket: FixedRate<br>ERC20Template                      |                    0%                     | 0%                                                                                                                                                |
-| consumeMarket: FixedRate<br>EnterpriseTemplate                 |                    0%                     | Set in market config, by the consuming market.                                                                                                    |
-| Ocean Community: FixedRate<br>OCEAN, H2O as base token |                   0.1%                    | 0.1%                                                                                                                                              |
-| Ocean Community: FixedRate<br>other base token         |                   0.2%                    | 0.2%                                                                                                                                              |
-| <b>Publish Fees</b>                                            |                    0%                     | 0%                                                                                                                                                |
-| <b>Order Fees <br>1 datatoken available to get dataset acces   |                                           |                                                                                                                                                   |
-| publishMarket<br>Absolute value, in any token. E.g. 5 USDT     |                     0                     | Set in market config, by the publishing market.                                                                                                   |
-| consumeMarket<br>Absolute value, in any token. E.g. 2 DAI      |                     0                     | Set in market config, by the consuming market.                                                                                                    |
-| Ocean Community<br>Fixed price in DT                           |                  0.03 DT                  | 0.03 DT                                                                                                                                           |
+#### Swap fees
 
-| Ocean Provider Fees                                         |      OPF Provider      | 3rd party Provider             |
-| :---------------------------------------------------------- | :--------------------: | :----------------------------- |
-| Token in which fee is charged: `PROVIDER_FEE_TOKEN`         |         OCEAN          | E.g. USDC                      |
-| Download: `COST_PER_MB`                                     |           0            | Set in Provider envvars.       |
-| Compute: `COST_PER_MIN`<br> Environment: 1 CPU, 60 secs max |           0            | Set in OperatorEngine envvars. |
-| Compute: `COST_PER_MIN`<br> Environment: 1 CPU, 1 hour max  |     1.0 OCEAN/min      | Set in OperatorEngine envvars. |
-| Ocean Community                                             | 0% of the Provider fee | 0% of the Provider fee         |
+| Market/Type                                                   | Value in Ocean Market, using any Provider | Value in Other Markets                                                                  |
+| ------------------------------------------------------------- | ----------------------------------------- | --------------------------------------------------------------------------------------- |
+| publishMarket: FixedRate                                      | 0%                                        | <p>Set in the market config, by the publishing market.<br>Min = 0.001%<br>Max = 50%</p> |
+| <p>consumeMarket: FixedRate<br>ERC20Template</p>              | 0%                                        | 0%                                                                                      |
+| <p>consumeMarket: FixedRate<br>EnterpriseTemplate</p>         | 0%                                        | Set in market config, by the consuming market.                                          |
+| <p>Ocean Community: FixedRate<br>OCEAN, H2O as base token</p> | 0.1%                                      | 0.1%                                                                                    |
+| <p>Ocean Community: FixedRate<br>other base token</p>         | 0.2%                                      | 0.2%                                                                                    |
 
-## Further reading
+#### Publish fees
 
-- [The Web3 Sustainability Loop](https://blog.oceanprotocol.com/the-web3-sustainability-loop-b2a4097a36e)
+| Market/Type | Value in Ocean Market, using any Provider | Value in Other Markets |
+| ----------- | ----------------------------------------- | ---------------------- |
+| -           | 0%                                        | 0%                     |
+
+#### Order fees (1 DT)
+
+| Market/Type                                                       | Value in Ocean Market, using any Provider | Value in Other Markets                          |
+| ----------------------------------------------------------------- | ----------------------------------------- | ----------------------------------------------- |
+| <p>publishMarket<br>Absolute value, in any token. E.g. 5 USDT</p> | 0                                         | Set in market config, by the publishing market. |
+| <p>consumeMarket<br>Absolute value, in any token. E.g. 2 DAI</p>  | 0                                         | Set in market config, by the consuming market.  |
+| <p>Ocean Community<br>Fixed price in DT</p>                       | 0.03 DT                                   | 0.03 DT                                         |
+
+#### Ocean Provider fees
+
+| Type                                                                         |      OPF Provider      | 3rd party Provider             |
+| ---------------------------------------------------------------------------- | :--------------------: | ------------------------------ |
+| Token in which fee is charged: `PROVIDER_FEE_TOKEN`                          |          OCEAN         | E.g. USDC                      |
+| Download: `COST_PER_MB`                                                      |            0           | Set in Provider envvars.       |
+| <p>Compute: <code>COST_PER_MIN</code><br>Environment: 1 CPU, 60 secs max</p> |            0           | Set in OperatorEngine envvars. |
+| <p>Compute: <code>COST_PER_MIN</code><br>Environment: 1 CPU, 1 hour max</p>  |      1.0 OCEAN/min     | Set in OperatorEngine envvars. |
+| Ocean Community                                                              | 0% of the Provider fee | 0% of the Provider fee         |
+
+### Further reading
+
+* [The Web3 Sustainability Loop](https://blog.oceanprotocol.com/the-web3-sustainability-loop-b2a4097a36e)