diff --git a/netlify.toml b/netlify.toml
index 6aad57fb..021902de 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,43 +1,42 @@
 [[redirects]]
-  from = "/timeline/"
-  to = "/roadmap/"
+from = "/timeline/"
+to = "/roadmap/"
 
-  [[plugins]]
+[[plugins]]
 package = "netlify-plugin-checklinks"
 
-  [plugins.inputs]
-  # An array of glob patterns for pages on your site
-  # Recursive traversal will start from these
-  entryPoints = [
-    "*.html",
-  ]
-
-  # Recurse through all the links and asset references on your page, starting
-  # at the entrypoints
-  recursive = true
-
-  # Checklinks outputs TAP (https://testanything.org/tap-version-13-specification.html)
-  # by default. Enabling pretty mode makes the output easier on the eyes.
-  pretty = true
-
-  # You can mark some check as skipped, which will block checklinks
-  # from ever attempting to execute them.
-  # skipPatterns is an array of strings you can match against failing reports
-  skipPatterns = [
-    "https://riot.im/app/#/room/#safenetwork:matrix.org",
-    "https://twitter.com/safenetworktech",
-    "https://global.bittrex.com/Market/Index?MarketName=BTC-MAID"
-  ]
+[plugins.inputs]
+# An array of glob patterns for pages on your site
+# Recursive traversal will start from these
+entryPoints = ["*.html"]
 
-  # You can mark some check as todo, which will execute the check, but allow failures.
-  # todoPatterns is an array of strings you can match against failing reports
-  todoPatterns = []
+# Recurse through all the links and asset references on your page, starting
+# at the entrypoints
+recursive = true
 
-  # Report on all broken links to external pages.
-  # Enabling this will make your tests more brittle, since you can't control
-  # external pages.
-  checkExternal = true
+# Checklinks outputs TAP (https://testanything.org/tap-version-13-specification.html)
+# by default. Enabling pretty mode makes the output easier on the eyes.
+pretty = true
 
-  # Enable to check references to source maps, source map sources etc.
-  # Many build tools don't emit working references, so this is disabled by default
-  followSourceMaps = false
+# You can mark some check as skipped, which will block checklinks
+# from ever attempting to execute them.
+# skipPatterns is an array of strings you can match against failing reports
+skipPatterns = [
+    "https://riot.im/app/#/room/#safenetwork:matrix.org",
+    "https://twitter.com/safenetworktech",
+    "https://global.bittrex.com/Market/Index?MarketName=BTC-MAID",
+    "https://info.uniswap.org/#/pools/0x35593881b7723b39a5bdbcb421e55c1ff1953f4b",
+]
+
+# You can mark some check as todo, which will execute the check, but allow failures.
+# todoPatterns is an array of strings you can match against failing reports
+todoPatterns = []
+
+# Report on all broken links to external pages.
+# Enabling this will make your tests more brittle, since you can't control
+# external pages.
+checkExternal = true
+
+# Enable to check references to source maps, source map sources etc.
+# Many build tools don't emit working references, so this is disabled by default
+followSourceMaps = false
diff --git a/src/assets/images/exchange_bitmart.png b/src/assets/images/exchange_bitmart.png
new file mode 100644
index 00000000..5b9e92b0
Binary files /dev/null and b/src/assets/images/exchange_bitmart.png differ
diff --git a/src/assets/images/exchange_bittrex.png b/src/assets/images/exchange_bittrex.png
deleted file mode 100644
index 4fb4516b..00000000
Binary files a/src/assets/images/exchange_bittrex.png and /dev/null differ
diff --git a/src/assets/images/exchange_hitbtc.png b/src/assets/images/exchange_hitbtc.png
deleted file mode 100755
index c8258905..00000000
Binary files a/src/assets/images/exchange_hitbtc.png and /dev/null differ
diff --git a/src/assets/images/exchange_p2pb2b.png b/src/assets/images/exchange_p2pb2b.png
deleted file mode 100644
index 1e9d04ce..00000000
Binary files a/src/assets/images/exchange_p2pb2b.png and /dev/null differ
diff --git a/src/assets/images/exchange_uniswap.png b/src/assets/images/exchange_uniswap.png
new file mode 100644
index 00000000..4575151e
Binary files /dev/null and b/src/assets/images/exchange_uniswap.png differ
diff --git a/src/pages/Economy/Economy.js b/src/pages/Economy/Economy.js
index 64cb048d..137452ed 100644
--- a/src/pages/Economy/Economy.js
+++ b/src/pages/Economy/Economy.js
@@ -1,36 +1,32 @@
-import React from 'react'
+import React from "react";
 
