diff --git a/package-lock.json b/package-lock.json
index 76cba2a7b..1d33fd1e8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "rif-marketplace-ui",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3d897ffd6..38feb79a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rif-marketplace-ui",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "RIF Marketplace provides a digital catalogue with a wide range of decentralised services.",
   "keywords": [
     "RIF",
diff --git a/src/components/molecules/RifAddress.tsx b/src/components/molecules/RifAddress.tsx
index 2cd881fd4..0992f423b 100644
--- a/src/components/molecules/RifAddress.tsx
+++ b/src/components/molecules/RifAddress.tsx
@@ -1,15 +1,18 @@
 import Typography, { TypographyProps } from '@material-ui/core/Typography'
-import { CopyTextTooltip } from '@rsksmart/rif-ui'
+import { CopyTextTooltip, shortenString } from '@rsksmart/rif-ui'
 import React, { FC } from 'react'
 import { shortChecksumAddress } from 'utils/stringUtils'
 
 export interface RifAddressProps extends TypographyProps {
   pretext?: string
   value: string
+  disableChecksum?: boolean
 }
 
-const RifAddress: FC<RifAddressProps> = ({ pretext, value, ...rest }) => {
-  const address = shortChecksumAddress(value)
+const RifAddress: FC<RifAddressProps> = ({
+  pretext, value, disableChecksum, ...rest
+}) => {
+  const address = disableChecksum ? shortenString(value) : shortChecksumAddress(value)
 
   const displayElement = (
     <Typography {...rest}>
diff --git a/src/components/molecules/index.ts b/src/components/molecules/index.ts
index b434449c2..b3a1f1bb2 100644
--- a/src/components/molecules/index.ts
+++ b/src/components/molecules/index.ts
@@ -9,7 +9,7 @@ export {
   CombinedPriceCell,
   IconedItem,
   ReturnButton,
-  RifAddress as AddressItem,
+  RifAddress,
   JobDoneBox,
   SelectRowButton,
 }
diff --git a/src/components/organisms/rns/sell/MyDomains.tsx b/src/components/organisms/rns/sell/MyDomains.tsx
index e65881e00..3bb97fa8f 100644
--- a/src/components/organisms/rns/sell/MyDomains.tsx
+++ b/src/components/organisms/rns/sell/MyDomains.tsx
@@ -1,4 +1,4 @@
-import { AddressItem, SelectRowButton } from 'components/molecules'
+import { RifAddress, SelectRowButton } from 'components/molecules'
 import DomainFilters from 'components/organisms/filters/DomainFilters'
 import MarketPageTemplate from 'components/templates/MarketPageTemplate'
 import { RnsDomain } from 'models/marketItems/DomainItem'
@@ -70,7 +70,7 @@ const MyDomains: FC = () => {
             maxLength={30}
           />
         )
-        : <AddressItem pretext="Unknown RNS:" value={tokenId} />
+        : <RifAddress pretext="Unknown RNS:" value={tokenId} />
 
       const isProcessingConfs = pendingConfs.some(
         ({ contractActionData }) => (
diff --git a/src/components/organisms/rns/sell/MyOffers.tsx b/src/components/organisms/rns/sell/MyOffers.tsx
index ad031758e..81095e0f4 100644
--- a/src/components/organisms/rns/sell/MyOffers.tsx
+++ b/src/components/organisms/rns/sell/MyOffers.tsx
@@ -1,6 +1,6 @@
 import IconButton from '@material-ui/core/IconButton'
 import ClearIcon from '@material-ui/icons/Clear'
-import { AddressItem, CombinedPriceCell, SelectRowButton } from 'components/molecules'
+import { RifAddress, CombinedPriceCell, SelectRowButton } from 'components/molecules'
 import DomainFilters from 'components/organisms/filters/DomainFilters'
 import MarketPageTemplate from 'components/templates/MarketPageTemplate'
 import { RnsDomain } from 'models/marketItems/DomainItem'
@@ -76,7 +76,7 @@ const MyOffers: FC = () => {
             maxLength={30}
           />
         )
-        : <AddressItem pretext="Unknown RNS:" value={tokenId} />
+        : <RifAddress pretext="Unknown RNS:" value={tokenId} />
 
       const isProcessingConfs = pendingConfs.some(
         ({ contractActionData }) => (
diff --git a/src/components/organisms/rns/sell/SoldDomains.tsx b/src/components/organisms/rns/sell/SoldDomains.tsx
index afeb7c727..d6ff33ba2 100644
--- a/src/components/organisms/rns/sell/SoldDomains.tsx
+++ b/src/components/organisms/rns/sell/SoldDomains.tsx
@@ -1,4 +1,4 @@
-import { AddressItem, CombinedPriceCell } from 'components/molecules'
+import { RifAddress, CombinedPriceCell } from 'components/molecules'
 import DomainFilters from 'components/organisms/filters/DomainFilters'
 import MarketPageTemplate from 'components/templates/MarketPageTemplate'
 import { RnsSoldDomain } from 'models/marketItems/DomainItem'
@@ -52,12 +52,12 @@ const SoldDomains: FC<{}> = () => {
       const pseudoResolvedName = name && `${name}.rsk`
       const displayDomainName = domainName || pseudoResolvedName
         ? <ShortenTextTooltip value={domainName || pseudoResolvedName as string} maxLength={30} />
-        : <AddressItem pretext="Unknown RNS:" value={tokenId} />
+        : <RifAddress pretext="Unknown RNS:" value={tokenId} />
 
       const displayItem = {
         id,
         domainName: displayDomainName,
-        buyer: <AddressItem value={buyer} />,
+        buyer: <RifAddress value={buyer} />,
         currency: displayName,
         sellingPrice: <CombinedPriceCell
           price={price.toString()}
diff --git a/src/components/organisms/storage/agreements/DetailsModal.tsx b/src/components/organisms/storage/agreements/DetailsModal.tsx
index 01efee01b..eee3b0cfb 100644
--- a/src/components/organisms/storage/agreements/DetailsModal.tsx
+++ b/src/components/organisms/storage/agreements/DetailsModal.tsx
@@ -7,7 +7,6 @@ import {
 } from '@rsksmart/rif-ui'
 /* eslint-disable-next-line import/no-unresolved */
 import { ModalProps } from '@rsksmart/rif-ui/dist/components/atoms/modal/Modal'
-import GridColumn from 'components/atoms/GridColumn'
 import GridItem from 'components/atoms/GridItem'
 import RifCard from 'components/organisms/RifCard'
 import { AgreementCustomerView, AgreementProviderView } from 'components/organisms/storage/agreements/utils'
@@ -35,7 +34,9 @@ const useModalStyles = makeStyles((theme: Theme) => ({
   },
 }))
 
-const DetailsModal: FC<DetailsModalProps> = ({ modalProps, itemDetails, actions }) => {
+const DetailsModal: FC<DetailsModalProps> = ({
+  modalProps, itemDetails, actions,
+}) => {
   const modalCardStyleClasses = useModalStyles()
   return (
     <Modal
@@ -55,8 +56,11 @@ const DetailsModal: FC<DetailsModalProps> = ({ modalProps, itemDetails, actions
             <ModalHeader className={modalCardStyleClasses.modalWidth}>
               <ModalTitle>{itemDetails?.title}</ModalTitle>
             </ModalHeader>
-            <GridColumn
+            <Grid
+              container
               spacing={2}
+              wrap="nowrap"
+              direction="column"
               className={modalCardStyleClasses.itemDetails}
             >
               {itemDetails ? Object.keys(itemDetails)
@@ -68,6 +72,7 @@ const DetailsModal: FC<DetailsModalProps> = ({ modalProps, itemDetails, actions
                     container
                     direction="row"
                     spacing={6}
+                    wrap="nowrap"
                     xs={12}
                   >
                     <GridItem
@@ -84,7 +89,7 @@ const DetailsModal: FC<DetailsModalProps> = ({ modalProps, itemDetails, actions
                     <GridItem xs={6}>{itemDetails[key]}</GridItem>
                   </Grid>
                 )) : ''}
-            </GridColumn>
+            </Grid>
           </RifCard>
         </ModalBody>
       </>
diff --git a/src/components/organisms/storage/agreements/utils.tsx b/src/components/organisms/storage/agreements/utils.tsx
index 2d3156a78..5219ac82a 100644
--- a/src/components/organisms/storage/agreements/utils.tsx
+++ b/src/components/organisms/storage/agreements/utils.tsx
@@ -1,6 +1,6 @@
 import { Spinner } from '@rsksmart/rif-ui'
 import ItemWUnit from 'components/atoms/ItemWUnit'
-import { AddressItem, CombinedPriceCell, SelectRowButton } from 'components/molecules'
+import { RifAddress, CombinedPriceCell, SelectRowButton } from 'components/molecules'
 import { MarketplaceItem } from 'components/templates/marketplace/Marketplace'
 import { AgreementUpdateData, ConfirmationData } from 'context/Confirmations/interfaces'
 import { BaseFiat } from 'models/Fiat'
@@ -33,19 +33,17 @@ export type AgreementCustomerView = AgreementView & {
 
 const getCoreItemFields = (
   agreement: Agreement,
-  crypto: MarketCryptoRecord,
+  { rate, displayName }: TokenXR,
   currentFiat: BaseFiat,
 ): AgreementView => {
   const {
     monthlyFee,
     renewalDate,
-    paymentToken,
     size,
     subscriptionPeriod,
     id,
     dataReference,
   } = agreement
-  const currency: TokenXR = crypto[paymentToken.symbol]
 
   const sizeValue = (
     <ItemWUnit
@@ -57,38 +55,37 @@ const getCoreItemFields = (
   const feeValue = (
     <CombinedPriceCell
       price={monthlyFee.toString()}
-      priceFiat={currency && monthlyFee.times(currency.rate).toPrecision(3)}
-      currency={currency && currency.displayName}
-      currencyFiat={currentFiat.displayName}
+      priceFiat={monthlyFee.times(rate).toPrecision(3)}
+      currency={displayName}
+      currencyFiat={currentFiat?.displayName}
       divider=" "
     />
   )
-  const idValue = <AddressItem value={id} />
+  const idValue = <RifAddress value={id} />
 
   return {
-    HASH: <AddressItem value={dataReference} />,
+    HASH: <RifAddress value={dataReference} disableChecksum />,
     title: idValue,
     'PRICE/GB': feeValue,
     AMOUNT: sizeValue,
     'RENEWAL DATE': renewalDate ? getShortDateString(renewalDate) : 'Expired',
     'SUBSCRIPTION PERIOD': subscriptionPeriod,
-    CURRENCY: currency.displayName,
+    CURRENCY: displayName,
     SYSTEM: 'IPFS',
   }
 }
 
 export const getCustomerViewFrom = (
   agreement: Agreement,
-  crypto: MarketCryptoRecord,
+  currency: TokenXR,
   currentFiat: BaseFiat,
 ): AgreementCustomerView => {
-  const agreementInfo = getCoreItemFields(agreement, crypto, currentFiat)
+  const agreementInfo = getCoreItemFields(agreement, currency, currentFiat)
   const {
-    provider, paymentToken, withdrawableFunds,
+    provider, withdrawableFunds,
   } = agreement
-  const currency: TokenXR = crypto[paymentToken.symbol]
 
-  const providerValue = <AddressItem value={provider} />
+  const providerValue = <RifAddress value={provider} />
   const withdrawableFundsValue = (
     <ItemWUnit
       type="mediumPrimary"
@@ -115,66 +112,70 @@ export const createCustomerItemFields = (
     agreement: Agreement
   ) => void,
   withdrawAndRenewConfs: ConfirmationData[],
-): MarketplaceItem[] => agreements.map((agreement: Agreement) => {
-  const {
-    id, expiresInSeconds, isActive,
-  } = agreement
-  const customerView = getCustomerViewFrom(agreement, crypto, currentFiat)
-
-  const isProcessingConfs = withdrawAndRenewConfs.some(
-    ({ contractActionData }) => (
-      (contractActionData as AgreementUpdateData).agreementId === id
-    ),
-  )
+): MarketplaceItem[] => agreements
+  .filter(({ paymentToken: { symbol } }) => crypto[symbol])
+  .map((agreement: Agreement) => {
+    const {
+      id, expiresInSeconds, isActive, paymentToken: { symbol },
+    } = agreement
+    const customerView = getCustomerViewFrom(
+      agreement,
+      crypto[symbol],
+      currentFiat,
+    )
 
-  return {
-    ...customerView,
-    id,
-    provider: customerView.PROVIDER,
-    contentSize: customerView.AMOUNT,
-    renewalDate: customerView['RENEWAL DATE'],
-    subscriptionPeriod: customerView['SUBSCRIPTION PERIOD'],
-    monthlyFee: customerView['PRICE/GB'],
-    withdrawableFunds: customerView['WITHDRAWABLE FUNDS'],
-    renew: isProcessingConfs
-      ? <Spinner />
-      : (
-        <SelectRowButton
-          id={id}
-          disabled={!expiresInSeconds || !isActive}
-          handleSelect={(event): void => {
-            onItemRenew(event, agreement)
-          }}
-        >
-          Renew
-        </SelectRowButton>
-      ),
-    view: isProcessingConfs
-      ? <></>
-      : (
-        <SelectRowButton
-          id={id}
-          handleSelect={(event): void => onItemSelect(
-            event, customerView, agreement,
-          )}
-        >
-          View
-        </SelectRowButton>
+    const isProcessingConfs = withdrawAndRenewConfs.some(
+      ({ contractActionData }) => (
+        (contractActionData as AgreementUpdateData).agreementId === id
       ),
-  }
-})
+    )
+
+    return {
+      ...customerView,
+      id,
+      provider: customerView.PROVIDER,
+      contentSize: customerView.AMOUNT,
+      renewalDate: customerView['RENEWAL DATE'],
+      subscriptionPeriod: customerView['SUBSCRIPTION PERIOD'],
+      monthlyFee: customerView['PRICE/GB'],
+      withdrawableFunds: customerView['WITHDRAWABLE FUNDS'],
+      renew: isProcessingConfs
+        ? <Spinner />
+        : (
+          <SelectRowButton
+            id={id}
+            disabled={!expiresInSeconds || !isActive}
+            handleSelect={(event): void => {
+              onItemRenew(event, agreement)
+            }}
+          >
+            Renew
+          </SelectRowButton>
+        ),
+      view: isProcessingConfs
+        ? <></>
+        : (
+          <SelectRowButton
+            id={id}
+            handleSelect={(event): void => onItemSelect(
+              event, customerView, agreement,
+            )}
+          >
+            View
+          </SelectRowButton>
+        ),
+    }
+  })
 
 export const getProviderViewFrom = (
   agreement: Agreement,
-  crypto: MarketCryptoRecord,
+  currency: TokenXR,
   currentFiat: BaseFiat,
 ): AgreementProviderView => {
-  const agreementInfo = getCoreItemFields(agreement, crypto, currentFiat)
   const {
-    consumer, paymentToken, toBePayedOut,
+    consumer, toBePayedOut,
   } = agreement
-  const currency: TokenXR = crypto[paymentToken.symbol]
-  const consumerValue = <AddressItem value={consumer} />
+  const consumerValue = <RifAddress value={consumer} />
   const toBePayedOutValue = (
     <ItemWUnit
       type="mediumPrimary"
@@ -183,6 +184,8 @@ export const getProviderViewFrom = (
     />
   )
 
+  const agreementInfo = getCoreItemFields(agreement, currency, currentFiat)
+
   return {
     ...agreementInfo,
     CONSUMER: consumerValue,
@@ -201,51 +204,59 @@ export const createProviderItemFields = (
     agreement: Agreement,
   ) => void,
   payoutConfirmations: ConfirmationData[],
-): MarketplaceItem[] => agreements.map((agreement: Agreement) => {
-  const providerView = getProviderViewFrom(agreement, crypto, currentFiat)
-  const {
-    id,
-  } = agreement
-
-  const isProcessingPayoutConfs = payoutConfirmations.some(
-    ({ contractActionData }) => (
-      (contractActionData as AgreementUpdateData).agreementId === id
-    ),
-  )
+): MarketplaceItem[] => agreements
+  .filter(({ paymentToken: { symbol } }) => crypto[symbol])
+  .map((agreement: Agreement) => {
+    const {
+      id,
+      paymentToken: { symbol },
+    } = agreement
 
-  return {
-    ...providerView,
-    id,
-    customer: providerView.CONSUMER,
-    contentSize: providerView.AMOUNT,
-    renewalDate: providerView['RENEWAL DATE'],
-    subscriptionPeriod: providerView['SUBSCRIPTION PERIOD'],
-    monthlyFee: providerView['PRICE/GB'],
-    toBePayedOut: providerView['AVAILABLE FUNDS'],
-    withdraw: isProcessingPayoutConfs
-      ? <Spinner />
-      : (
-        <SelectRowButton
-          id={id}
-          handleSelect={(event): void => {
-            onItemWithdraw(event, agreement)
-          }}
-          disabled={Number(agreement.toBePayedOut) <= 0}
-        >
-          Withdraw
-        </SelectRowButton>
-      ),
-    view: isProcessingPayoutConfs
-      ? <></>
-      : (
-        <SelectRowButton
-          id={id}
-          handleSelect={(event): void => onItemSelect(
-            event, providerView, agreement,
-          )}
-        >
-          View
-        </SelectRowButton>
+    const isProcessingPayoutConfs = payoutConfirmations.some(
+      ({ contractActionData }) => (
+        (contractActionData as AgreementUpdateData).agreementId === id
       ),
-  }
-})
+    )
+
+    const providerView = getProviderViewFrom(
+      agreement,
+      crypto[symbol],
+      currentFiat,
+    )
+
+    return {
+      ...providerView,
+      id,
+      customer: providerView.CONSUMER,
+      contentSize: providerView.AMOUNT,
+      renewalDate: providerView['RENEWAL DATE'],
+      subscriptionPeriod: providerView['SUBSCRIPTION PERIOD'],
+      monthlyFee: providerView['PRICE/GB'],
+      toBePayedOut: providerView['AVAILABLE FUNDS'],
+      withdraw: isProcessingPayoutConfs
+        ? <Spinner />
+        : (
+          <SelectRowButton
+            id={id}
+            handleSelect={(event): void => {
+              onItemWithdraw(event, agreement)
+            }}
+            disabled={Number(agreement.toBePayedOut) <= 0}
+          >
+            Withdraw
+          </SelectRowButton>
+        ),
+      view: isProcessingPayoutConfs
+        ? <></>
+        : (
+          <SelectRowButton
+            id={id}
+            handleSelect={(event): void => onItemSelect(
+              event, providerView, agreement,
+            )}
+          >
+            View
+          </SelectRowButton>
+        ),
+    }
+  })
diff --git a/src/components/pages/notifier/buy/NotifierOffersPage.tsx b/src/components/pages/notifier/buy/NotifierOffersPage.tsx
index 72f35685a..cab6abd7e 100644
--- a/src/components/pages/notifier/buy/NotifierOffersPage.tsx
+++ b/src/components/pages/notifier/buy/NotifierOffersPage.tsx
@@ -4,7 +4,7 @@ import { Spinner, Web3Store } from '@rsksmart/rif-ui'
 import { SubscriptionPlanDTO } from 'api/rif-notifier-service/models/subscriptionPlan'
 import SubscriptionPlans from 'api/rif-notifier-service/subscriptionPlans'
 import ItemWUnit from 'components/atoms/ItemWUnit'
-import { AddressItem, SelectRowButton } from 'components/molecules'
+import { RifAddress, SelectRowButton } from 'components/molecules'
 import { SelectRowButtonProps } from 'components/molecules/SelectRowButton'
 import NotifierOffersFilters from 'components/organisms/filters/notifier/OffersFilters'
 import NotifierPlansDraw from 'components/organisms/notifier/NotifierPlansDraw'
@@ -187,7 +187,7 @@ const NotifierOffersPage: FC = () => {
 
         const commonProperties = {
           id: provider,
-          provider: <AddressItem value={provider} />,
+          provider: <RifAddress value={provider} />,
           action1: account === provider ? 'Your offer' : (buttonSelect),
         }
 
diff --git a/src/components/pages/rns/buy/DomainOffersPage.tsx b/src/components/pages/rns/buy/DomainOffersPage.tsx
index 00d9019c4..8f08e7bc1 100644
--- a/src/components/pages/rns/buy/DomainOffersPage.tsx
+++ b/src/components/pages/rns/buy/DomainOffersPage.tsx
@@ -1,7 +1,7 @@
 import { Web3Store, ShortenTextTooltip, Spinner } from '@rsksmart/rif-ui'
 import React, { FC, useContext } from 'react'
 import { useHistory } from 'react-router-dom'
-import { AddressItem, CombinedPriceCell, SelectRowButton } from 'components/molecules'
+import { RifAddress, CombinedPriceCell, SelectRowButton } from 'components/molecules'
 import RifPaging from 'components/molecules/RifPaging'
 import DomainOfferFilters from 'components/organisms/filters/DomainOffersFilters'
 import MarketPageTemplate from 'components/templates/MarketPageTemplate'
@@ -158,7 +158,7 @@ const DomainOffersPage: FC = () => {
             maxLength={30}
           />
         )
-        : <AddressItem pretext="Unknown RNS:" value={tokenId} />
+        : <RifAddress pretext="Unknown RNS:" value={tokenId} />
 
       const isProcessingConfs = pendingConfs.some(
         ({ contractActionData }) => (
@@ -183,7 +183,7 @@ const DomainOffersPage: FC = () => {
       const displayItem = {
         id,
         domainName: displayDomainName,
-        ownerAddress: <AddressItem value={ownerAddress} />,
+        ownerAddress: <RifAddress value={ownerAddress} />,
         expirationDate: expirationDate.toLocaleDateString(),
         combinedPrice: <CombinedPriceCell
           price={price.toString()}
diff --git a/src/components/pages/storage/buy/StorageOffersPage.tsx b/src/components/pages/storage/buy/StorageOffersPage.tsx
index 76b970749..19d71c851 100644
--- a/src/components/pages/storage/buy/StorageOffersPage.tsx
+++ b/src/components/pages/storage/buy/StorageOffersPage.tsx
@@ -4,7 +4,7 @@ import StorageFilters from 'components/organisms/filters/storage/StorageFilters'
 import MarketPageTemplate from 'components/templates/MarketPageTemplate'
 import { TableHeaders, MarketplaceItem } from 'components/templates/marketplace/Marketplace'
 import { BillingPlan } from 'models/marketItems/StorageItem'
-import { SelectRowButton, AddressItem } from 'components/molecules'
+import { SelectRowButton, RifAddress } from 'components/molecules'
 import { StorageOffersContext, StorageOffersContextProps } from 'context/Services/storage/offers'
 import ItemWUnit from 'components/atoms/ItemWUnit'
 import ROUTES from 'routes'
@@ -65,7 +65,7 @@ const StorageOffersPage: FC = () => {
 
       return {
         id,
-        provider: <AddressItem value={id} />,
+        provider: <RifAddress value={id} />,
         system,
         availableSize: <ItemWUnit type="mediumPrimary" unit="GB" value={availableSizeGB.toString()} />,
         subscriptionOptions: Array.from(new Set(