diff --git a/packages/commons/src/Blocks.jsx b/packages/commons/src/Blocks.jsx
index c1e01342e..6983bf7ff 100644
--- a/packages/commons/src/Blocks.jsx
+++ b/packages/commons/src/Blocks.jsx
@@ -10,7 +10,7 @@ import {
     __experimentalText as Text,
     __experimentalScrollable as Scrollable
 } from '@wordpress/components';
-import { Component } from '@wordpress/element';
+import { Component, createRef } from '@wordpress/element';
 import apiFetch from '@wordpress/api-fetch';
 import { togglePanel } from "./Util";
 
@@ -50,7 +50,7 @@ export class ComponentWithSettings extends Component {
                 }
             }
         }, false);
-        this.iframe = React.createRef();
+        this.iframe = createRef();
         this.unsubscribe = wp.data.subscribe(() => {
             const newPreviewMode = wp.data.select("core/editor").getDeviceType();
             if (newPreviewMode !== this.state.previewMode) {
diff --git a/packages/commons/src/Format.jsx b/packages/commons/src/Format.jsx
index e76eda7f4..85660d09e 100644
--- a/packages/commons/src/Format.jsx
+++ b/packages/commons/src/Format.jsx
@@ -341,7 +341,8 @@ export const Format = ({
                            onUseCustomAxisFormatChange,
                            customFormat,
                            hiddenCustomAxisFormat,
-                           useCustomAxisFormat
+                           useCustomAxisFormat,
+                           showPrefixSuffix = false
                        }) => {
 
 
@@ -398,7 +399,7 @@ export const Format = ({
                     value={format.minimumFractionDigits}
                 />
             </PanelRow>
-            <PanelRow>
+            {showPrefixSuffix && <PanelRow>
                 <TextControl
                     label={__("Prefix", "dg")}
                     onChange={(value) => {
@@ -406,8 +407,8 @@ export const Format = ({
                     }}
                     value={format.prefix}
                 />
-            </PanelRow>
-            <PanelRow>
+            </PanelRow>}
+            {showPrefixSuffix && <PanelRow>
                 <TextControl
                     label={__("Suffix", "dg")}
                     onChange={(value) => {
@@ -415,7 +416,7 @@ export const Format = ({
                     }}
                     value={format.suffix}
                 />
-            </PanelRow>
+            </PanelRow>}
         </PanelBody>, <>
             {!hiddenCustomAxisFormat && <PanelRow>
                 <ToggleControl label={__("Use Custom Axis Format", "dg")} checked={useCustomAxisFormat}
diff --git a/plugins/wp-react-blocks-plugin/blocks/big-number-trend/BlockEdit.js b/plugins/wp-react-blocks-plugin/blocks/big-number-trend/BlockEdit.js
index 97b052056..ee002b384 100644
--- a/plugins/wp-react-blocks-plugin/blocks/big-number-trend/BlockEdit.js
+++ b/plugins/wp-react-blocks-plugin/blocks/big-number-trend/BlockEdit.js
@@ -18,7 +18,7 @@ import { togglePanel } from '@devgateway/dvz-wp-commons';
 import { Measures } from '@devgateway/dvz-wp-commons';
 import { DataFilters } from '@devgateway/dvz-wp-commons';
 import { isSupersetAPI } from '@devgateway/dvz-wp-commons';
-import Format from "../charts/Format.jsx";
+import { Format } from '@devgateway/dvz-wp-commons';
 
 
 class BlockEdit extends BlockEditWithAPIMetadata {
@@ -63,7 +63,8 @@ class BlockEdit extends BlockEditWithAPIMetadata {
                 noDataText,
                 showTooltip,
                 tooltipText,
-                tooltipStyle
+                tooltipStyle,
+                percentChangeFormat
             }
         } = this.props;
 
@@ -265,7 +266,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
                             <MediaUpload
                                 onSelect={(media) => setAttributes({ iconUp: media.url })}
                                 allowedTypes={["image"]}
-                                value={iconImage}
+                                value={iconUp}
                                 render={({ open }) => (
                                     <button onClick={open} className="components-button is-secondary">
                                         {iconImage
@@ -295,7 +296,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
                             <MediaUpload
                                 onSelect={(media) => setAttributes({ iconDown: media.url })}
                                 allowedTypes={["image"]}
-                                value={iconImage}
+                                value={iconDown}
                                 render={({ open }) => (
                                     <button onClick={open} className="components-button is-secondary">
                                         {iconImage
@@ -431,6 +432,20 @@ class BlockEdit extends BlockEditWithAPIMetadata {
                                 }
                             ]}
                         />
+                        <PanelBody
+                            initialOpen={false}
+                            title={__("Percentage Change Format")}
+                        >
+                            <Format
+                                hiddenCustomAxisFormat={true}
+                                showPrefixSuffix={true}
+                                format={percentChangeFormat}
+                                customFormat={{}}
+                                useCustomAxisFormat={false}
+                                onFormatChange={(newFormat) => setAttributes({ percentChangeFormat: newFormat })}
+                                onUseCustomAxisFormatChange={() => {}}
+                            />
+                        </PanelBody>
                         <PanelBody
                             initialOpen={false}
                             panelStatus={panelStatus['TOOLTIP']}
diff --git a/plugins/wp-react-blocks-plugin/blocks/big-number-trend/BlockSave.js b/plugins/wp-react-blocks-plugin/blocks/big-number-trend/BlockSave.js
index 60acbcd75..60fd89982 100644
--- a/plugins/wp-react-blocks-plugin/blocks/big-number-trend/BlockSave.js
+++ b/plugins/wp-react-blocks-plugin/blocks/big-number-trend/BlockSave.js
@@ -11,7 +11,6 @@ const SaveComponent = (props) => {
             format,
             filters,
             group,
-            noDataMsg,
             dvzProxyDatasetId,
             bigNumberFontSize,
             labelFontSize,
@@ -30,20 +29,18 @@ const SaveComponent = (props) => {
             backGroundColor,
             showTooltip,
             tooltipText,
-            tooltipStyle
+            tooltipStyle,
+            percentChangeFormat
         }
     } = props;
     const blockProps = useBlockProps.save({
         className: 'big-number-trend'
     });
 
-    const levels = [dimension1]
-    const source = levels.filter(l => l != 'none' && l != null).join('/')
     return (
         <div {...blockProps} className={"viz-component"}
              data-component={"bignumbertrend"}
              data-height={height}
-             data-source={source}
              data-app={app}
              data-csv={csv}
              data-dvz-proxy-dataset-id={dvzProxyDatasetId}
@@ -52,11 +49,13 @@ const SaveComponent = (props) => {
              data-format={encodeURIComponent(JSON.stringify(format))}
              data-group={group}
              data-filters={encodeURIComponent(JSON.stringify(filters))}
-             data-no-data-message={noDataMsg}
              data-big-number-font-size={bigNumberFontSize}
              data-label-font-size={labelFontSize}
              data-percent-font-size={percentFontSize}
              data-text-color={encodeURIComponent(textColor)}
+             data-number-color={encodeURIComponent(numberColor)}
+             data-percent-color={encodeURIComponent(percentColor)}
+             data-back-ground-color={backGroundColor}
              data-label={label}
              data-show-percentage-change={showPercentageChange}
              data-wait-for-filters={waitForFilters}
@@ -65,12 +64,10 @@ const SaveComponent = (props) => {
              data-icon-up={iconUp}
              data-icon-down={iconDown}
              data-style-option={styleOption}
-             data-percent-color={percentColor}
-             data-number-color={numberColor}
-             data-back-ground-color={backGroundColor}
-            data-show-tooltip={showTooltip}
-            data-tooltip-text={tooltipText}
-            data-tooltip-style={tooltipStyle}
+             data-show-tooltip={showTooltip}
+             data-tooltip-text={tooltipText}
+             data-tooltip-style={tooltipStyle}
+             data-percent-change-format={encodeURIComponent(JSON.stringify(percentChangeFormat))}
         >
             <InnerBlocks.Content/>
         </div>
diff --git a/plugins/wp-react-blocks-plugin/blocks/big-number-trend/index.js b/plugins/wp-react-blocks-plugin/blocks/big-number-trend/index.js
index f884fda1e..504357b0d 100644
--- a/plugins/wp-react-blocks-plugin/blocks/big-number-trend/index.js
+++ b/plugins/wp-react-blocks-plugin/blocks/big-number-trend/index.js
@@ -146,6 +146,14 @@ registerBlockType(BLOCKS_NS + '/bignumbertrend',
             iconUp: {
                 type: "string",
                 default: ""
+            },
+            percentChangeFormat: {
+                type: 'Object',
+                default: {
+                    "style": "percent",
+                    "minimumFractionDigits": 2,
+                    "maximumFractionDigits": 2
+                }
             }
         },
         edit: BlockEdit,
diff --git a/plugins/wp-react-blocks-plugin/blocks/big-number/BlockEdit.js b/plugins/wp-react-blocks-plugin/blocks/big-number/BlockEdit.js
index bbd85d810..14e11a509 100644
--- a/plugins/wp-react-blocks-plugin/blocks/big-number/BlockEdit.js
+++ b/plugins/wp-react-blocks-plugin/blocks/big-number/BlockEdit.js
@@ -18,7 +18,7 @@ import { togglePanel } from '@devgateway/dvz-wp-commons';;
 import { Measures } from '@devgateway/dvz-wp-commons';
 import { DataFilters } from '@devgateway/dvz-wp-commons';
 import { isSupersetAPI } from '@devgateway/dvz-wp-commons';
-import Format from "../charts/Format.jsx";
+import { Format } from '@devgateway/dvz-wp-commons';
 
 
 class BlockEdit extends BlockEditWithAPIMetadata {
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/BlockEdit.js b/plugins/wp-react-blocks-plugin/blocks/charts/BlockEdit.js
index 1eae19f89..ca726249b 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/BlockEdit.js
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/BlockEdit.js
@@ -4,6 +4,7 @@ import {
     Panel,
     PanelBody,
     PanelRow,
+    RangeControl,
     ResizableBox,
     SelectControl,
     TextareaControl,
@@ -74,6 +75,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
             attributes: {
                 measures,
                 height,
+                chartHeight,
                 type,
                 groupMode,
                 bottomLegend,
@@ -251,6 +253,18 @@ class BlockEdit extends BlockEditWithAPIMetadata {
                         </PanelBody>
                         <SizeConfig setAttributes={setAttributes} panelStatus={this.props.attributes.panelStatus}
                                     height={height}></SizeConfig>
+                        <PanelBody initialOpen={false} title={__("Chart Area Height")}>
+                            <PanelRow>
+                                <RangeControl
+                                    label={__("Chart height (0 = auto: chart fills the box and the legend shares it, legacy behavior). When > 0 the chart uses this height and the legend flows above/below it.")}
+                                    value={chartHeight}
+                                    min={0}
+                                    max={2000}
+                                    step={10}
+                                    onChange={(chartHeight) => setAttributes({ chartHeight: chartHeight ?? 0 })}
+                                />
+                            </PanelRow>
+                        </PanelBody>
                         {/*
                         <PanelBody initialOpen={false} title={__("Info Graphic")}>
                             <PanelRow>
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/BlockSave.js b/plugins/wp-react-blocks-plugin/blocks/charts/BlockSave.js
index f8123797d..6cef1964a 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/BlockSave.js
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/BlockSave.js
@@ -4,6 +4,7 @@ const SaveComponent = (props) => {
     const {
         toggleSelection, setAttributes, attributes: {
             height,
+            chartHeight,
             width,
             type,
             groupMode,
@@ -141,6 +142,7 @@ const SaveComponent = (props) => {
         <div {...blockProps} className={"viz-component"}
              data-component={"chart"}
              data-height={height}
+             data-chart-height={chartHeight}
              data-type={type}
              data-source={source}
              data-dvz-proxy-dataset-id={dvzProxyDatasetId}
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/Format.jsx b/plugins/wp-react-blocks-plugin/blocks/charts/Format.jsx
index 1981c1b4b..c68836de3 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/Format.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/Format.jsx
@@ -1,446 +1,30 @@
-import {PanelRow, SelectControl, TextControl, ToggleControl, PanelBody} from '@wordpress/components';
-import {__} from '@wordpress/i18n';
-
-const styles = [
-    {label: 'Decimal', value: 'decimal'},
-    {label: 'Compacted', value: 'compacted'},
-    {label: 'Currency', value: 'currency'},
-    {label: 'Percent', value: 'percent'}
-]
-
-const currencies = [
-    {"label": "ADB Unit of Account (XUA)", "value": "XUA"},
-    {"label": "Afghani (AFN)", "value": "AFN"},
-    {"label": "Afghani (AFA)", "value": "AFA"},
-    {"label": "Algerian Dinar (DZD)", "value": "DZD"},
-    {"label": "Andorran Peseta (ADP)", "value": "ADP"},
-    {"label": "Argentine Peso (ARS)", "value": "ARS"},
-    {"label": "Armenian Dram (AMD)", "value": "AMD"},
-    {"label": "Aruban Florin (AWG)", "value": "AWG"},
-    {"label": "Austral (ARA)", "value": "ARA"},
-    {"label": "Australian Dollar (AUD)", "value": "AUD"},
-    {"label": "Azerbaijan Manat (AZN)", "value": "AZN"},
-    {"label": "Azerbaijan Manat (AYM)", "value": "AYM"},
-    {"label": "Azerbaijanian Manat (AZM)", "value": "AZM"},
-    {"label": "Bahamian Dollar (BSD)", "value": "BSD"},
-    {"label": "Bahraini Dinar (BHD)", "value": "BHD"},
-    {"label": "Baht (THB)", "value": "THB"},
-    {"label": "Balboa (PAB)", "value": "PAB"},
-    {"label": "Barbados Dollar (BBD)", "value": "BBD"},
-    {"label": "Belarusian Ruble (BYN)", "value": "BYN"},
-    {"label": "Belarusian Ruble (BYB)", "value": "BYB"},
-    {"label": "Belarusian Ruble (BYR)", "value": "BYR"},
-    {"label": "Belgian Franc (BEF)", "value": "BEF"},
-    {"label": "Belize Dollar (BZD)", "value": "BZD"},
-    {"label": "Bermudian Dollar (BMD)", "value": "BMD"},
-    {"label": "Bolívar (VEF)", "value": "VEF"},
-    {"label": "Bolívar Soberano (VES)", "value": "VES"},
-    {"label": "Bolivar (VEB)", "value": "VEB"},
-    {"label": "Bolivar (VEF)", "value": "VEF"},
-    {"label": "Bolivar Fuerte (VEF)", "value": "VEF"},
-    {"label": "Boliviano (BOB)", "value": "BOB"},
-    {
-        "label": "Bond Markets Unit European Composite Unit (EURCO) (XBA)",
-        "value": "XBA"
-    },
-    {
-        "label": "Bond Markets Unit European Monetary Unit (E.M.U.-6) (XBB)",
-        "value": "XBB"
-    },
-    {
-        "label": "Bond Markets Unit European Unit of Account 17 (E.U.A.-17) (XBD)",
-        "value": "XBD"
-    },
-    {
-        "label": "Bond Markets Unit European Unit of Account 9 (E.U.A.-9) (XBC)",
-        "value": "XBC"
-    },
-    {"label": "Brazilian Real (BRL)", "value": "BRL"},
-    {"label": "Brunei Dollar (BND)", "value": "BND"},
-    {"label": "Bulgarian Lev (BGN)", "value": "BGN"},
-    {"label": "Burundi Franc (BIF)", "value": "BIF"},
-    {"label": "Cabo Verde Escudo (CVE)", "value": "CVE"},
-    {"label": "Canadian Dollar (CAD)", "value": "CAD"},
-    {"label": "Cayman Islands Dollar (KYD)", "value": "KYD"},
-    {"label": "Cedi (GHC)", "value": "GHC"},
-    {"label": "CFA Franc BCEAO (XOF)", "value": "XOF"},
-    {"label": "CFA Franc BEAC (XAF)", "value": "XAF"},
-    {"label": "CFP Franc (XPF)", "value": "XPF"},
-    {"label": "Chilean Peso (CLP)", "value": "CLP"},
-    {"label": "Codes specifically reserved for testing purposes (XTS)", "value": "XTS"},
-    {"label": "Colombian Peso (COP)", "value": "COP"},
-    {"label": "Comorian Franc  (KMF)", "value": "KMF"},
-    {"label": "Congolese Franc (CDF)", "value": "CDF"},
-    {"label": "Convertible Franc (BEC)", "value": "BEC"},
-    {"label": "Convertible Mark (BAM)", "value": "BAM"},
-    {"label": "Cordoba (NIC)", "value": "NIC"},
-    {"label": "Cordoba Oro (NIO)", "value": "NIO"},
-    {"label": "Costa Rican Colon (CRC)", "value": "CRC"},
-    {"label": "Croatian Dinar (HRD)", "value": "HRD"},
-    {"label": "Croatian Kuna (HRK)", "value": "HRK"},
-    {"label": "Cruzado (BRC)", "value": "BRC"},
-    {"label": "Cruzeiro (BRB)", "value": "BRB"},
-    {"label": "Cruzeiro (BRE)", "value": "BRE"},
-    {"label": "Cruzeiro Real (BRR)", "value": "BRR"},
-    {"label": "Cuban Peso (CUP)", "value": "CUP"},
-    {"label": "Cyprus Pound (CYP)", "value": "CYP"},
-    {"label": "Czech Koruna (CZK)", "value": "CZK"},
-    {"label": "Dalasi (GMD)", "value": "GMD"},
-    {"label": "Danish Krone (DKK)", "value": "DKK"},
-    {"label": "Denar (MKD)", "value": "MKD"},
-    {"label": "Deutsche Mark (DEM)", "value": "DEM"},
-    {"label": "Dinar (BAD)", "value": "BAD"},
-    {"label": "Djibouti Franc (DJF)", "value": "DJF"},
-    {"label": "Dobra (STN)", "value": "STN"},
-    {"label": "Dobra (STD)", "value": "STD"},
-    {"label": "Dominican Peso (DOP)", "value": "DOP"},
-    {"label": "Dong (VND)", "value": "VND"},
-    {"label": "Drachma (GRD)", "value": "GRD"},
-    {"label": "East Caribbean Dollar (XCD)", "value": "XCD"},
-    {"label": "Egyptian Pound (EGP)", "value": "EGP"},
-    {"label": "Ekwele (GQE)", "value": "GQE"},
-    {"label": "El Salvador Colon (SVC)", "value": "SVC"},
-    {"label": "Ethiopian Birr (ETB)", "value": "ETB"},
-    {"label": "Euro (EUR)", "value": "EUR"},
-    {"label": "European Currency Unit (E.C.U) (XEU)", "value": "XEU"},
-    {"label": "Falkland Islands Pound (FKP)", "value": "FKP"},
-    {"label": "Fiji Dollar (FJD)", "value": "FJD"},
-    {"label": "Financial Franc (BEL)", "value": "BEL"},
-    {"label": "Financial Rand (ZAL)", "value": "ZAL"},
-    {"label": "Forint (HUF)", "value": "HUF"},
-    {"label": "French Franc (FRF)", "value": "FRF"},
-    {"label": "Georgian Coupon (GEK)", "value": "GEK"},
-    {"label": "Ghana Cedi (GHS)", "value": "GHS"},
-    {"label": "Ghana Cedi (GHP)", "value": "GHP"},
-    {"label": "Gibraltar Pound (GIP)", "value": "GIP"},
-    {"label": "Gold (XAU)", "value": "XAU"},
-    {"label": "Gold-Franc (XFO)", "value": "XFO"},
-    {"label": "Gourde (HTG)", "value": "HTG"},
-    {"label": "Guarani (PYG)", "value": "PYG"},
-    {"label": "Guinea Escudo (GWE)", "value": "GWE"},
-    {"label": "Guinea-Bissau Peso (GWP)", "value": "GWP"},
-    {"label": "Guinean Franc (GNF)", "value": "GNF"},
-    {"label": "Guyana Dollar (GYD)", "value": "GYD"},
-    {"label": "Hong Kong Dollar (HKD)", "value": "HKD"},
-    {"label": "Hryvnia (UAH)", "value": "UAH"},
-    {"label": "Iceland Krona (ISK)", "value": "ISK"},
-    {"label": "Indian Rupee (INR)", "value": "INR"},
-    {"label": "Inti (PEI)", "value": "PEI"},
-    {"label": "Iranian Rial (IRR)", "value": "IRR"},
-    {"label": "Iraqi Dinar (IQD)", "value": "IQD"},
-    {"label": "Irish Pound (IEP)", "value": "IEP"},
-    {"label": "Italian Lira (ITL)", "value": "ITL"},
-    {"label": "Jamaican Dollar (JMD)", "value": "JMD"},
-    {"label": "Jordanian Dinar (JOD)", "value": "JOD"},
-    {"label": "Karbovanet (UAK)", "value": "UAK"},
-    {"label": "Kenyan Shilling (KES)", "value": "KES"},
-    {"label": "Kina (PGK)", "value": "PGK"},
-    {"label": "Koruna (CSK)", "value": "CSK"},
-    {"label": "Krona A/53 (CSJ)", "value": "CSJ"},
-    {"label": "Kroon (EEK)", "value": "EEK"},
-    {"label": "Kuna (HRK)", "value": "HRK"},
-    {"label": "Kuwaiti Dinar (KWD)", "value": "KWD"},
-    {"label": "Kwacha (MWK)", "value": "MWK"},
-    {"label": "Kwanza (AOA)", "value": "AOA"},
-    {"label": "Kwanza (AOK)", "value": "AOK"},
-    {"label": "Kwanza Reajustado (AOR)", "value": "AOR"},
-    {"label": "Kyat (MMK)", "value": "MMK"},
-    {"label": "Kyat (BUK)", "value": "BUK"},
-    {"label": "Lao Kip (LAK)", "value": "LAK"},
-    {"label": "Lari (GEL)", "value": "GEL"},
-    {"label": "Latvian Lats (LVL)", "value": "LVL"},
-    {"label": "Latvian Ruble (LVR)", "value": "LVR"},
-    {"label": "Lebanese Pound (LBP)", "value": "LBP"},
-    {"label": "Lek (ALL)", "value": "ALL"},
-    {"label": "Lempira (HNL)", "value": "HNL"},
-    {"label": "Leone (SLL)", "value": "SLL"},
-    {"label": "Leu A/52 (ROK)", "value": "ROK"},
-    {"label": "Lev (BGL)", "value": "BGL"},
-    {"label": "Lev A/52 (BGJ)", "value": "BGJ"},
-    {"label": "Lev A/62 (BGK)", "value": "BGK"},
-    {"label": "Liberian Dollar (LRD)", "value": "LRD"},
-    {"label": "Libyan Dinar (LYD)", "value": "LYD"},
-    {"label": "Lilangeni (SZL)", "value": "SZL"},
-    {"label": "Lithuanian Litas (LTL)", "value": "LTL"},
-    {"label": "Loti (LSL)", "value": "LSL"},
-    {"label": "Loti (LSM)", "value": "LSM"},
-    {"label": "Luxembourg Convertible Franc (LUC)", "value": "LUC"},
-    {"label": "Luxembourg Financial Franc (LUL)", "value": "LUL"},
-    {"label": "Luxembourg Franc (LUF)", "value": "LUF"},
-    {"label": "Malagasy Ariary (MGA)", "value": "MGA"},
-    {"label": "Malagasy Franc (MGF)", "value": "MGF"},
-    {"label": "Malawi Kwacha (MWK)", "value": "MWK"},
-    {"label": "Malaysian Ringgit (MYR)", "value": "MYR"},
-    {"label": "Maldive Rupee (MVQ)", "value": "MVQ"},
-    {"label": "Mali Franc (MLF)", "value": "MLF"},
-    {"label": "Maltese Lira (MTL)", "value": "MTL"},
-    {"label": "Maltese Pound (MTP)", "value": "MTP"},
-    {"label": "Mark der DDR (DDM)", "value": "DDM"},
-    {"label": "Markka (FIM)", "value": "FIM"},
-    {"label": "Mauritius Rupee (MUR)", "value": "MUR"},
-    {"label": "Mexican Peso (MXN)", "value": "MXN"},
-    {"label": "Mexican Peso (MXP)", "value": "MXP"},
-    {"label": "Mexican Unidad de Inversion (UDI) (MXV)", "value": "MXV"},
-    {"label": "Moldovan Leu (MDL)", "value": "MDL"},
-    {"label": "Moroccan Dirham (MAD)", "value": "MAD"},
-    {"label": "Mozambique Escudo (MZE)", "value": "MZE"},
-    {"label": "Mozambique Metical (MZN)", "value": "MZN"},
-    {"label": "Mozambique Metical (MZM)", "value": "MZM"},
-    {"label": "Mvdol (BOV)", "value": "BOV"},
-    {"label": "Naira (NGN)", "value": "NGN"},
-    {"label": "Nakfa (ERN)", "value": "ERN"},
-    {"label": "Namibia Dollar (NAD)", "value": "NAD"},
-    {"label": "Nepalese Rupee (NPR)", "value": "NPR"},
-    {"label": "Netherlands Antillean Guilder (ANG)", "value": "ANG"},
-    {"label": "Netherlands Guilder (NLG)", "value": "NLG"},
-    {"label": "New Cruzado (BRN)", "value": "BRN"},
-    {"label": "New Dinar (YUM)", "value": "YUM"},
-    {"label": "New Israeli Sheqel (ILS)", "value": "ILS"},
-    {"label": "New Kwanza (AON)", "value": "AON"},
-    {"label": "New Romanian Leu  (RON)", "value": "RON"},
-    {"label": "New Taiwan Dollar (TWD)", "value": "TWD"},
-    {"label": "New Turkish Lira (TRY)", "value": "TRY"},
-    {"label": "New Yugoslavian Dinar (YUD)", "value": "YUD"},
-    {"label": "New Zaire (ZRN)", "value": "ZRN"},
-    {"label": "New Zealand Dollar (NZD)", "value": "NZD"},
-    {"label": "Ngultrum (BTN)", "value": "BTN"},
-    {"label": "No universal currency ()", "value": ""},
-    {"label": "North Korean Won (KPW)", "value": "KPW"},
-    {"label": "Norwegian Krone (NOK)", "value": "NOK"},
-    {"label": "Nuevo Sol  (PEN)", "value": "PEN"},
-    {"label": "Old Dong (VNC)", "value": "VNC"},
-    {"label": "Old Krona (ISJ)", "value": "ISJ"},
-    {"label": "Old Lek (ALK)", "value": "ALK"},
-    {"label": "Old Leu (ROL)", "value": "ROL"},
-    {"label": "Old Shekel (ILR)", "value": "ILR"},
-    {"label": "Old Shilling (UGW)", "value": "UGW"},
-    {"label": "Old Turkish Lira (TRL)", "value": "TRL"},
-    {"label": "Old Uruguay Peso (UYN)", "value": "UYN"},
-    {"label": "Ouguiya (MRU)", "value": "MRU"},
-    {"label": "Ouguiya (MRO)", "value": "MRO"},
-    {"label": "Pa'anga (TOP)", "value": "TOP"},
-    {"label": "Pakistan Rupee (PKR)", "value": "PKR"},
-    {"label": "Palladium (XPD)", "value": "XPD"},
-    {"label": "Pataca (MOP)", "value": "MOP"},
-    {"label": "Pathet Lao Kip (LAJ)", "value": "LAJ"},
-    {"label": "Peso (ARY)", "value": "ARY"},
-    {"label": "Peso Argentino (ARP)", "value": "ARP"},
-    {"label": "Peso boliviano (BOP)", "value": "BOP"},
-    {"label": "Peso Convertible (CUC)", "value": "CUC"},
-    {"label": "Peso Uruguayo (UYU)", "value": "UYU"},
-    {"label": "Philippine Peso (PHP)", "value": "PHP"},
-    {"label": "Platinum (XPT)", "value": "XPT"},
-    {"label": "Portuguese Escudo (PTE)", "value": "PTE"},
-    {"label": "Pound (ILP)", "value": "ILP"},
-    {"label": "Pound Sterling (GBP)", "value": "GBP"},
-    {"label": "Pula (BWP)", "value": "BWP"},
-    {"label": "Qatari Rial (QAR)", "value": "QAR"},
-    {"label": "Quetzal (GTQ)", "value": "GTQ"},
-    {"label": "Rand (ZAR)", "value": "ZAR"},
-    {"label": "Rhodesian Dollar (RHD)", "value": "RHD"},
-    {"label": "Rhodesian Dollar (ZWC)", "value": "ZWC"},
-    {"label": "Rial Omani (OMR)", "value": "OMR"},
-    {"label": "Riel (KHR)", "value": "KHR"},
-    {"label": "RINET Funds Code (XRE)", "value": "XRE"},
-    {"label": "Romanian Leu (RON)", "value": "RON"},
-    {"label": "Rouble (SUR)", "value": "SUR"},
-    {"label": "Rufiyaa (MVR)", "value": "MVR"},
-    {"label": "Rupiah (IDR)", "value": "IDR"},
-    {"label": "Russian Ruble (RUB)", "value": "RUB"},
-    {"label": "Russian Ruble (RUR)", "value": "RUR"},
-    {"label": "Rwanda Franc (RWF)", "value": "RWF"},
-    {"label": "Saint Helena Pound (SHP)", "value": "SHP"},
-    {"label": "Saudi Riyal (SAR)", "value": "SAR"},
-    {"label": "Schilling (ATS)", "value": "ATS"},
-    {"label": "SDR (Special Drawing Right) (XDR)", "value": "XDR"},
-    {"label": "Serbian Dinar (RSD)", "value": "RSD"},
-    {"label": "Serbian Dinar (CSD)", "value": "CSD"},
-    {"label": "Seychelles Rupee (SCR)", "value": "SCR"},
-    {"label": "Silver (XAG)", "value": "XAG"},
-    {"label": "Singapore Dollar (SGD)", "value": "SGD"},
-    {"label": "Slovak Koruna (SKK)", "value": "SKK"},
-    {"label": "Sol (PEN)", "value": "PEN"},
-    {"label": "Sol (PEH)", "value": "PEH"},
-    {"label": "Sol (PES)", "value": "PES"},
-    {"label": "Solomon Islands Dollar (SBD)", "value": "SBD"},
-    {"label": "Som (KGS)", "value": "KGS"},
-    {"label": "Somali Shilling (SOS)", "value": "SOS"},
-    {"label": "Somoni (TJS)", "value": "TJS"},
-    {"label": "South Sudanese Pound (SSP)", "value": "SSP"},
-    {"label": "Spanish Peseta (ESP)", "value": "ESP"},
-    {"label": "Spanish Peseta (ESA)", "value": "ESA"},
-    {"label": "Sri Lanka Rupee (LKR)", "value": "LKR"},
-    {"label": "Sucre (XSU)", "value": "XSU"},
-    {"label": "Sucre (ECS)", "value": "ECS"},
-    {"label": "Sudanese Dinar (SDD)", "value": "SDD"},
-    {"label": "Sudanese Pound (SDG)", "value": "SDG"},
-    {"label": "Sudanese Pound (SDP)", "value": "SDP"},
-    {"label": "Surinam Dollar (SRD)", "value": "SRD"},
-    {"label": "Surinam Guilder (SRG)", "value": "SRG"},
-    {"label": "Swedish Krona (SEK)", "value": "SEK"},
-    {"label": "Swiss Franc (CHF)", "value": "CHF"},
-    {"label": "Syli (GNE)", "value": "GNE"},
-    {"label": "Syli (GNS)", "value": "GNS"},
-    {"label": "Syrian Pound (SYP)", "value": "SYP"},
-    {"label": "Tajik Ruble (TJR)", "value": "TJR"},
-    {"label": "Taka (BDT)", "value": "BDT"},
-    {"label": "Tala (WST)", "value": "WST"},
-    {"label": "Talonas (LTT)", "value": "LTT"},
-    {"label": "Tanzanian Shilling (TZS)", "value": "TZS"},
-    {"label": "Tenge (KZT)", "value": "KZT"},
-    {"label": "Timor Escudo (TPE)", "value": "TPE"},
-    {"label": "Tolar (SIT)", "value": "SIT"},
-    {"label": "Trinidad and Tobago Dollar (TTD)", "value": "TTD"},
-    {"label": "Tugrik (MNT)", "value": "MNT"},
-    {"label": "Tunisian Dinar (TND)", "value": "TND"},
-    {"label": "Turkish Lira (TRY)", "value": "TRY"},
-    {"label": "Turkmenistan Manat (TMM)", "value": "TMM"},
-    {"label": "Turkmenistan New Manat (TMT)", "value": "TMT"},
-    {"label": "UAE Dirham (AED)", "value": "AED"},
-    {"label": "Uganda Shilling (UGX)", "value": "UGX"},
-    {"label": "Uganda Shilling (UGS)", "value": "UGS"},
-    {"label": "UIC-Franc (XFU)", "value": "XFU"},
-    {"label": "Unidad de Fomento (CLF)", "value": "CLF"},
-    {"label": "Unidad de Valor Constante (UVC) (ECV)", "value": "ECV"},
-    {"label": "Unidad de Valor Real (COU)", "value": "COU"},
-    {"label": "Unidad Previsional (UYW)", "value": "UYW"},
-    {"label": "Uruguay Peso en Unidades Indexadas (UI) (UYI)", "value": "UYI"},
-    {"label": "Uruguayan Peso (UYP)", "value": "UYP"},
-    {"label": "US Dollar (USD)", "value": "USD"},
-    {"label": "US Dollar (Next day) (USN)", "value": "USN"},
-    {"label": "US Dollar (Same day) (USS)", "value": "USS"},
-    {"label": "Uzbekistan Sum (UZS)", "value": "UZS"},
-    {"label": "Vatu (VUV)", "value": "VUV"},
-    {"label": "WIR Euro (CHE)", "value": "CHE"},
-    {"label": "WIR Franc (CHW)", "value": "CHW"},
-    {"label": "WIR Franc (for electronic) (CHC)", "value": "CHC"},
-    {"label": "Won (KRW)", "value": "KRW"},
-    {"label": "Yemeni Dinar (YDD)", "value": "YDD"},
-    {"label": "Yemeni Rial (YER)", "value": "YER"},
-    {"label": "Yen (JPY)", "value": "JPY"},
-    {"label": "Yuan Renminbi (CNY)", "value": "CNY"},
-    {"label": "Yugoslavian Dinar (YUN)", "value": "YUN"},
-    {"label": "Zaire (ZRZ)", "value": "ZRZ"},
-    {"label": "Zambian Kwacha (ZMW)", "value": "ZMW"},
-    {"label": "Zambian Kwacha (ZMK)", "value": "ZMK"},
-    {"label": "Zimbabwe Dollar (ZWL)", "value": "ZWL"},
-    {"label": "Zimbabwe Dollar (ZWD)", "value": "ZWD"},
-    {"label": "Zimbabwe Dollar (ZWR)", "value": "ZWR"},
-    {"label": "Zimbabwe Dollar (new) (ZWN)", "value": "ZWN"},
-    {"label": "Zimbabwe Dollar (old) (ZWD)", "value": "ZWD"},
-    {"label": "Zloty (PLN)", "value": "PLN"},
-    {"label": "Zloty (PLZ)", "value": "PLZ"}
-]
-
-const DEFAULT_FORMAT = 'DEFAULT';
-const CUSTOM_FORMAT = 'CUSTOM';
-const Format = ({
-                    format,
-                    title,
-                    onFormatChange,
-                    onUseCustomAxisFormatChange,
-                    customFormat,
-                    hiddenCustomAxisFormat,
-                    useCustomAxisFormat
-                }) => {
-
-
-    const onChangeFormat = (style, formatToUpdate) => {
-        const currentFormat = formatToUpdate == DEFAULT_FORMAT ? format : customFormat
-        const field = formatToUpdate == DEFAULT_FORMAT ? 'format' : 'customFormat'
-        onFormatChange(Object.assign({}, currentFormat, {style}), field)
-    }
-
-    const onDecimalChange = (value, formatToUpdate) => {
-        const currentFormat = formatToUpdate == DEFAULT_FORMAT ? format : customFormat
-        const field = formatToUpdate == DEFAULT_FORMAT ? 'format' : 'customFormat'
-        onFormatChange(Object.assign({}, currentFormat, {
-            minimumFractionDigits: value,
-            maximumFractionDigits: value
-        }), field)
-    }
-    const onCurrencyChange = (currency, formatToUpdate) => {
-        const currentFormat = formatToUpdate == DEFAULT_FORMAT ? format : customFormat
-        const field = formatToUpdate == DEFAULT_FORMAT ? 'format' : 'customFormat'
-        onFormatChange(Object.assign({}, currentFormat, {currency}), field)
-    }
-
-
-    return [
-        <PanelBody initialOpen={true} title={__("Default Format")}>
-            <PanelRow>
-                <SelectControl
-                    label={__('Style', "dg")}
-                    value={[format.style]} // e.g: value = [ 'a', 'c' ]
-                    onChange={(value) => {
-                        onChangeFormat(value, DEFAULT_FORMAT)
-                    }}
-                    options={styles}
-                />
-            </PanelRow>
-            <>{format.style === "currency" && <PanelRow>
-                <SelectControl
-                    label={__("Currency", "dg")}
-                    onChange={(value) => {
-                        onCurrencyChange(value, DEFAULT_FORMAT)
-                    }}
-                    value={format.currency}
-                    options={currencies}
-                />
-            </PanelRow>}</>
-            <PanelRow>
-                <TextControl
-                    type={"Number"}
-                    label={__("Decimal Points", "dg")}
-                    onChange={(value) => {
-                        onDecimalChange(value, DEFAULT_FORMAT)
-                    }}
-                    value={format.minimumFractionDigits}
-                />
-            </PanelRow>
-        </PanelBody>, <>
-            {!hiddenCustomAxisFormat && <PanelRow>
-                <ToggleControl label={__("Use Custom Axis Format", "dg")} checked={useCustomAxisFormat}
-                               onChange={(value) => onUseCustomAxisFormatChange(value)}/>
-            </PanelRow>
-            }
-        </>
-        ,
-        <>
-            {useCustomAxisFormat && <PanelBody initialOpen={true} title={__("Custom Axis Format")}>
-                <PanelRow>
-                    <SelectControl
-                        label={__('Style', "dg")}
-                        value={[customFormat.style]} // e.g: value = [ 'a', 'c' ]
-                        onChange={(value) => {
-                            onChangeFormat(value, CUSTOM_FORMAT)
-                        }}
-                        options={styles}
-                    />
-                </PanelRow>
-                <>{customFormat.style === "currency" && <PanelRow>
-                    <SelectControl
-                        label={__("Currency", "dg")}
-                        onChange={(value) => {
-                            onCurrencyChange(value, CUSTOM_FORMAT)
-                        }}
-                        value={customFormat.currency}
-                        options={currencies}
-                    />
-                </PanelRow>}</>
-                <PanelRow>
-                    <TextControl
-                        type={"Number"}
-                        label={__("Decimal Points", "dg")}
-                        onChange={(value) => {
-                            onDecimalChange(value, CUSTOM_FORMAT)
-                        }}
-                        value={customFormat.minimumFractionDigits}
-                    />
-                </PanelRow>
-            </PanelBody>}</>
-
-    ]
-}
-
-export default Format
\ No newline at end of file
+/**
+ * @deprecated
+ *
+ * THIS FILE IS DEPRECATED AND MUST NOT BE USED.
+ *
+ * Use the Format component from the shared commons package instead:
+ *
+ *   import { Format } from '@devgateway/dvz-wp-commons';
+ *
+ * This file exists only to surface a loud runtime error if it is accidentally
+ * re-introduced. It does NOT contain the real implementation — that lives in:
+ *
+ *   data-viz-wordpress/packages/commons/src/Format.jsx
+ *
+ * To expose Prefix / Suffix fields, pass the showPrefixSuffix={true} prop.
+ */
+
+import { Format as CommonsFormat } from '@devgateway/dvz-wp-commons';
+
+const DeprecatedFormat = (props) => {
+    console.error(
+        '[DEPRECATED] charts/Format.jsx is deprecated and must not be used.\n' +
+        'Import Format from @devgateway/dvz-wp-commons instead:\n' +
+        "  import { Format } from '@devgateway/dvz-wp-commons';\n" +
+        'To expose Prefix/Suffix fields pass showPrefixSuffix={true}.'
+    );
+    return <CommonsFormat {...props} />;
+};
+
+export default DeprecatedFormat;
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/GroupTotalSetting.jsx b/plugins/wp-react-blocks-plugin/blocks/charts/GroupTotalSetting.jsx
index 84829d3e9..73c4e5a0a 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/GroupTotalSetting.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/GroupTotalSetting.jsx
@@ -1,6 +1,6 @@
 import {PanelBody, PanelRow, RangeControl, SelectControl, TextControl, ToggleControl} from '@wordpress/components';
 import {__} from '@wordpress/i18n';
-import Format from "./Format.jsx";
+import { Format } from '@devgateway/dvz-wp-commons';
 import Papa from "papaparse";
 
 const Settings = ({setAttributes,allMeasures,
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/Info.jsx b/plugins/wp-react-blocks-plugin/blocks/charts/Info.jsx
index 396b8b447..7227f49d3 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/Info.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/Info.jsx
@@ -1,7 +1,7 @@
 import {AnglePickerControl, PanelBody, PanelRow, SelectControl} from '@wordpress/components';
 import {__} from '@wordpress/i18n';
 import { ChartColors, ChartLegends} from '@devgateway/dvz-wp-commons'
-import Format from "./Format.jsx";
+import { Format } from '@devgateway/dvz-wp-commons';
 
 const PieOptions = (props) => {
     const {setAttributes, attributes: {figure}} = props;
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/Line.jsx b/plugins/wp-react-blocks-plugin/blocks/charts/Line.jsx
index 1c221d4ea..50b2b525d 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/Line.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/Line.jsx
@@ -4,7 +4,7 @@ import {__} from '@wordpress/i18n';
 import { ChartColors, ChartLegends} from '@devgateway/dvz-wp-commons'
 import AxisConfig from './AxisConfig.jsx'
 import Labels from "./Labels.jsx"
-import Format from "./Format.jsx"
+import { Format } from '@devgateway/dvz-wp-commons'
 import Papa from 'papaparse'
 import Sort from "./Sort.jsx"
 
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/README.md b/plugins/wp-react-blocks-plugin/blocks/charts/README.md
index c75a323b5..b782d9580 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/README.md
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/README.md
@@ -59,7 +59,7 @@ A Gutenberg block that embeds a configurable data visualisation chart (Bar, Line
 | `dualMode` | Boolean | `false` | Enable toggling between chart and info-graphic views |
 | `toggleInfoLabel` | String | `"Info Graphic"` | Button label for info view |
 | `toggleChartLabel` | String | `"Chart"` | Button label for chart view |
-| `dataSource` | String | `"NIDS"` | Data source attribution text |
+| `dataSource` | String | `"Source"` | Data source attribution text |
 | `dataSourceLabel` | String | `"Source"` | Label preceding the data source text |
 
 ### Pie / Radar (selected)
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/Radar.jsx b/plugins/wp-react-blocks-plugin/blocks/charts/Radar.jsx
index 0b6b62253..3e63997f8 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/Radar.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/Radar.jsx
@@ -3,7 +3,7 @@ import {__} from '@wordpress/i18n';
 import { ChartColors, ChartLegends} from '@devgateway/dvz-wp-commons'
 import AxisConfig from './AxisConfig.jsx'
 import Labels from "./Labels.jsx"
-import Format from "./Format.jsx"
+import { Format } from '@devgateway/dvz-wp-commons'
 import Papa from 'papaparse'
 
 
diff --git a/plugins/wp-react-blocks-plugin/blocks/charts/index.js b/plugins/wp-react-blocks-plugin/blocks/charts/index.js
index 100a7b673..60aa620c5 100644
--- a/plugins/wp-react-blocks-plugin/blocks/charts/index.js
+++ b/plugins/wp-react-blocks-plugin/blocks/charts/index.js
@@ -1,8 +1,8 @@
-import {__} from '@wordpress/i18n';
-import {registerBlockType} from '@wordpress/blocks';
+import { __ } from '@wordpress/i18n';
+import { registerBlockType } from '@wordpress/blocks';
 import BlockSave from "./BlockSave";
 import BlockEdit from "./BlockEdit";
-import {ChartIcon, BLOCKS_NS, BLOCKS_CATEGORY} from '@devgateway/dvz-wp-commons'
+import { ChartIcon, BLOCKS_NS, BLOCKS_CATEGORY } from '@devgateway/dvz-wp-commons'
 
 registerBlockType(BLOCKS_NS + '/chart',
     {
@@ -16,6 +16,16 @@ registerBlockType(BLOCKS_NS + '/chart',
                 default: 500,
             },
 
+            // Optional explicit chart-area height, decoupled from the total
+            // `height` (the resizable box). When > 0, the chart renders at this
+            // height and the legend flows naturally above/below it; the container
+            // grows to fit. When 0 (default) the legacy behavior is kept, so
+            // existing charts are unaffected.
+            chartHeight: {
+                type: 'number',
+                default: 0,
+            },
+
             type: {
                 type: 'string',
                 default: "bar",
@@ -89,7 +99,7 @@ registerBlockType(BLOCKS_NS + '/chart',
             },
             dataSource: {
                 type: 'String',
-                default: "NIDS"
+                default: "Source"
             },
 
             legendPosition: {
@@ -344,10 +354,10 @@ registerBlockType(BLOCKS_NS + '/chart',
             types: {
                 type: "Array",
                 default: [
-                    {label: 'Bar', value: 'bar', supports: {singleMeasure: false, singleDimension: false}},
-                    {label: 'Pie', value: 'pie', supports: {singleMeasure: false, singleDimension: false}},
-                    {label: 'Line', value: 'line', supports: {singleMeasure: false, singleDimension: true}},
-                    {label: 'Radar', value: 'radar', supports: {singleMeasure: true, singleDimension: true}}
+                    { label: 'Bar', value: 'bar', supports: { singleMeasure: false, singleDimension: false } },
+                    { label: 'Pie', value: 'pie', supports: { singleMeasure: false, singleDimension: false } },
+                    { label: 'Line', value: 'line', supports: { singleMeasure: false, singleDimension: true } },
+                    { label: 'Radar', value: 'radar', supports: { singleMeasure: true, singleDimension: true } }
                 ]
             },
             barColor: {
diff --git a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Data.jsx b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Data.jsx
index 691f808d0..5e75da487 100644
--- a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Data.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Data.jsx
@@ -16,7 +16,7 @@ import Property from "./utils/Property";
 import BreaksGenerator from "./utils/BreaksGenerator";
 import { PanelColorSettings } from "@wordpress/block-editor";
 import PatternGenerator from "./utils/PatternGenerator";
-import Format from '../../charts/Format.jsx'
+import { Format } from '@devgateway/dvz-wp-commons'
 import { isSupersetAPI } from '@devgateway/dvz-wp-commons';
 import GradientGenerator from "./utils/GradientGenerator";
 
diff --git a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Flow.jsx b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Flow.jsx
index 66c18afb0..bacd78d71 100644
--- a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Flow.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/Flow.jsx
@@ -16,7 +16,7 @@ import Property from "./utils/Property";
 import BreaksGenerator from "./utils/BreaksGenerator";
 import { PanelColorSettings } from "@wordpress/block-editor";
 import PatternGenerator from "./utils/PatternGenerator";
-import Format from '../../charts/Format.jsx';
+import { Format } from '@devgateway/dvz-wp-commons';
 import { isSupersetAPI } from '@devgateway/dvz-wp-commons';
 
 const FilterSelector = ({ param, index, options, onUpdateFilterParam }) => {
diff --git a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/utils/MapMeasures.jsx b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/utils/MapMeasures.jsx
index d2f090171..00d015012 100644
--- a/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/utils/MapMeasures.jsx
+++ b/plugins/wp-react-blocks-plugin/blocks/d3Map/layers/utils/MapMeasures.jsx
@@ -1,7 +1,7 @@
 import {__} from '@wordpress/i18n';
 import {CheckboxControl, PanelBody, PanelRow, SelectControl, ToggleControl} from '@wordpress/components';
 
-import Format from '../../../charts/Format.jsx'
+import { Format } from '@devgateway/dvz-wp-commons'
 import {togglePanel} from '@devgateway/dvz-wp-commons';
 import {getTranslation} from '@devgateway/dvz-wp-commons';
 
diff --git a/plugins/wp-react-blocks-plugin/blocks/data-paragraph/BlockEdit.js b/plugins/wp-react-blocks-plugin/blocks/data-paragraph/BlockEdit.js
index 83d15dfe2..fb0c12456 100644
--- a/plugins/wp-react-blocks-plugin/blocks/data-paragraph/BlockEdit.js
+++ b/plugins/wp-react-blocks-plugin/blocks/data-paragraph/BlockEdit.js
@@ -29,7 +29,7 @@ import {
     isSupersetAPI
 } from '@devgateway/dvz-wp-commons';
 
-import Format from "../charts/Format.jsx";
+import { Format } from '@devgateway/dvz-wp-commons';
 import '@wordpress/format-library';
 
 
diff --git a/plugins/wp-react-blocks-plugin/blocks/grouped-bars/BlockEdit.js b/plugins/wp-react-blocks-plugin/blocks/grouped-bars/BlockEdit.js
index 895ae2ae4..f7a9d70bf 100644
--- a/plugins/wp-react-blocks-plugin/blocks/grouped-bars/BlockEdit.js
+++ b/plugins/wp-react-blocks-plugin/blocks/grouped-bars/BlockEdit.js
@@ -17,7 +17,7 @@ import {togglePanel} from '@devgateway/dvz-wp-commons';
 import {Measures} from '@devgateway/dvz-wp-commons';
 import {DataFilters} from '@devgateway/dvz-wp-commons';
 import {isSupersetAPI} from '@devgateway/dvz-wp-commons';
-import Format from "../charts/Format.jsx";
+import { Format } from '@devgateway/dvz-wp-commons';
 import {getTranslation} from '@devgateway/dvz-wp-commons';
 
 const defaultFormat = {
@@ -399,6 +399,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
                                             format={format}
                                             customFormat={{}}
                                             useCustomAxisFormat={false}
+                                            showPrefixSuffix={true}
                                             onFormatChange={(newFormat, field) => {
                                                 console.log("newFormat", newFormat)
                                                 setAttributes({format: newFormat})
@@ -798,6 +799,7 @@ class BlockEdit extends BlockEditWithAPIMetadata {
                                                     format={selectedMap[k].format || defaultFormat}
                                                     customFormat={{}}
                                                     useCustomAxisFormat={false}
+                                                    showPrefixSuffix={true}
                                                     onFormatChange={(newFormat) => this.updateMeasureFormat(k, newFormat)}
                                                     onUseCustomAxisFormatChange={() => {}}
                                                 />
diff --git a/plugins/wp-react-blocks-plugin/blocks/map/README.md b/plugins/wp-react-blocks-plugin/blocks/map/README.md
index b3a18775d..ba622194d 100644
--- a/plugins/wp-react-blocks-plugin/blocks/map/README.md
+++ b/plugins/wp-react-blocks-plugin/blocks/map/README.md
@@ -37,7 +37,7 @@ A Gutenberg block that renders an interactive choropleth/symbol map by embedding
 | `showOverallValue` | `Boolean` | `false` | Display an overall/national average value on the map. |
 | `nationalAverageLabel` | `String` | `"National Prevalence Avg"` | Label for the national average annotation. |
 | `dataSourceLabel` | `String` | `"Source"` | Label prefix for the data source credit. |
-| `dataSourceText` | `String` | `"NIDS"` | Data source credit text. |
+| `dataSourceText` | `String` | `"Source"` | Data source credit text. |
 | `labelFontSize` | `Numeric` | `12` | Font size (px) for admin unit labels on the map. |
 | `labelFontWeight` | `String` | `"normal"` | Font weight for admin unit labels. |
 | `labelFontColor` | `String` | `"%23595959"` (URL-encoded `#595959`) | Colour for admin unit labels. |
diff --git a/plugins/wp-react-blocks-plugin/blocks/map/index.js b/plugins/wp-react-blocks-plugin/blocks/map/index.js
index a52f7d079..da609bc3f 100644
--- a/plugins/wp-react-blocks-plugin/blocks/map/index.js
+++ b/plugins/wp-react-blocks-plugin/blocks/map/index.js
@@ -1,10 +1,10 @@
-import {__} from '@wordpress/i18n';
-import {registerBlockType} from '@wordpress/blocks';
+import { __ } from '@wordpress/i18n';
+import { registerBlockType } from '@wordpress/blocks';
 import BlockSave from "./BlockSave";
 import BlockEdit from "./BlockEdit";
-import {GenericIcon, BLOCKS_NS, BLOCKS_CATEGORY} from '@devgateway/dvz-wp-commons';
+import { GenericIcon, BLOCKS_NS, BLOCKS_CATEGORY } from '@devgateway/dvz-wp-commons';
 
-registerBlockType(BLOCKS_NS+'/map',
+registerBlockType(BLOCKS_NS + '/map',
     {
         title: __('Data Map'),
         icon: GenericIcon,
@@ -21,7 +21,7 @@ registerBlockType(BLOCKS_NS+'/map',
             },
             dataSourceText: {
                 type: 'String',
-                default: "NIDS"
+                default: "Source"
             },
             source: {
                 type: 'string',
@@ -62,22 +62,22 @@ registerBlockType(BLOCKS_NS+'/map',
             },
             types: {
                 type: "Array",
-                default: [{label: 'Map', value: 'map', supports: {singleMeasure: false, singleDimension: false}}]
+                default: [{ label: 'Map', value: 'map', supports: { singleMeasure: false, singleDimension: false } }]
             },
-            showLegendLabels:{
-                type:'Boolean',
+            showLegendLabels: {
+                type: 'Boolean',
                 default: false
             },
             legendBreaks: {
                 type: "Array",
-                default: [{ min: 0, max: 2.99, color: '#66A3D9', label: '', filters: []}, { min: 3, max: 4.99, color: '#BC91D9', label: '', filters: []}, { min: 5, color: '#F26363', label: '', filters: []}]
+                default: [{ min: 0, max: 2.99, color: '#66A3D9', label: '', filters: [] }, { min: 3, max: 4.99, color: '#BC91D9', label: '', filters: [] }, { min: 5, color: '#F26363', label: '', filters: [] }]
             },
             showNoDataLegendItem: {
-                type:'Boolean',
+                type: 'Boolean',
                 default: false
             },
-            zoomEnabled:{
-                type:'Boolean',
+            zoomEnabled: {
+                type: 'Boolean',
                 default: false
             },
             mapFile: {
@@ -86,7 +86,7 @@ registerBlockType(BLOCKS_NS+'/map',
             },
             enabledLayers: {
                 type: "Array",
-                default:[]
+                default: []
             },
             mainLayerId: {
                 type: "String",
@@ -101,38 +101,38 @@ registerBlockType(BLOCKS_NS+'/map',
                 default: "zone"
             },
             hasMultipleMeasures: {
-                type:'Boolean',
+                type: 'Boolean',
                 default: false
             },
-            mapCenter:{
+            mapCenter: {
                 type: "String",
                 default: "NGA"
             },
-            mapLabelShowValue:{
-                type:'Boolean',
+            mapLabelShowValue: {
+                type: 'Boolean',
                 default: false
             },
-            showTooltip:{
-                type:'Boolean',
+            showTooltip: {
+                type: 'Boolean',
                 default: true
             },
             measureSelectorLabel: {
                 type: "String",
                 default: ""
             },
-            valueFormat:{
+            valueFormat: {
                 type: "String",
                 default: "%({value},2)"
             },
-            showOverallValue:{
-                type:'Boolean',
+            showOverallValue: {
+                type: 'Boolean',
                 default: false
             },
             autoGenerateBreaks: {
-                type:'Boolean',
+                type: 'Boolean',
                 default: false
             },
-            numberOfBreaks:{
+            numberOfBreaks: {
                 type: 'Numeric',
                 default: 5
             },
@@ -141,14 +141,14 @@ registerBlockType(BLOCKS_NS+'/map',
                 default: 'reds'
             },
             showNoDataLabel: {
-                type:'Boolean',
+                type: 'Boolean',
                 default: false
             },
             group: {
                 type: 'String',
                 default: 'default',
             },
-            mapSymbols:{
+            mapSymbols: {
                 type: 'Array',
                 default: []
             },
@@ -168,11 +168,11 @@ registerBlockType(BLOCKS_NS+'/map',
                 type: 'String',
                 default: 'normal',
             },
-            legendFontSize:{
+            legendFontSize: {
                 type: 'Numeric',
                 default: 12,
             },
-            legendFontWeight:{
+            legendFontWeight: {
                 type: 'String',
                 default: 'normal',
             },
@@ -192,7 +192,7 @@ registerBlockType(BLOCKS_NS+'/map',
                 type: "String",
                 default: "USD"
             },
-            tooltipFontSize:{
+            tooltipFontSize: {
                 type: 'Numeric',
                 default: 14,
             },
@@ -216,20 +216,20 @@ registerBlockType(BLOCKS_NS+'/map',
                 type: 'String',
                 default: encodeURIComponent("#000"),
             },
-            highlightedLocation:{
+            highlightedLocation: {
                 type: "String",
                 default: ""
             },
-            highlightedLocLabelFormat:{
+            highlightedLocLabelFormat: {
                 type: "String",
                 default: "{locationName} - Score: #({value},2)"
             },
-            tooltipFormat:{
+            tooltipFormat: {
                 type: "String",
                 default: "{locationName} %({value},2) \n {label}: %({value},2)"
             },
             showNoDataTooltip: {
-                type:'Boolean',
+                type: 'Boolean',
                 default: false
             },
             mapContainerBgColor: {
@@ -256,7 +256,7 @@ registerBlockType(BLOCKS_NS+'/map',
                 type: "Object",
                 default: {}
             },
-            pointLabelFormat:{
+            pointLabelFormat: {
                 type: "String",
                 default: "%({value},2)"
             },
@@ -273,19 +273,19 @@ registerBlockType(BLOCKS_NS+'/map',
                 default: ""
             },
             enableSummaryView: {
-                type:'Boolean',
+                type: 'Boolean',
                 default: false
             },
             aggregationFormula: {
                 type: 'String',
                 default: "COUNT"
             },
-            zoomLevelToShowPoints:{
+            zoomLevelToShowPoints: {
                 type: "Numeric",
                 default: 2
             },
             zoomOnFilter: {
-                type:'Boolean',
+                type: 'Boolean',
                 default: false
             },
             zoomOnFilterField: {
diff --git a/plugins/wp-react-blocks-plugin/blocks/measures/BlockEdit.js b/plugins/wp-react-blocks-plugin/blocks/measures/BlockEdit.js
index bd01170f5..2022db2bf 100644
--- a/plugins/wp-react-blocks-plugin/blocks/measures/BlockEdit.js
+++ b/plugins/wp-react-blocks-plugin/blocks/measures/BlockEdit.js
@@ -12,7 +12,7 @@ import {
 } from '@wordpress/components';
 import {__} from '@wordpress/i18n';
 import {BlockEditWithAPIMetadata} from '@devgateway/dvz-wp-commons'
-import Format from '../charts/Format.jsx'
+import { Format } from '@devgateway/dvz-wp-commons'
 import {useState} from "@wordpress/element";
 import {v4 as uuidv4} from "uuid";
 
diff --git a/plugins/wp-react-blocks-plugin/blocks/pdf-button/index.js b/plugins/wp-react-blocks-plugin/blocks/pdf-button/index.js
index cda50761c..9e085395a 100644
--- a/plugins/wp-react-blocks-plugin/blocks/pdf-button/index.js
+++ b/plugins/wp-react-blocks-plugin/blocks/pdf-button/index.js
@@ -1,8 +1,8 @@
-import {__} from '@wordpress/i18n';
-import {registerBlockType} from '@wordpress/blocks';
+import { __ } from '@wordpress/i18n';
+import { registerBlockType } from '@wordpress/blocks';
 import BlockSave from "./BlockSave";
 import BlockEdit from "./BlockEdit";
-import {GenericIcon, BLOCKS_NS, BLOCKS_CATEGORY} from '@devgateway/dvz-wp-commons';
+import { GenericIcon, BLOCKS_NS, BLOCKS_CATEGORY } from '@devgateway/dvz-wp-commons';
 
 registerBlockType(BLOCKS_NS + 'viz-components/pdf-button',
     {
@@ -12,7 +12,7 @@ registerBlockType(BLOCKS_NS + 'viz-components/pdf-button',
         attributes: {
             buttonLabel: {
                 type: 'string',
-                default: "Download Prevalence Factsheet"
+                default: "Download"
             },
             height: {
                 type: 'Numeric',
@@ -42,4 +42,4 @@ registerBlockType(BLOCKS_NS + 'viz-components/pdf-button',
         save: BlockSave,
     }
 )
-;
+    ;
diff --git a/wp-theme/_admin_styles.php b/wp-theme/_admin_styles.php
index 64c64e167..6801aa63f 100644
--- a/wp-theme/_admin_styles.php
+++ b/wp-theme/_admin_styles.php
@@ -3,11 +3,17 @@
 
 function admin_style()
 {
-
+    // Load semantic-ui only on admin pages that need it (not the block editor canvas).
     wp_enqueue_style('semantic-styles', 'https://cdn.jsdelivr.net/npm/semantic-ui-css@2.5.0/semantic.min.css');
     wp_enqueue_style('react-styles_common', '/../scss/themes/common.css');
+}
+add_action('admin_enqueue_scripts', 'admin_style');
+
+// editor.css is scoped to .editor-styles-wrapper and must only load inside
+// the Gutenberg block editor — not on settings pages, plugins, etc.
+function block_editor_style()
+{
     wp_register_style('admin', get_stylesheet_directory_uri() . '/css/editor.css');
     wp_enqueue_style('admin');
-
 }
-add_action('admin_enqueue_scripts', 'admin_style');
\ No newline at end of file
+add_action('enqueue_block_editor_assets', 'block_editor_style');
\ No newline at end of file
diff --git a/wp-theme/_settings.php b/wp-theme/_settings.php
index 7688b1439..7c74e9070 100644
--- a/wp-theme/_settings.php
+++ b/wp-theme/_settings.php
@@ -284,7 +284,13 @@ function wp_superset_cache_evict_callback()
                 }
                 return Promise.all(
                     supersetApps.map(function (app) {
-                        return fetch('/api/' + app + '/cacheEvict');
+                        return fetch('/api/' + app + '/cacheEvict')
+                            .then(function (response) {
+                                if (!response.ok) {
+                                    throw new Error('Cache eviction failed for ' + app + ': ' + response.status + ' ' + response.statusText);
+                                }
+                                return response;
+                            });
                     })
                 );
             })