-import Button from 'components/Button'
-import TextSnippet from 'components/TextSnippet'
-import UnderlinedLink from 'components/UnderlinedLink'
-import QASection from 'components/QASection'
-import Banner from './Banner'
-import BGVideo from 'components/BGVideo'
-import { prefixClassName, genRandomKey, openLink } from 'utils'
-import content from './content'
-import CONSTANTS from 'constant'
+import Button from "components/Button";
+import TextSnippet from "components/TextSnippet";
+import UnderlinedLink from "components/UnderlinedLink";
+import QASection from "components/QASection";
+import Banner from "./Banner";
+import BGVideo from "components/BGVideo";
+import { prefixClassName, genRandomKey, openLink } from "utils";
+import content from "./content";
+import CONSTANTS from "constant";
 
-import sparkThin2 from 'assets/videos/spark_2_thin.mp4'
-import sparkThin2Web from 'assets/videos/spark_2_thin.webm'
+import sparkThin2 from "assets/videos/spark_2_thin.mp4";
+import sparkThin2Web from "assets/videos/spark_2_thin.webm";
 
-import Bittrex from 'assets/images/exchange_bittrex.png'
-import Hitbtc from 'assets/images/exchange_hitbtc.png'
-import P2PB2B from 'assets/images/exchange_p2pb2b.png'
-import BCBitcoin from 'assets/images/brokers_bcbitcoin.jpg'
+import BitMart from "assets/images/exchange_bitmart.png";
+import UniSwap from "assets/images/exchange_uniswap.png";
 
-import SafeCoinPoster from 'assets/images/earn-poster.jpg'
+import SafeCoinPoster from "assets/images/earn-poster.jpg";
 
-import './safeCoin.sass'
+import "./safeCoin.sass";
 
