diff --git a/content/price.json b/content/price.json
index 7c00d61a9..9ae6f8acc 100644
--- a/content/price.json
+++ b/content/price.json
@@ -47,5 +47,9 @@
       },
       "action": "Approve & Remove"
     }
+  },
+  "trade": {
+    "action": "Approve & Swap",
+    "warning": "Use at your own risk. Please familiarize yourself [with the risks](https://blog.oceanprotocol.com/on-staking-on-data-in-ocean-market-3d8e09eb0a13) and the [Terms of Use](/terms)."
   }
 }
diff --git a/package-lock.json b/package-lock.json
index 42f512d17..ff928b066 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3550,9 +3550,9 @@
       "integrity": "sha512-p0oOHXr60hXZuLNsQ/PsOQtCfia79thm7MjPxTrnnBvD+csJoHzARYMB0IFj/KTw6U5vLXODgjJAn8x6QksLwg=="
     },
     "@oceanprotocol/lib": {
-      "version": "0.9.12",
-      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.9.12.tgz",
-      "integrity": "sha512-R52kWSwwpKNzNHfnNbF6seFPvXEtExK3bWIi4V4eIkgmAf272sa6PVza4mJrtEpTAS1WcJv5ihF7cczIDecxbg==",
+      "version": "0.9.14",
+      "resolved": "https://registry.npmjs.org/@oceanprotocol/lib/-/lib-0.9.14.tgz",
+      "integrity": "sha512-UDJpDHqJ5o6O/cOdTuyxhABaebQM1vz+RyfC3zVRSdz5Ke/5xjAChk+3LlYbXBA8VaacxioYa4OlaJLE5uB+Qg==",
       "requires": {
         "@ethereum-navigator/navigator": "^0.5.0",
         "@oceanprotocol/contracts": "^0.5.7",
diff --git a/package.json b/package.json
index 7cec6146b..db1f92f33 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "@coingecko/cryptoformat": "^0.4.2",
     "@loadable/component": "^5.14.1",
     "@oceanprotocol/art": "^3.0.0",
-    "@oceanprotocol/lib": "^0.9.12",
+    "@oceanprotocol/lib": "^0.9.14",
     "@oceanprotocol/list-datapartners": "^1.0.3",
     "@oceanprotocol/react": "^0.3.19",
     "@oceanprotocol/typographies": "^0.1.0",
diff --git a/src/@types/TokenBalance.d.ts b/src/@types/TokenBalance.d.ts
new file mode 100644
index 000000000..1feb8c8df
--- /dev/null
+++ b/src/@types/TokenBalance.d.ts
@@ -0,0 +1,4 @@
+export default interface TokenBalance {
+  ocean: number
+  datatoken: number
+}
diff --git a/src/components/atoms/Input/InputElement.module.css b/src/components/atoms/Input/InputElement.module.css
index a85223765..3fd57b9b0 100644
--- a/src/components/atoms/Input/InputElement.module.css
+++ b/src/components/atoms/Input/InputElement.module.css
@@ -26,7 +26,7 @@
 .input::placeholder {
   font-family: var(--font-family-base);
   font-size: var(--font-size-base);
-  color: var(--brand-grey-light);
+  color: var(--color-secondary);
   font-weight: var(--font-weight-base);
   transition: 0.2s ease-out;
   opacity: 0.7;
@@ -167,6 +167,7 @@
 .postfixGroup {
   display: inline-flex;
   align-items: center;
+  width: 100%;
 }
 
 .prefixGroup input {
@@ -259,6 +260,31 @@ input[type='range']::-moz-range-track {
 
 /* Size modifiers */
 
+.mini,
+.select.mini {
+  font-size: var(--font-size-mini);
+  height: 24px;
+  padding: calc(var(--spacer) / 8);
+}
+
+.mini::placeholder {
+  font-size: var(--font-size-mini);
+}
+
+.prefix.mini,
+.postfix.mini {
+  height: 24px;
+  font-size: var(--font-size-mini);
+}
+
+.select.mini {
+  padding-right: 2rem;
+
+  /* custom arrow */
+  background-position: calc(100% - 14px) 0.6rem, calc(100% - 9px) 0.6rem, 100% 0;
+  background-size: 5px 5px, 5px 5px, 1.75rem 3rem;
+}
+
 .small,
 .select.small {
   font-size: var(--font-size-small);
diff --git a/src/components/atoms/Input/InputElement.tsx b/src/components/atoms/Input/InputElement.tsx
index f44a185f1..d136e22e4 100644
--- a/src/components/atoms/Input/InputElement.tsx
+++ b/src/components/atoms/Input/InputElement.tsx
@@ -26,6 +26,7 @@ const DefaultInput = ({
 export default function InputElement({
   type,
   options,
+  sortOptions,
   name,
   prefix,
   postfix,
@@ -40,22 +41,25 @@ export default function InputElement({
   const styleClasses = cx({ select: true, [size]: size })
 
   switch (type) {
-    case 'select':
+    case 'select': {
+      const sortedOptions =
+        !sortOptions && sortOptions === false
+          ? options
+          : options.sort((a: string, b: string) => a.localeCompare(b))
       return (
         <select id={name} className={styleClasses} {...props}>
           {field !== undefined && field.value === '' && (
             <option value="">---</option>
           )}
-          {options &&
-            options
-              .sort((a: string, b: string) => a.localeCompare(b))
-              .map((option: string, index: number) => (
-                <option key={index} value={option}>
-                  {option}
-                </option>
-              ))}
+          {sortedOptions &&
+            sortedOptions.map((option: string, index: number) => (
+              <option key={index} value={option}>
+                {option} {postfix}
+              </option>
+            ))}
         </select>
       )
+    }
     case 'textarea':
       return (
         <textarea
diff --git a/src/components/atoms/Input/index.tsx b/src/components/atoms/Input/index.tsx
index de263bb11..85d5ca3c5 100644
--- a/src/components/atoms/Input/index.tsx
+++ b/src/components/atoms/Input/index.tsx
@@ -17,6 +17,7 @@ export interface InputProps {
   tag?: string
   type?: string
   options?: string[]
+  sortOptions?: boolean
   additionalComponent?: ReactElement
   value?: string
   onChange?(
@@ -39,7 +40,7 @@ export interface InputProps {
   postfix?: string | ReactElement
   step?: string
   defaultChecked?: boolean
-  size?: 'small' | 'large' | 'default'
+  size?: 'mini' | 'small' | 'large' | 'default'
 }
 
 export default function Input(props: Partial<InputProps>): ReactElement {
diff --git a/src/components/atoms/Tabs.module.css b/src/components/atoms/Tabs.module.css
index bcd8c55a6..1495753a1 100644
--- a/src/components/atoms/Tabs.module.css
+++ b/src/components/atoms/Tabs.module.css
@@ -8,17 +8,30 @@
 .tab {
   display: inline-block;
   padding: calc(var(--spacer) / 12) var(--spacer);
-  border-radius: var(--border-radius);
   font-weight: var(--font-weight-bold);
   font-size: var(--font-size-small);
   text-transform: uppercase;
   cursor: pointer;
   color: var(--color-secondary);
+  border: 1px solid var(--border-color);
+  margin-right: -1px;
+  min-width: 100px;
+}
+
+.tab:first-child {
+  border-top-left-radius: var(--border-radius);
+  border-bottom-left-radius: var(--border-radius);
+}
+
+.tab:last-child {
+  border-top-right-radius: var(--border-radius);
+  border-bottom-right-radius: var(--border-radius);
 }
 
 .tab[aria-selected='true'] {
   background: var(--font-color-heading);
   color: var(--background-body);
+  border-color: var(--font-color-heading);
 }
 
 .tabContent {
diff --git a/src/components/atoms/UserLiquidity.module.css b/src/components/atoms/UserLiquidity.module.css
new file mode 100644
index 000000000..0e7c5763f
--- /dev/null
+++ b/src/components/atoms/UserLiquidity.module.css
@@ -0,0 +1,12 @@
+.userLiquidity > div {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-size: var(--font-size-mini);
+  color: var(--color-secondary);
+}
+
+.userLiquidity span + div {
+  transform: scale(0.8);
+  transform-origin: right center;
+}
diff --git a/src/components/atoms/UserLiquidity.tsx b/src/components/atoms/UserLiquidity.tsx
new file mode 100644
index 000000000..abecac911
--- /dev/null
+++ b/src/components/atoms/UserLiquidity.tsx
@@ -0,0 +1,51 @@
+import React, { ReactElement } from 'react'
+import PriceUnit from './Price/PriceUnit'
+import styles from './UserLiquidity.module.css'
+
+function UserLiquidityLine({
+  title,
+  amount,
+  symbol
+}: {
+  title: string
+  amount: string
+  symbol: string
+}) {
+  return (
+    <div>
+      <span>{title}</span>
+      <PriceUnit price={amount} symbol={symbol} small />
+    </div>
+  )
+}
+
+export default function UserLiquidity({
+  amount,
+  symbol,
+  amountMax,
+  titleAvailable = 'Balance',
+  titleMaximum = 'Maximum'
+}: {
+  amount: string
+  symbol: string
+  titleAvailable?: string
+  titleMaximum?: string
+  amountMax?: string
+}): ReactElement {
+  return (
+    <div className={styles.userLiquidity}>
+      <UserLiquidityLine
+        title={titleAvailable}
+        amount={amount}
+        symbol={symbol}
+      />
+      {amountMax && (
+        <UserLiquidityLine
+          title={titleMaximum}
+          amount={amountMax}
+          symbol={symbol}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/src/components/molecules/PoolTransactions.tsx b/src/components/molecules/PoolTransactions.tsx
index 05681397c..8f9648b66 100644
--- a/src/components/molecules/PoolTransactions.tsx
+++ b/src/components/molecules/PoolTransactions.tsx
@@ -20,13 +20,19 @@ function Title({ row }: { row: PoolTransaction }) {
   const [dtSymbol, setDtSymbol] = useState<string>()
   const { locale } = useUserPreferences()
 
-  const title = row.tokenAmountIn
-    ? `Add ${formatNumber(Number(row.tokenAmountIn), locale)} ${
-        dtSymbol || 'OCEAN'
-      }`
-    : `Remove ${formatNumber(Number(row.tokenAmountOut), locale)} ${
-        dtSymbol || 'OCEAN'
-      }`
+  const symbol = dtSymbol || 'OCEAN'
+  const title =
+    row.type === 'join'
+      ? `Add ${formatNumber(Number(row.tokenAmountIn), locale)} ${symbol}`
+      : row.type === 'exit'
+      ? `Remove ${formatNumber(Number(row.tokenAmountOut), locale)} ${symbol}`
+      : `Swap ${formatNumber(
+          Number(row.tokenAmountIn),
+          locale
+        )} ${symbol} for ${formatNumber(
+          Number(row.tokenAmountOut),
+          locale
+        )} ${symbol}`
 
   useEffect(() => {
     if (!ocean) return
diff --git a/src/components/organisms/AssetActions/Compute.module.css b/src/components/organisms/AssetActions/Compute.module.css
index 0dfc017df..1d0f9a2e2 100644
--- a/src/components/organisms/AssetActions/Compute.module.css
+++ b/src/components/organisms/AssetActions/Compute.module.css
@@ -23,6 +23,6 @@
   width: 100%;
 }
 
-.hasTokens {
-  composes: hasTokens from './index.module.css';
+.help {
+  composes: help from './index.module.css';
 }
diff --git a/src/components/organisms/AssetActions/Consume.module.css b/src/components/organisms/AssetActions/Consume.module.css
index ca82f760a..56f289c9a 100644
--- a/src/components/organisms/AssetActions/Consume.module.css
+++ b/src/components/organisms/AssetActions/Consume.module.css
@@ -17,8 +17,8 @@
   margin-top: calc(var(--spacer) / 2);
 }
 
-.hasTokens {
-  composes: hasTokens from './index.module.css';
+.help {
+  composes: help from './index.module.css';
 }
 
 .feedback {
diff --git a/src/components/organisms/AssetActions/Consume.tsx b/src/components/organisms/AssetActions/Consume.tsx
index 7e4626d2f..8bdfb6c69 100644
--- a/src/components/organisms/AssetActions/Consume.tsx
+++ b/src/components/organisms/AssetActions/Consume.tsx
@@ -94,9 +94,23 @@ export default function Consume({
       {consumeStepText || pricingIsLoading ? (
         <Loader message={consumeStepText || pricingStepText} />
       ) : (
-        <Button style="primary" onClick={handleConsume} disabled={isDisabled}>
-          {hasDatatoken || hasPreviousOrder ? 'Download' : 'Buy'}
-        </Button>
+        <>
+          <Button style="primary" onClick={handleConsume} disabled={isDisabled}>
+            {hasDatatoken || hasPreviousOrder ? 'Download' : 'Buy'}
+          </Button>
+          {hasDatatoken && (
+            <div className={styles.help}>
+              You own {dtBalance} {dtSymbol} allowing you to use this data set
+              without paying again.
+            </div>
+          )}
+          {(!hasDatatoken || !hasPreviousOrder) && (
+            <div className={styles.help}>
+              For using this data set, you will buy 1 {dtSymbol} and immediatly
+              spend it back to the publisher and pool.
+            </div>
+          )}
+        </>
       )}
     </div>
   )
@@ -109,12 +123,6 @@ export default function Consume({
         </div>
         <div className={styles.pricewrapper}>
           <Price ddo={ddo} conversion />
-          {hasDatatoken && (
-            <div className={styles.hasTokens}>
-              You own {dtBalance} {dtSymbol} allowing you to use this data set
-              without paying again.
-            </div>
-          )}
           {!isInPurgatory && <PurchaseButton />}
         </div>
       </div>
diff --git a/src/components/organisms/AssetActions/Pool/Actions.module.css b/src/components/organisms/AssetActions/Pool/Actions.module.css
index fe7922ad9..e76c4fb64 100644
--- a/src/components/organisms/AssetActions/Pool/Actions.module.css
+++ b/src/components/organisms/AssetActions/Pool/Actions.module.css
@@ -3,7 +3,6 @@
   margin-right: -2rem;
   padding-left: var(--spacer);
   padding-right: var(--spacer);
-  margin-top: calc(var(--spacer) / 4);
   padding-top: calc(var(--spacer) / 1.5);
   border-top: 1px solid var(--border-color);
   text-align: center;
diff --git a/src/components/organisms/AssetActions/Pool/Actions.tsx b/src/components/organisms/AssetActions/Pool/Actions.tsx
index 66eb7f53a..ff78f4b40 100644
--- a/src/components/organisms/AssetActions/Pool/Actions.tsx
+++ b/src/components/organisms/AssetActions/Pool/Actions.tsx
@@ -12,7 +12,8 @@ export default function Actions({
   successMessage,
   txId,
   actionName,
-  action
+  action,
+  isDisabled
 }: {
   isLoading: boolean
   loaderMessage: string
@@ -20,6 +21,7 @@ export default function Actions({
   txId: string
   actionName: string
   action: () => void
+  isDisabled?: boolean
 }): ReactElement {
   const { networkId, ocean } = useOcean()
 
@@ -33,7 +35,7 @@ export default function Actions({
             style="primary"
             size="small"
             onClick={() => action()}
-            disabled={!ocean}
+            disabled={!ocean || isDisabled}
           >
             {actionName}
           </Button>
diff --git a/src/components/organisms/AssetActions/Pool/Add/FormAdd.module.css b/src/components/organisms/AssetActions/Pool/Add/FormAdd.module.css
index 8d20018f3..2c3159a4b 100644
--- a/src/components/organisms/AssetActions/Pool/Add/FormAdd.module.css
+++ b/src/components/organisms/AssetActions/Pool/Add/FormAdd.module.css
@@ -4,20 +4,3 @@
   bottom: calc(var(--spacer) / 2);
   right: calc(var(--spacer) * 2.5);
 }
-
-.userLiquidity > div {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-size: var(--font-size-mini);
-  color: var(--color-secondary);
-}
-
-.userLiquidity > div:last-child {
-  margin-bottom: calc(var(--spacer) / 4);
-}
-
-.userLiquidity span + div {
-  transform: scale(0.8);
-  transform-origin: right center;
-}
diff --git a/src/components/organisms/AssetActions/Pool/Add/FormAdd.tsx b/src/components/organisms/AssetActions/Pool/Add/FormAdd.tsx
index f0043173f..9ee1dce10 100644
--- a/src/components/organisms/AssetActions/Pool/Add/FormAdd.tsx
+++ b/src/components/organisms/AssetActions/Pool/Add/FormAdd.tsx
@@ -1,4 +1,3 @@
-import PriceUnit from '../../../../atoms/Price/PriceUnit'
 import React, { ChangeEvent, ReactElement, useEffect } from 'react'
 import styles from './FormAdd.module.css'
 import Input from '../../../../atoms/Input'
@@ -12,7 +11,8 @@ import Button from '../../../../atoms/Button'
 import CoinSelect from '../CoinSelect'
 import { FormAddLiquidity } from '.'
 import { useOcean } from '@oceanprotocol/react'
-import { Balance } from '..'
+import TokenBalance from '../../../../../@types/TokenBalance'
+import UserLiquidity from '../../../../atoms/UserLiquidity'
 
 export default function FormAdd({
   coin,
@@ -32,7 +32,7 @@ export default function FormAdd({
   amountMax: string
   setCoin: (value: string) => void
   totalPoolTokens: string
-  totalBalance: Balance
+  totalBalance: TokenBalance
   poolAddress: string
   setNewPoolTokens: (value: string) => void
   setNewPoolShare: (value: string) => void
@@ -86,20 +86,11 @@ export default function FormAdd({
 
   return (
     <>
-      <div className={styles.userLiquidity}>
-        <div>
-          <span>Available:</span>
-          {coin === 'OCEAN' ? (
-            <PriceUnit price={balance.ocean} symbol="OCEAN" small />
-          ) : (
-            <PriceUnit price={dtBalance} symbol={dtSymbol} small />
-          )}
-        </div>
-        <div>
-          <span>Maximum:</span>
-          <PriceUnit price={amountMax} symbol={coin} small />
-        </div>
-      </div>
+      <UserLiquidity
+        amount={coin === 'OCEAN' ? balance.ocean : dtBalance}
+        amountMax={amountMax}
+        symbol={coin}
+      />
 
       <Field name="amount">
         {({
diff --git a/src/components/organisms/AssetActions/Pool/Add/index.module.css b/src/components/organisms/AssetActions/Pool/Add/index.module.css
index 1d0aa3df8..424ddec90 100644
--- a/src/components/organisms/AssetActions/Pool/Add/index.module.css
+++ b/src/components/organisms/AssetActions/Pool/Add/index.module.css
@@ -22,6 +22,7 @@
   display: grid;
   gap: var(--spacer);
   grid-template-columns: 1fr 1fr;
+  padding-bottom: calc(var(--spacer) / 2);
 }
 
 .output p {
diff --git a/src/components/organisms/AssetActions/Pool/Add/index.tsx b/src/components/organisms/AssetActions/Pool/Add/index.tsx
index 64d17689a..47b6248b8 100644
--- a/src/components/organisms/AssetActions/Pool/Add/index.tsx
+++ b/src/components/organisms/AssetActions/Pool/Add/index.tsx
@@ -2,7 +2,6 @@ import React, { ReactElement, useState, useEffect } from 'react'
 import { useOcean } from '@oceanprotocol/react'
 import Header from '../Header'
 import { toast } from 'react-toastify'
-import { Balance } from '..'
 import Actions from '../Actions'
 import { graphql, useStaticQuery } from 'gatsby'
 import * as Yup from 'yup'
@@ -11,6 +10,7 @@ import FormAdd from './FormAdd'
 import styles from './index.module.css'
 import Token from '../Token'
 import Alert from '../../../../atoms/Alert'
+import TokenBalance from '../../../../../@types/TokenBalance'
 import { useUserPreferences } from '../../../../../providers/UserPreferences'
 
 const contentQuery = graphql`
@@ -59,7 +59,7 @@ export default function Add({
   refreshInfo: () => void
   poolAddress: string
   totalPoolTokens: string
-  totalBalance: Balance
+  totalBalance: TokenBalance
   swapFee: string
   dtSymbol: string
   dtAddress: string
@@ -199,6 +199,7 @@ export default function Add({
             </div>
 
             <Actions
+              isDisabled={!isWarningAccepted}
               isLoading={isSubmitting}
               loaderMessage="Adding Liquidity..."
               successMessage="Successfully added liquidity."
diff --git a/src/components/organisms/AssetActions/Pool/Remove.module.css b/src/components/organisms/AssetActions/Pool/Remove.module.css
index 877082d2f..c5ff3ff88 100644
--- a/src/components/organisms/AssetActions/Pool/Remove.module.css
+++ b/src/components/organisms/AssetActions/Pool/Remove.module.css
@@ -5,16 +5,8 @@
   padding-bottom: calc(var(--spacer) / 2);
 }
 
-.userLiquidity {
-  composes: userLiquidity from './Add/FormAdd.module.css';
-  max-width: 12rem;
-  margin-top: -1rem;
-  margin-left: auto;
-  margin-right: auto;
-  margin-bottom: calc(var(--spacer) / 2);
-}
-
 .range {
+  margin-top: calc(var(--spacer) / 2);
   text-align: center;
 }
 
diff --git a/src/components/organisms/AssetActions/Pool/Remove.tsx b/src/components/organisms/AssetActions/Pool/Remove.tsx
index 232561d80..614385a87 100644
--- a/src/components/organisms/AssetActions/Pool/Remove.tsx
+++ b/src/components/organisms/AssetActions/Pool/Remove.tsx
@@ -19,6 +19,7 @@ import { getMaxPercentRemove } from './utils'
 import { graphql, useStaticQuery } from 'gatsby'
 import PriceUnit from '../../../atoms/Price/PriceUnit'
 import debounce from 'lodash.debounce'
+import UserLiquidity from '../../../atoms/UserLiquidity'
 
 const contentQuery = graphql`
   query PoolRemoveQuery {
@@ -137,7 +138,6 @@ export default function Remove({
   // Check and set outputs when amountPoolShares changes
   useEffect(() => {
     if (!ocean || !poolTokens) return
-    console.log('eff', amountPoolShares, isAdvanced)
     getValues.current(amountPoolShares, isAdvanced)
   }, [
     amountPoolShares,
@@ -184,12 +184,7 @@ export default function Remove({
       <Header title={content.title} backAction={() => setShowRemove(false)} />
 
       <form className={styles.removeInput}>
-        <div className={styles.userLiquidity}>
-          <div>
-            <span>Available:</span>
-            <PriceUnit price={poolTokens} symbol="pool shares" small />
-          </div>
-        </div>
+        <UserLiquidity amount={poolTokens} symbol="pool shares" />
 
         <div className={styles.range}>
           <h3>{amountPercent}%</h3>
diff --git a/src/components/organisms/AssetActions/Pool/index.module.css b/src/components/organisms/AssetActions/Pool/index.module.css
index 9049b29a0..9f103e74d 100644
--- a/src/components/organisms/AssetActions/Pool/index.module.css
+++ b/src/components/organisms/AssetActions/Pool/index.module.css
@@ -46,6 +46,7 @@
   text-align: center;
   border-top: 1px solid var(--border-color);
   padding-top: calc(var(--spacer) / 4);
+  padding-bottom: calc(var(--spacer) / 4);
 }
 
 .update:before {
diff --git a/src/components/organisms/AssetActions/Pool/index.tsx b/src/components/organisms/AssetActions/Pool/index.tsx
index d9bee002f..39279afbd 100644
--- a/src/components/organisms/AssetActions/Pool/index.tsx
+++ b/src/components/organisms/AssetActions/Pool/index.tsx
@@ -17,15 +17,11 @@ import EtherscanLink from '../../../atoms/EtherscanLink'
 import Token from './Token'
 import TokenList from './TokenList'
 import { graphql, useStaticQuery } from 'gatsby'
+import TokenBalance from '../../../../@types/TokenBalance'
 import Transactions from './Transactions'
 import Graph, { ChartDataLiqudity } from './Graph'
 import axios from 'axios'
 
-export interface Balance {
-  ocean: number
-  datatoken: number
-}
-
 const contentQuery = graphql`
   query PoolQuery {
     content: allFile(filter: { relativePath: { eq: "price.json" } }) {
@@ -58,7 +54,7 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
 
   const [poolTokens, setPoolTokens] = useState<string>()
   const [totalPoolTokens, setTotalPoolTokens] = useState<string>()
-  const [userLiquidity, setUserLiquidity] = useState<Balance>()
+  const [userLiquidity, setUserLiquidity] = useState<TokenBalance>()
   const [swapFee, setSwapFee] = useState<string>()
   const [weightOcean, setWeightOcean] = useState<string>()
   const [weightDt, setWeightDt] = useState<string>()
@@ -76,7 +72,7 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
     creatorTotalLiquidityInOcean,
     setCreatorTotalLiquidityInOcean
   ] = useState(0)
-  const [creatorLiquidity, setCreatorLiquidity] = useState<Balance>()
+  const [creatorLiquidity, setCreatorLiquidity] = useState<TokenBalance>()
   const [creatorPoolTokens, setCreatorPoolTokens] = useState<string>()
   const [creatorPoolShare, setCreatorPoolShare] = useState<string>()
   const [graphData, setGraphData] = useState<ChartDataLiqudity>()
@@ -84,6 +80,12 @@ export default function Pool({ ddo }: { ddo: DDO }): ReactElement {
   // the purpose of the value is just to trigger the effect
   const [refreshPool, setRefreshPool] = useState(false)
 
+  useEffect(() => {
+    // Re-fetch price periodically, triggering re-calculation of everything
+    const interval = setInterval(() => refreshPrice(), refreshInterval)
+    return () => clearInterval(interval)
+  }, [ddo, refreshPrice])
+
   useEffect(() => {
     setIsRemoveDisabled(isInPurgatory && owner === accountId)
   }, [isInPurgatory, owner, accountId])
diff --git a/src/components/organisms/AssetActions/Trade/FormTrade.module.css b/src/components/organisms/AssetActions/Trade/FormTrade.module.css
new file mode 100644
index 000000000..996909b3b
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/FormTrade.module.css
@@ -0,0 +1,5 @@
+.alertWrap {
+  min-height: 320px;
+  display: flex;
+  align-items: center;
+}
diff --git a/src/components/organisms/AssetActions/Trade/FormTrade.tsx b/src/components/organisms/AssetActions/Trade/FormTrade.tsx
new file mode 100644
index 000000000..dea05197d
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/FormTrade.tsx
@@ -0,0 +1,155 @@
+import React, { ReactElement, useState } from 'react'
+import { useOcean } from '@oceanprotocol/react'
+import { BestPrice, DDO, Logger } from '@oceanprotocol/lib'
+import * as Yup from 'yup'
+import { Formik } from 'formik'
+import Actions from '../Pool/Actions'
+import { graphql, useStaticQuery } from 'gatsby'
+import { useUserPreferences } from '../../../../providers/UserPreferences'
+import { toast } from 'react-toastify'
+import Swap from './Swap'
+import TokenBalance from '../../../../@types/TokenBalance'
+import Alert from '../../../atoms/Alert'
+import styles from './FormTrade.module.css'
+import { FormTradeData, initialValues } from '../../../../models/FormTrade'
+
+const contentQuery = graphql`
+  query TradeQuery {
+    content: allFile(filter: { relativePath: { eq: "price.json" } }) {
+      edges {
+        node {
+          childContentJson {
+            trade {
+              action
+              warning
+            }
+          }
+        }
+      }
+    }
+  }
+`
+
+export default function FormTrade({
+  ddo,
+  balance,
+  maxDt,
+  maxOcean,
+  price
+}: {
+  ddo: DDO
+  balance: TokenBalance
+  maxDt: number
+  maxOcean: number
+  price: BestPrice
+}): ReactElement {
+  const data = useStaticQuery(contentQuery)
+  const content = data.content.edges[0].node.childContentJson.trade
+  const { ocean, accountId } = useOcean()
+  const { debug } = useUserPreferences()
+  const [txId, setTxId] = useState<string>()
+
+  const [maximumOcean, setMaximumOcean] = useState(maxOcean)
+  const [maximumDt, setMaximumDt] = useState(maxDt)
+  const [isWarningAccepted, setIsWarningAccepted] = useState(false)
+
+  const validationSchema = Yup.object().shape<FormTradeData>({
+    ocean: Yup.number()
+      .max(maximumOcean, (param) => `Must be more or equal to ${param.max}`)
+      .min(0.001, (param) => `Must be more or equal to ${param.min}`)
+      .required('Required')
+      .nullable(),
+    datatoken: Yup.number()
+      .max(maxDt, `Must be less or equal than ${maximumDt}`)
+      .min(0.00001, (param) => `Must be more or equal to ${param.min}`)
+      .required('Required')
+      .nullable(),
+    type: Yup.string(),
+    slippage: Yup.string()
+  })
+
+  async function handleTrade(values: FormTradeData) {
+    try {
+      const tx =
+        values.type === 'buy'
+          ? // ? await ocean.pool.buyDT(
+            //     accountId,
+            //     price.address,
+            //     values.datatoken.toString(),
+            //     (values.ocean * 1.01).toString()
+            //   )
+            await ocean.pool.buyDTWithExactOcean(
+              accountId,
+              price.address,
+              (values.datatoken * 0.99).toString(),
+              values.ocean.toString()
+            )
+          : await ocean.pool.sellDT(
+              accountId,
+              price.address,
+              values.datatoken.toString(),
+              (values.ocean * 0.99).toString()
+            )
+
+      setTxId(tx?.transactionHash)
+    } catch (error) {
+      Logger.error(error.message)
+      toast.error(error.message)
+    }
+  }
+
+  return (
+    <Formik
+      initialValues={initialValues}
+      validationSchema={validationSchema}
+      onSubmit={async (values, { setSubmitting, resetForm }) => {
+        await handleTrade(values)
+        resetForm()
+        setSubmitting(false)
+      }}
+    >
+      {({ isSubmitting, submitForm, values }) => (
+        <>
+          {isWarningAccepted ? (
+            <Swap
+              ddo={ddo}
+              balance={balance}
+              maxDt={maxDt}
+              maxOcean={maxOcean}
+              price={price}
+              setMaximumOcean={setMaximumOcean}
+              setMaximumDt={setMaximumDt}
+            />
+          ) : (
+            <div className={styles.alertWrap}>
+              <Alert
+                text={content.warning}
+                state="info"
+                action={{
+                  name: 'I understand',
+                  style: 'text',
+                  handleAction: () => setIsWarningAccepted(true)
+                }}
+              />
+            </div>
+          )}
+          <Actions
+            isDisabled={!isWarningAccepted}
+            isLoading={isSubmitting}
+            loaderMessage="Swapping tokens..."
+            successMessage="Successfully swapped tokens."
+            actionName={content.action}
+            action={submitForm}
+            txId={txId}
+          />
+
+          {debug && (
+            <pre>
+              <code>{JSON.stringify(values, null, 2)}</code>
+            </pre>
+          )}
+        </>
+      )}
+    </Formik>
+  )
+}
diff --git a/src/components/organisms/AssetActions/Trade/Output.module.css b/src/components/organisms/AssetActions/Trade/Output.module.css
new file mode 100644
index 000000000..8e59b0f78
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/Output.module.css
@@ -0,0 +1,22 @@
+.output {
+  border-top: 1px solid var(--border-color);
+  padding: var(--spacer);
+  display: grid;
+  gap: var(--spacer);
+  grid-template-columns: 1fr 1fr;
+  margin-left: -2rem;
+  margin-right: -2rem;
+}
+
+.output p {
+  font-weight: var(--font-weight-bold);
+  margin-bottom: calc(var(--spacer) / 8);
+}
+
+.output [class*='token'] {
+  white-space: normal;
+}
+
+.output [class*='token'] > figure {
+  display: none;
+}
diff --git a/src/components/organisms/AssetActions/Trade/Output.tsx b/src/components/organisms/AssetActions/Trade/Output.tsx
new file mode 100644
index 000000000..dc6c99630
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/Output.tsx
@@ -0,0 +1,77 @@
+import { useOcean } from '@oceanprotocol/react'
+import { FormikContextType, useFormikContext } from 'formik'
+import React, { ReactElement, useEffect, useState } from 'react'
+import { FormTradeData } from '../../../../models/FormTrade'
+import Token from '../Pool/Token'
+import styles from './Output.module.css'
+
+export default function Output({
+  dtSymbol,
+  poolAddress
+}: {
+  dtSymbol: string
+  poolAddress: string
+}): ReactElement {
+  const { ocean } = useOcean()
+  const [maxOutput, setMaxOutput] = useState<string>()
+  const [swapFee, setSwapFee] = useState<string>()
+  const [swapFeeValue, setSwapFeeValue] = useState<string>()
+  // Connect with form
+  const { values }: FormikContextType<FormTradeData> = useFormikContext()
+
+  // Get swap fee
+  useEffect(() => {
+    if (!ocean || !poolAddress) return
+
+    async function getSwapFee() {
+      const swapFee = await ocean.pool.getSwapFee(poolAddress)
+      // swapFee is tricky: to get 0.1% you need to convert from 0.001
+      setSwapFee(`${Number(swapFee) * 100}`)
+      const value =
+        values.type === 'buy'
+          ? Number(swapFee) * values.ocean
+          : Number(swapFee) * values.datatoken
+      setSwapFeeValue(value.toString())
+    }
+    getSwapFee()
+  }, [ocean, poolAddress, values])
+
+  // Get output values
+  useEffect(() => {
+    if (!ocean || !poolAddress) return
+
+    async function getOutput() {
+      // Minimum received
+      // TODO: check if this here is redundant cause we call some of that already in Swap.tsx
+      const maxImpact = 1 - Number(values.slippage) / 100
+      const maxPrice =
+        values.type === 'buy'
+          ? (values.datatoken * maxImpact).toString()
+          : (values.ocean * maxImpact).toString()
+
+      setMaxOutput(maxPrice)
+    }
+    getOutput()
+  }, [ocean, poolAddress, values])
+
+  return (
+    <div className={styles.output}>
+      <div>
+        <p>Minimum Received</p>
+        <Token
+          symbol={values.type === 'buy' ? dtSymbol : 'OCEAN'}
+          balance={maxOutput}
+        />
+      </div>
+      <div>
+        <p>Swap fee</p>
+        <Token
+          symbol={`${values.type === 'buy' ? `OCEAN` : dtSymbol} ${
+            swapFee ? `(${swapFee}%)` : ''
+          }`}
+          balance={swapFeeValue}
+        />
+      </div>
+    </div>
+  )
+}
diff --git a/src/components/organisms/AssetActions/Trade/Slippage.module.css b/src/components/organisms/AssetActions/Trade/Slippage.module.css
new file mode 100644
index 000000000..b27e26683
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/Slippage.module.css
@@ -0,0 +1,30 @@
+.slippage {
+  font-size: var(--font-size-small);
+  border-top: 1px solid var(--border-color);
+  margin-left: -2rem;
+  margin-right: -2rem;
+  padding: calc(var(--spacer) / 4) var(--spacer);
+  text-align: center;
+  color: var(--color-secondary);
+}
+
+.slippage strong {
+  font-weight: var(--font-weight-base);
+  color: var(--font-color-heading);
+}
+
+.title {
+  font-family: var(--font-family-base);
+  font-weight: var(--font-weight-base);
+  font-size: var(--font-size-mini);
+  text-align: center;
+  margin-bottom: calc(var(--spacer) / 4);
+  color: var(--color-secondary);
+}
+
+.slippage select {
+  width: fit-content;
+  display: inline-block;
+  margin-left: calc(var(--spacer) / 4);
+  margin-right: calc(var(--spacer) / 4);
+}
diff --git a/src/components/organisms/AssetActions/Trade/Slippage.tsx b/src/components/organisms/AssetActions/Trade/Slippage.tsx
new file mode 100644
index 000000000..7adc7bca8
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/Slippage.tsx
@@ -0,0 +1,35 @@
+import { FormikContextType, useFormikContext } from 'formik'
+import React, { ChangeEvent, ReactElement, useEffect, useState } from 'react'
+import { FormTradeData, slippagePresets } from '../../../../models/FormTrade'
+import InputElement from '../../../atoms/Input/InputElement'
+import styles from './Slippage.module.css'
+
+export default function Slippage(): ReactElement {
+  // Connect with form
+  const {
+    setFieldValue,
+    values
+  }: FormikContextType<FormTradeData> = useFormikContext()
+
+  function handleChange(e: ChangeEvent<HTMLSelectElement>) {
+    setFieldValue('slippage', e.target.value)
+  }
+
+  return (
+    <>
+      <div className={styles.slippage}>
+        <strong>Expected price impact</strong>
+        <InputElement
+          name="slippage"
+          type="select"
+          size="mini"
+          postfix="%"
+          sortOptions={false}
+          options={slippagePresets}
+          value={values.slippage}
+          onChange={handleChange}
+        />
+      </div>
+    </>
+  )
+}
diff --git a/src/components/organisms/AssetActions/Trade/Swap.module.css b/src/components/organisms/AssetActions/Trade/Swap.module.css
new file mode 100644
index 000000000..4909e595a
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/Swap.module.css
@@ -0,0 +1,24 @@
+.swap {
+  margin-top: -2rem;
+}
+
+.swapButton,
+.swapButton:hover {
+  padding: 0;
+  display: block;
+  width: calc(100% + 4rem);
+  text-align: center;
+  margin-left: -2rem;
+  margin-right: -2rem;
+  border-top: 1px solid var(--border-color);
+  border-bottom: 1px solid var(--border-color);
+  padding: calc(var(--spacer) / 3) 0 calc(var(--spacer) / 6) 0;
+}
+
+.swapButton svg {
+  display: inline-block;
+  width: var(--font-size-large);
+  height: var(--font-size-large);
+  fill: var(--brand-pink);
+  transform: rotate(90deg);
+}
diff --git a/src/components/organisms/AssetActions/Trade/Swap.tsx b/src/components/organisms/AssetActions/Trade/Swap.tsx
new file mode 100644
index 000000000..d1b58f939
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/Swap.tsx
@@ -0,0 +1,145 @@
+import React, { ReactElement, useEffect, useState } from 'react'
+import { useOcean } from '@oceanprotocol/react'
+import { BestPrice, DDO } from '@oceanprotocol/lib'
+import styles from './Swap.module.css'
+import TradeInput from './TradeInput'
+import Button from '../../../atoms/Button'
+import { ReactComponent as Arrow } from '../../../../images/arrow.svg'
+import { FormikContextType, useFormikContext } from 'formik'
+import TokenBalance from '../../../../@types/TokenBalance'
+import Output from './Output'
+import Slippage from './Slippage'
+import { FormTradeData, TradeItem } from '../../../../models/FormTrade'
+
+export default function Swap({
+  ddo,
+  maxDt,
+  maxOcean,
+  balance,
+  price,
+  setMaximumDt,
+  setMaximumOcean
+}: {
+  ddo: DDO
+  maxDt: number
+  maxOcean: number
+  balance: TokenBalance
+  price: BestPrice
+  setMaximumDt: (value: number) => void
+  setMaximumOcean: (value: number) => void
+}): ReactElement {
+  const { ocean } = useOcean()
+  const [oceanItem, setOceanItem] = useState<TradeItem>({
+    amount: 0,
+    token: 'OCEAN',
+    maxAmount: 0
+  })
+  const [dtItem, setDtItem] = useState<TradeItem>({
+    amount: 0,
+    token: ddo.dataTokenInfo.symbol,
+    maxAmount: 0
+  })
+
+  const {
+    setFieldValue,
+    values,
+    setErrors,
+    validateForm
+  }: FormikContextType<FormTradeData> = useFormikContext()
+
+  useEffect(() => {
+    if (!ddo || !balance || !values || !price) return
+
+    async function calculateMaximum() {
+      const dtAmount = values.type === 'buy' ? maxDt : balance.datatoken
+      const oceanAmount = values.type === 'buy' ? balance.ocean : maxOcean
+
+      const maxBuyOcean = await ocean.pool.getOceanReceived(
+        price.address,
+        dtAmount.toString()
+      )
+      const maxBuyDt = await ocean.pool.getDTReceived(
+        price.address,
+        oceanAmount.toString()
+      )
+
+      const maximumDt =
+        values.type === 'buy'
+          ? Number(dtAmount) > Number(maxBuyDt)
+            ? Number(maxBuyDt)
+            : Number(dtAmount)
+          : Number(dtAmount) > balance.datatoken
+          ? balance.datatoken
+          : Number(dtAmount)
+
+      const maximumOcean =
+        values.type === 'sell'
+          ? Number(oceanAmount) > Number(maxBuyOcean)
+            ? Number(maxBuyOcean)
+            : Number(oceanAmount)
+          : Number(oceanAmount) > balance.ocean
+          ? balance.ocean
+          : Number(oceanAmount)
+
+      setMaximumDt(maximumDt)
+      setMaximumOcean(maximumOcean)
+      setOceanItem({
+        ...oceanItem,
+        amount: oceanAmount,
+        maxAmount: maximumOcean
+      })
+      setDtItem({
+        ...dtItem,
+        amount: dtAmount,
+        maxAmount: maximumDt
+      })
+    }
+    calculateMaximum()
+  }, [ddo, maxOcean, maxDt, balance, price?.value, values.type])
+
+  const switchTokens = () => {
+    setFieldValue('type', values.type === 'buy' ? 'sell' : 'buy')
+    // don't reset form because we don't want to reset type
+    setFieldValue('datatoken', 0)
+    setFieldValue('ocean', 0)
+    setErrors({})
+  }
+
+  const handleValueChange = async (name: string, value: number) => {
+    const newValue =
+      name === 'ocean'
+        ? values.type === 'sell'
+          ? await ocean.pool.getDTNeeded(price.address, value.toString())
+          : await ocean.pool.getDTReceived(price.address, value.toString())
+        : values.type === 'sell'
+        ? await ocean.pool.getOceanReceived(price.address, value.toString())
+        : await ocean.pool.getOceanNeeded(price.address, value.toString())
+
+    setFieldValue(name === 'ocean' ? 'datatoken' : 'ocean', newValue)
+    validateForm()
+  }
+
+  return (
+    <div className={styles.swap}>
+      <TradeInput
+        name={values.type === 'sell' ? 'datatoken' : 'ocean'}
+        item={values.type === 'sell' ? dtItem : oceanItem}
+        handleValueChange={handleValueChange}
+      />
+
+      <Button className={styles.swapButton} style="text" onClick={switchTokens}>
+        <Arrow />
+      </Button>
+
+      <TradeInput
+        name={values.type === 'sell' ? 'ocean' : 'datatoken'}
+        item={values.type === 'sell' ? oceanItem : dtItem}
+        handleValueChange={handleValueChange}
+      />
+
+      <Output dtSymbol={dtItem.token} poolAddress={price?.address} />
+
+      <Slippage />
+    </div>
+  )
+}
diff --git a/src/components/organisms/AssetActions/Trade/TradeInput.module.css b/src/components/organisms/AssetActions/Trade/TradeInput.module.css
new file mode 100644
index 000000000..65dd567a0
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/TradeInput.module.css
@@ -0,0 +1,35 @@
+.tradeInput {
+  position: relative;
+  padding: var(--spacer) calc(var(--spacer) * 2);
+  margin-left: -2rem;
+  margin-right: -2rem;
+  background: var(--background-highlight);
+}
+
+.tradeInput input {
+  text-align: center;
+}
+
+.tradeInput div[class*='field'] {
+  margin-bottom: 0;
+}
+
+.tradeInput div[class*='prefix'] {
+  min-width: 6.5rem;
+  width: fit-content;
+  justify-content: center;
+}
+
+.label {
+  font-family: var(--font-family-heading);
+  font-size: var(--font-size-base);
+  text-align: center;
+  display: block;
+}
+
+.buttonMax {
+  position: absolute;
+  font-size: var(--font-size-mini);
+  bottom: calc(var(--spacer) / 2);
+  right: calc(var(--spacer) * 2);
+}
diff --git a/src/components/organisms/AssetActions/Trade/TradeInput.tsx b/src/components/organisms/AssetActions/Trade/TradeInput.tsx
new file mode 100644
index 000000000..7f033cfce
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/TradeInput.tsx
@@ -0,0 +1,86 @@
+import React, { ChangeEvent, ReactElement } from 'react'
+import styles from './TradeInput.module.css'
+
+import {
+  Field,
+  FieldInputProps,
+  FormikContextType,
+  useFormikContext
+} from 'formik'
+
+import { useOcean } from '@oceanprotocol/react'
+import Input from '../../../atoms/Input'
+import Button from '../../../atoms/Button'
+import UserLiquidity from '../../../atoms/UserLiquidity'
+import { FormTradeData, TradeItem } from '../../../../models/FormTrade'
+
+export default function TradeInput({
+  name,
+  item,
+  handleValueChange
+}: {
+  name: string
+  item: TradeItem
+  handleValueChange: (name: string, value: number) => void
+}): ReactElement {
+  const { ocean } = useOcean()
+
+  // Connect with form
+  const {
+    handleChange,
+    setFieldValue,
+    validateForm,
+    values
+  }: FormikContextType<FormTradeData> = useFormikContext()
+
+  const isTopField =
+    (name === 'ocean' && values.type === 'buy') ||
+    (name === 'datatoken' && values.type === 'sell')
+  const titleAvailable = isTopField ? `Balance` : `Available from pool`
+  const titleMaximum = isTopField ? `Maximum to spend` : `Maximum to receive`
+
+  return (
+    <section className={styles.tradeInput}>
+      <UserLiquidity
+        amount={`${item?.amount}`}
+        amountMax={`${item?.maxAmount}`}
+        symbol={item?.token}
+        titleAvailable={titleAvailable}
+        titleMaximum={titleMaximum}
+      />
+
+      <Field name={name}>
+        {({ field, form }: { field: FieldInputProps<number>; form: any }) => (
+          <Input
+            type="number"
+            max={`${item?.maxAmount}`}
+            prefix={item?.token}
+            placeholder="0"
+            field={field}
+            form={form}
+            value={`${field.value}`}
+            onChange={(e: ChangeEvent<HTMLInputElement>) => {
+              handleValueChange(name, Number(e.target.value))
+              validateForm()
+              handleChange(e)
+            }}
+            disabled={!ocean}
+          />
+        )}
+      </Field>
+      {!isTopField && (
+        <Button
+          className={styles.buttonMax}
+          style="text"
+          size="small"
+          onClick={() => {
+            setFieldValue(name, item?.maxAmount)
+            handleValueChange(name, item?.maxAmount)
+          }}
+        >
+          Use Max
+        </Button>
+      )}
+    </section>
+  )
+}
diff --git a/src/components/organisms/AssetActions/Trade/index.tsx b/src/components/organisms/AssetActions/Trade/index.tsx
new file mode 100644
index 000000000..c97736d31
--- /dev/null
+++ b/src/components/organisms/AssetActions/Trade/index.tsx
@@ -0,0 +1,69 @@
+import React, { ReactElement, useEffect, useState } from 'react'
+import { useOcean, useMetadata } from '@oceanprotocol/react'
+import { DDO } from '@oceanprotocol/lib'
+import FormTrade from './FormTrade'
+import TokenBalance from '../../../../@types/TokenBalance'
+
+const refreshInterval = 6000 // 6 sec, if the interval is bellow 3-5 seconds the price will be 0 all the time
+
+export default function Trade({ ddo }: { ddo: DDO }): ReactElement {
+  const { ocean, balance, accountId, networkId, refreshBalance } = useOcean()
+  const [tokenBalance, setTokenBalance] = useState<TokenBalance>()
+  const { price, refreshPrice } = useMetadata(ddo)
+  const [maxDt, setMaxDt] = useState(0)
+  const [maxOcean, setMaxOcean] = useState(0)
+
+  // Get datatoken balance, and combine with OCEAN balance from hooks into one object
+  useEffect(() => {
+    if (!ocean || !balance?.ocean || !accountId || !ddo?.dataToken) return
+
+    async function getTokenBalance() {
+      const dtBalance = await ocean.datatokens.balance(ddo.dataToken, accountId)
+      setTokenBalance({
+        ocean: Number(balance.ocean),
+        datatoken: Number(dtBalance)
+      })
+    }
+    getTokenBalance()
+  }, [balance.ocean, ocean, accountId, ddo.dataToken])
+
+  // Re-fetch price & balance periodically, triggering re-calculation of everything
+  useEffect(() => {
+    if (!ocean || !networkId || !accountId) return
+
+    const interval = setInterval(async () => {
+      refreshPrice()
+      refreshBalance()
+    }, refreshInterval)
+
+    return () => clearInterval(interval)
+  }, [ocean, ddo, networkId, accountId, refreshPrice, refreshBalance])
+
+  // Get maximum amount for either OCEAN or datatoken
+  useEffect(() => {
+    if (!ocean || !price || price.value === 0) return
+
+    async function getMaximum() {
+      const maxTokensInPool = await ocean.pool.getDTMaxBuyQuantity(
+        price.address
+      )
+      setMaxDt(Number(maxTokensInPool))
+
+      const maxOceanInPool = await ocean.pool.getOceanMaxBuyQuantity(
+        price.address
+      )
+      setMaxOcean(Number(maxOceanInPool))
+    }
+    getMaximum()
+  }, [ocean, balance.ocean, price])
+
+  return (
+    <FormTrade
+      ddo={ddo}
+      price={price}
+      balance={tokenBalance}
+      maxDt={maxDt}
+      maxOcean={maxOcean}
+    />
+  )
+}
diff --git a/src/components/organisms/AssetActions/index.module.css b/src/components/organisms/AssetActions/index.module.css
index b841e2570..f0bd5fab7 100644
--- a/src/components/organisms/AssetActions/index.module.css
+++ b/src/components/organisms/AssetActions/index.module.css
@@ -5,8 +5,8 @@
   padding: 0;
 }
 
-.hasTokens {
+.help {
   font-size: var(--font-size-mini);
   color: var(--color-secondary);
-  margin-top: calc(var(--spacer) / 12);
+  margin-top: calc(var(--spacer) / 3);
 }
diff --git a/src/components/organisms/AssetActions/index.tsx b/src/components/organisms/AssetActions/index.tsx
index 900cf3dfb..1bc34c5ec 100644
--- a/src/components/organisms/AssetActions/index.tsx
+++ b/src/components/organisms/AssetActions/index.tsx
@@ -7,6 +7,7 @@ import Tabs from '../../atoms/Tabs'
 import { useOcean, useMetadata } from '@oceanprotocol/react'
 import compareAsBN from '../../../utils/compareAsBN'
 import Pool from './Pool'
+import Trade from './Trade'
 
 export default function AssetActions({ ddo }: { ddo: DDO }): ReactElement {
   const { ocean, balance, accountId } = useOcean()
@@ -74,10 +75,16 @@ export default function AssetActions({ ddo }: { ddo: DDO }): ReactElement {
   const hasPool = ddo.price?.type === 'pool'
 
   hasPool &&
-    tabs.push({
-      title: 'Pool',
-      content: <Pool ddo={ddo} />
-    })
+    tabs.push(
+      {
+        title: 'Pool',
+        content: <Pool ddo={ddo} />
+      },
+      {
+        title: 'Trade',
+        content: <Trade ddo={ddo} />
+      }
+    )
 
   return <Tabs items={tabs} className={styles.actions} />
 }
diff --git a/src/components/templates/Search/utils.ts b/src/components/templates/Search/utils.ts
index 13a379bde..cdb47f963 100644
--- a/src/components/templates/Search/utils.ts
+++ b/src/components/templates/Search/utils.ts
@@ -71,7 +71,6 @@ export async function getResults(
     page,
     offset
   )
-  console.log(searchQuery)
   const queryResult = await metadataCache.queryMetadata(searchQuery)
 
   return queryResult
diff --git a/src/global/styles.css b/src/global/styles.css
index 58d73fb32..8c5d89db3 100644
--- a/src/global/styles.css
+++ b/src/global/styles.css
@@ -122,8 +122,8 @@ ul li {
 }
 
 ::selection {
-  background: var(--brand-black);
-  color: var(--brand-white);
+  background: var(--font-color-heading);
+  color: var(--background-body);
 }
 
 form,
diff --git a/src/images/arrow.svg b/src/images/arrow.svg
new file mode 100644
index 000000000..bea75d205
--- /dev/null
+++ b/src/images/arrow.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="19" viewBox="0 0 20 19"  xmlns="http://www.w3.org/2000/svg">
+<path d="M0 10.4304L16.3396 10.4304L8.88727 17.6833L10.2401 19L20 9.5L10.2401 0L8.88727 1.31491L16.3396 8.56959L0 8.56959V10.4304Z" />
+</svg>
diff --git a/src/models/FormTrade.ts b/src/models/FormTrade.ts
new file mode 100644
index 000000000..e3fa55d14
--- /dev/null
+++ b/src/models/FormTrade.ts
@@ -0,0 +1,24 @@
+import TokenBalance from '../@types/TokenBalance'
+
+export interface FormTradeData extends TokenBalance {
+  // in reference to datatoken, buy = swap from ocean to dt ( buy dt) , sell = swap from dt to ocean (sell dt)
+  type: 'buy' | 'sell'
+  slippage: string
+}
+
+export interface TradeItem {
+  amount: number
+  token: string
+  maxAmount: number
+}
+
+export const initialValues: FormTradeData = {
+  ocean: undefined,
+  datatoken: undefined,
+  type: 'buy',
+  slippage: '5'
+}
+
+export const slippagePresets = ['5', '10', '15', '25', '50']
+
+// validationSchema lives in components/organisms/AssetActions/Trade/FormTrade.tsx
diff --git a/src/providers/Prices.tsx b/src/providers/Prices.tsx
index 53a961a81..3a8d88216 100644
--- a/src/providers/Prices.tsx
+++ b/src/providers/Prices.tsx
@@ -43,7 +43,7 @@ export default function PricesProvider({
 
   // Fetch new prices periodically with swr
   useSWR(url, fetchData, {
-    refreshInterval: 30000, // 30 sec.
+    refreshInterval: 60000, // 60 sec.
     onSuccess
   })