-const baseClassName = 'SafeCoin'
-const cn = prefixClassName(baseClassName)
+const baseClassName = "SafeCoin";
+const cn = prefixClassName(baseClassName);
 
 const EXCHANGE_IMGS = {
-  Bittrex: Bittrex,
-  HitBTC: Hitbtc,
-  P2PB2B: P2PB2B,
-  BCBitcoin: BCBitcoin
-}
+  BitMart: BitMart,
+  UniSwap: UniSwap,
+};
 
 const SafeCoin = () => {
   const {
@@ -43,92 +39,124 @@ const SafeCoin = () => {
     textBlock6,
     exchanges,
     faqs,
-    video
-  } = content
+    video,
+  } = content;
 
-  const { sections: faqSections = [] } = faqs
+  const { sections: faqSections = [] } = faqs;
 
   return (
     <section className={baseClassName}>
-      <div className={cn('wrap')}>
+      <div className={cn("wrap")}>
         <Banner content={banner} />
-        <div className={cn('textBlocks')}>
-          <div className={cn('textBlocksWrap')}>
-            <div className={cn('video')}>
+        <div className={cn("textBlocks")}>
+          <div className={cn("textBlocksWrap")}>
+            <div className={cn("video")}>
               <figure>
                 <video
                   tabIndex="-1"
                   poster={SafeCoinPoster}
-                  controls="controls">
-                  <source src={CONSTANTS.videoLinks.security.mp4} type="video/mp4" />
-                  <source src={CONSTANTS.videoLinks.security.ogv} type="video/ogg" />
-                  <source src={CONSTANTS.videoLinks.security.webm} type="video/webm" />
+                  controls="controls"
+                >
+                  <source
+                    src={CONSTANTS.videoLinks.security.mp4}
+                    type="video/mp4"
+                  />
+                  <source
+                    src={CONSTANTS.videoLinks.security.ogv}
+                    type="video/ogg"
+                  />
+                  <source
+                    src={CONSTANTS.videoLinks.security.webm}
+                    type="video/webm"
+                  />
                 </video>
                 <figcaption>{video.caption}</figcaption>
               </figure>
             </div>
-            <div className={cn('textBlock1')}>
-              <TextSnippet title={textBlock1.title} titleSize="H2" text={textBlock1.para} />
+            <div className={cn("textBlock1")}>
+              <TextSnippet
+                title={textBlock1.title}
+                titleSize="H2"
+                text={textBlock1.para}
+              />
             </div>
-            <div className={cn('textBlock2')}>
-              <TextSnippet title={textBlock2.title} titleSize="H2" text={textBlock2.para} />
+            <div className={cn("textBlock2")}>
+              <TextSnippet
+                title={textBlock2.title}
+                titleSize="H2"
+                text={textBlock2.para}
+              />
               <div className="CTA">
-                <Button className="icon external" onClick={() => {
-                  openLink(textBlock2.CTA.url, true)
-                }}>{textBlock2.CTA.name}</Button>
+                <Button
+                  className="icon external"
+                  onClick={() => {
+                    openLink(textBlock2.CTA.url, true);
+                  }}
+                >
+                  {textBlock2.CTA.name}
+                </Button>
               </div>
             </div>
-            <div className={cn('textBlock3')}>
+            <div className={cn("textBlock3")}>
               <TextSnippet title={textBlock3.title} text={textBlock3.para} />
             </div>
-            <div className={cn('textBlock4')}>
+            <div className={cn("textBlock4")}>
               <TextSnippet title={textBlock4.title} text={textBlock4.para} />
-              <UnderlinedLink url={textBlock4.CTA.url}>{textBlock4.CTA.name}</UnderlinedLink>
+              <UnderlinedLink url={textBlock4.CTA.url}>
+                {textBlock4.CTA.name}
+              </UnderlinedLink>
             </div>
-            <div className={cn('textBlock5')}>
-              <TextSnippet title={textBlock5.title} titleSize="H2" text={textBlock5.para} />
+            <div className={cn("textBlock5")}>
+              <TextSnippet
+                title={textBlock5.title}
+                titleSize="H2"
+                text={textBlock5.para}
+              />
             </div>
-            <div className={cn('textBlock6')}>
+            <div className={cn("textBlock6")}>
               <TextSnippet title={textBlock6.title} text={textBlock6.para} />
-              <div className={cn('exchange')}>
-                  {
-                    exchanges.map(ex => (
-                      <div key={genRandomKey()} className={cn('exchangeItem')}>
-                        <figure>
-                          <a href={ex.url} target="_blank" rel="noreferrer">
-                            <img src={EXCHANGE_IMGS[ex.name]} />
-                            <figcaption>{ex.name}</figcaption>
-                          </a>
-                        </figure>
-                      </div>
-                    ))
-                  }
+              <div className={cn("exchange")}>
+                {exchanges.map((ex) => (
+                  <div key={genRandomKey()} className={cn("exchangeItem")}>
+                    <figure>
+                      <a href={ex.url} target="_blank" rel="noreferrer">
+                        <img src={EXCHANGE_IMGS[ex.name]} />
+                        <figcaption>{ex.name}</figcaption>
+                      </a>
+                    </figure>
+                  </div>
+                ))}
               </div>
             </div>
-            <div className={cn('faq')}>
-              <div className={cn('faqWrap')}>
-                {
-                  faqSections.map(section => <QASection key={genRandomKey()} content={section} />)
-                }
-                <div className={cn('more')}>
-                  <div className={cn('cta')}>
-                    <Button className="hollow" onClick={() => {
-                      openLink(faqs.CTA.url)
-                    }}>{faqs.CTA.name}</Button>
+            <div className={cn("faq")}>
+              <div className={cn("faqWrap")}>
+                {faqSections.map((section) => (
+                  <QASection key={genRandomKey()} content={section} />
+                ))}
+                <div className={cn("more")}>
+                  <div className={cn("cta")}>
+                    <Button
+                      className="hollow"
+                      onClick={() => {
+                        openLink(faqs.CTA.url);
+                      }}
+                    >
+                      {faqs.CTA.name}
+                    </Button>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-          <div className={cn('bgVideo')}>
-            <BGVideo src={sparkThin2} webmSrc={sparkThin2Web} height={'30px'} />
+          <div className={cn("bgVideo")}>
+            <BGVideo src={sparkThin2} webmSrc={sparkThin2Web} height={"30px"} />
           </div>
-          <div className={cn('bgDark')}></div>
-          <div className={cn('buySafeCoinBg')}></div>
+          <div className={cn("bgDark")}></div>
+          <div className={cn("buySafeCoinBg")}></div>
         </div>
       </div>
     </section>
-  )
-}
+  );
+};
 
-export default SafeCoin
+export default SafeCoin;
diff --git a/src/pages/Economy/content.js b/src/pages/Economy/content.js
index b86ea1ce..3bcfd796 100644
--- a/src/pages/Economy/content.js
+++ b/src/pages/Economy/content.js
@@ -47,33 +47,24 @@ export default {
     title: "How do I buy Safe Network Tokens?",
     para: [
       "Safe Network Tokens are the currency that will power the Safe Network. They will be available to be farmed, used or traded. You can’t buy them yet, but you can buy MaidSafeCoin.",
-      "MaidSafeCoin (MAID) is a token that was created in a crowdsale in 2014 to support the project, and each MAID will be able to be exchanged for a Safe Network Token when the Network launches. Based on the Omni protocol on top of the Bitcoin blockchain, MAID can be purchased and traded, but not farmed.",
+      "MaidSafeCoin is a token that was created in a crowdsale in 2014 to support the project, and each coin will be able to be exchanged for a Safe Network Token when the Network launches.",
+      "MaidSafeCoin was originally on the Omni protocol (MAID) but is now available as an ERC20 token [(EMAID)](https://coinmarketcap.com/currencies/maidsafecoin-/).",
     ],
   },
   textBlock6: {
-    title: "Buying MaidSafeCoin",
+    title: "Buying MaidSafeCoin (EMAID)",
     para: [
-      "MaidSafeCoin can be bought and traded at these brokers and exchanges.",
-      "Note: These online brokers and exchanges are not owned or maintained by MaidSafe. While we are satisfied they are trustworthy, reliable services, please use at your own risk.",
-      "MAID is based on the Omni protocol and there are no hard wallet options at this stage, so whilst you’re waiting to convert MAID to Safe Network Tokens at the launch of the Network, we’d always recommend that you store your coins in cold storage.",
+      "MaidSafeCoin (EMAID) is available on the [Bitmart](https://www.bitmart.com/trade/en-US?symbol=EMAID_USDT) exchange and on [UniSwap V3](https://info.uniswap.org/#/pools/0x35593881b7723b39a5bdbcb421e55c1ff1953f4b)",
     ],
   },
   exchanges: [
     {
-      name: "Bittrex",
-      url: "https://global.bittrex.com/Market/Index?MarketName=BTC-MAID",
+      name: "bitmart",
+      url: "https://www.bitmart.com/trade/en-US?symbol=EMAID_USDT",
     },
     {
-      name: "HitBTC",
-      url: "https://hitbtc.com/MAID-to-BTC",
-    },
-    {
-      name: "P2PB2B",
-      url: "https://p2pb2b.com/trade/MAID_BTC/",
-    },
-    {
-      name: "BCBitcoin",
-      url: "https://www.bcbitcoin.co.uk/buy/?coin=MAID",
+      name: "uniswap",
+      url: "https://info.uniswap.org/#/pools/0x35593881b7723b39a5bdbcb421e55c1ff1953f4b",
     },
   ],
   faqs: {
@@ -81,51 +72,32 @@ export default {
       {
         title: "Safe Network Tokens: Frequently Asked Questions",
         items: [
-          {
-            question: "What are Safe Network Tokens?",
-            answer: [
-              `Safe Network Tokens are digital tokens that are generated automatically by the Safe Network and reside on the Safe Network. The Network will autonomously confirm account balances to wallets and allow transactions to take place. Safe Network Tokens are transferred using the digital signature of the coin’s last owner. This operation is 'network atomic'—in other words, the Network ensures that all copies update to reflect the transaction. This is a different approach to the blockchain mechanism employed in other projects, such as Bitcoin.`,
-              "There can be many millions of transactions per second on the Safe Network and the larger it becomes the more transactions per second can be executed. A Safe Network Token only records the previous and current owners. By doing so, it ensures that the current owner was transferred ownership properly by the last owner. This allows coins to be transferred between people very easily and without delay.",
-              "Please note that Safe Network Tokens will not be active until the network goes live. See MaidSafeCoin for current proxy token.",
-            ],
-          },
-          {
-            question: "How are Safe Network Tokens used on the Network?",
-            answer: [
-              "Safe Network Tokens are the currency of the Safe Network. They are an incentive mechanism that rewards Users and developers, as well as providing access to network services.",
-              "Without any human intervention, the Safe Network pays out Tokens automatically to Farmers (users who join the Network by contributing their computing resources) and to Builders (application developers, who get paid automatically depending on how much their applications are used).",
-              "In addition, Core Developers who improve the core Safe Network codebase can also earn Tokens by providing bug fixes and new features.",
-              `Safe Network Tokens only live on the Safe Network. They are stored in a User's wallet and can be used to buy network services, such as increased storage space and access to network applications. There is no set distribution time for the 4.3 billion Tokens produced during the life of the Network.`,
-              "Please note that Safe Network Tokens will not be active until the network goes live.",
-            ],
-          },
           {
             question: "How do I buy Safe Network Tokens?",
             answer: [
-              "Safe Network Tokens won’t be issued until the Network goes live so they cannot be purchased at the moment. Currently you can buy MaidSafeCoin which will be able to be swapped on a 1-to-1 basis for Safe Network Tokens when the Network is launched.",
+              `Safe Network Tokens won’t be issued until the Network goes live so they cannot be purchased at the moment. Currently you can buy MaidSafeCoin which will be swapped on a 1-to-1 basis for Safe Network Tokens when released.`,
+              "You can buy MaidSafeCoin from:",
+              "[Bitmart](https://www.bitmart.com/trade/en-US?symbol=EMAID_USDT)",
+              "[UniSwap V3](https://info.uniswap.org/#/pools/0x35593881b7723b39a5bdbcb421e55c1ff1953f4b)",
             ],
           },
           {
             question: "What is MaidSafeCoin?",
             answer: [
-              `MaidSafeCoin is a proxy token that was released during MaidSafe's crowd sale and will be able to be swapped for Safe Network Tokens on a 1:1 basis when the Network is launched. MaidSafeCoin is listed on the Bitcoin blockchain and can be purchased on a number of exchanges and brokers including:`,
-              "- [Bittrex](https://global.bittrex.com/Market/Index?MarketName=BTC-MAID)\n- [HitBTC](https://hitbtc.com/MAID-to-BTC)\n- [P2PB2B](https://p2pb2b.com/trade/MAID_BTC/)\n- [BC Bitcoin](https://www.bcbitcoin.co.uk/buy/?coin=MAID)",
+              "MaidSafeCoin (EMAID) is a proxy token that supports the development of the Safe Network and allows pre-purchase of its native currency: Safe Network Tokens. ",
+              "After the Network is launched, MaidSafeCoins can be swapped 1-for-1 with Safe Network Tokens.",
+              "MaidSafeCoin was originally launched on the Omni protocol (MAID) but is now available as an ERC20 token: EMAID. You buy it from Bitmart and on UniSwap V3",
             ],
           },
           {
             question: "How do I buy MaidSafeCoin?",
             answer: [
-              "In essence all we have to do is buy bitcoin and exchange it for MaidSafeCoin. There are a few simple steps required to do this.",
-              "- Create an [OmniWallet](https://www.omniwallet.org/).\n- Purchase bitcoin using your preferred vendor.\n- Create a trade account on an exchange or brokers which lists MaidSafeCoin (e.g. on [Bittrex](https://global.bittrex.com/Market/Index?MarketName=BTC-MAID)).\n- Send bitcoin to the trading account.\n- Trade bitcoin for MaidSafeCoin.\n- Withdraw / Transfer to OmniWallet.\n- MaidSafeCoin is now in your OmniWallet!",
-            ],
-          },
-          {
-            question: "Where can I store MaidSafeCoin?",
-            answer: [
-              "As MaidSafeCoin is built using the Omni protocol on the Bitcoin blockchain, it can be stored in any wallet. They may not be visible within all wallet software (due to lack of Omni support) but the MaidSafeCoin will be OK there as long as your machine and private key for that address are secure. You will be able to view them using [omniexplorer.info](https://omniexplorer.info).",
-              "To create a new Omniwallet or open an existing one visit [omniwallet.org](https://www.omniwallet.org/).",
+              "You can buy MaidSafeCoin from:",
+              "[Bitmart](https://www.bitmart.com/trade/en-US?symbol=EMAID_USDT)",
+              "[UniSwap V3](https://info.uniswap.org/#/pools/0x35593881b7723b39a5bdbcb421e55c1ff1953f4b)",
             ],
           },
+
           {
             question: "What is Farming?",
             answer: [