diff --git a/README.md b/README.md
index 5644f98b8..c2e68e379 100644
--- a/README.md
+++ b/README.md
@@ -252,6 +252,7 @@ The file `common.ts` with type [`AppConfig`](src/config/types.ts) contains impor
 - `selectedConnectors`: List of connectors to make available by default in the wallet selection modal that will be shown even if the connector is not injected.
 - `blockedConnectors`: List of EIP-6963 injected connectors names to block in the wallet selection modal.
 - `isSimulatorEnabled`: Flag to enable the simulation page.
+- `showStrategyRoi`: Optional flag to show the Strategy ROI in the Strategy Block. ROI is hidden by default.
 - `network`
   - `name`: Network name.
   - `logoUrl`: Network logo URL.
@@ -265,7 +266,7 @@ The file `common.ts` with type [`AppConfig`](src/config/types.ts) contains impor
 - `popularTokens`: List of popular tokens to be used in the app when opening the token selection modal.
 - `addresses`/`carbon` and `addresses/utils`: CarbonController, Voucher and multicall3 contract addresses.
 - `tokenListOverride`: Token list override to be used in the app when fetching the token list. Tokens in the list will override any other token with the same address.
-- `tokenLists`: List of token lists including the uri and the parser to be used to parse the token list.
+- `tokenLists`: List of token lists including the uri and the parser name to be used to parse the token list. Please update the tokenParserMap in the `src/config/utils.ts` file to include the parser name and the parser function.
 - `sdk`/`cacheTTL`: When the app loads, it will ignore any cached data if it is older than the cacheTTL time in milliseconds. If set to 0, the app will always ignore the cache data and fetch new data on load.
 
 #### Gas token different than native token
diff --git a/e2e/screenshots/simulator/recurring/Recurring_limit_range/form.png b/e2e/screenshots/simulator/recurring/Recurring_limit_range/form.png
index 54cbc496d..c26dc5bac 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_limit_range/form.png and b/e2e/screenshots/simulator/recurring/Recurring_limit_range/form.png differ
diff --git a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png
index d9546b0d3..4d6d4fb7e 100644
Binary files a/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png and b/e2e/screenshots/simulator/recurring/Recurring_range_limit/simulator-input-price.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png
index d012724ae..3b2bdac69 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png
index e0ffd028c..f5d89df50 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_limit/undercut/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png
index 01bccea18..2ac84b336 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png
index 1c105efb7..5055e9ee6 100644
Binary files a/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png and b/e2e/screenshots/strategy/disposable/Disposable_buy_range/duplicate/form.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png b/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png
index 62f54338d..995d5e871 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png and b/e2e/screenshots/strategy/overlapping/Overlapping/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png
index ab60f2da7..454add18d 100644
Binary files a/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png and b/e2e/screenshots/strategy/overlapping/Overlapping/withdraw/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png
index 20f5e1b83..5e6358bb2 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_limit/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png
index 64f442ea7..5563723e5 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png
index 43ccb6519..c3a5b7494 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png
index 5cc16c78c..8f1ade80d 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/deposit/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png
index 22995cc8b..9b0ceea46 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_limit_range/renew/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png
index 332ea572d..31e78a83e 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_limit/renew/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png
index d3e1e1e4f..c6dec19f6 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/form.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png
index 9806983f8..a96eaefd9 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/create/my-strategy.png differ
diff --git a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png
index 916100a35..724d3887e 100644
Binary files a/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png and b/e2e/screenshots/strategy/recurring/Recurring_range_range/duplicate/form.png differ
diff --git a/package.json b/package.json
index 4438035e9..e3584eae3 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "tailwindcss": "3.4.3",
     "typechain": "^8.1.0",
     "typescript": "^5.3.3",
-    "valibot": "^0.28.1",
+    "valibot": "^0.34.0",
     "viem": "2.x",
     "vite": "5.3.2",
     "vite-plugin-svgr": "^2.4.0",
diff --git a/src/components/activity/ActivityProvider.tsx b/src/components/activity/ActivityProvider.tsx
index 33e130606..a5f43d68b 100644
--- a/src/components/activity/ActivityProvider.tsx
+++ b/src/components/activity/ActivityProvider.tsx
@@ -59,8 +59,8 @@ type ParamsKey = Extract<keyof QueryActivityParams, string>;
 export const ActivityProvider: FC<Props> = ({ children, params }) => {
   const nav = useNavigate();
   const searchParams: ActivitySearchParams = useSearch({ strict: false });
-  const limit = searchParams.limit ?? 10;
-  const offset = searchParams.offset ?? 0;
+  const limit = searchParams.limit;
+  const offset = searchParams.offset;
 
   const queryParams = getQueryParams(params, searchParams);
   // Query the list
diff --git a/src/components/activity/utils.ts b/src/components/activity/utils.ts
index 60701ac29..a221f2398 100644
--- a/src/components/activity/utils.ts
+++ b/src/components/activity/utils.ts
@@ -4,7 +4,7 @@ import {
   SearchParamsValidator,
   validArrayOf,
   validLiteral,
-  validNumberType,
+  validNumber,
   validString,
   validateSearchParams,
 } from 'libs/routing/utils';
@@ -45,10 +45,21 @@ export const activityValidators: SearchParamsValidator<ActivitySearchParams> = {
   pairs: validArrayOf(validString),
   start: validString,
   end: validString,
-  limit: validNumberType,
-  offset: validNumberType,
+  limit: validNumber,
+  offset: validNumber,
+};
+export const validateActivityParams = (
+  search: Record<string, string>
+): ActivitySearchParams => {
+  const rawSearch = validateSearchParams(activityValidators)(search);
+  const limit = Number(rawSearch.limit ?? 10);
+  const offset = Number(rawSearch.offset ?? 0);
+  return {
+    ...rawSearch,
+    limit,
+    offset,
+  };
 };
-export const validateActivityParams = validateSearchParams(activityValidators);
 
 export const activityHasPairs = (activity: Activity, pairs: string[] = []) => {
   if (pairs.length === 0) return true;
diff --git a/src/components/common/approval/ApproveToken.tsx b/src/components/common/approval/ApproveToken.tsx
index f3ea18af8..15c653b0b 100644
--- a/src/components/common/approval/ApproveToken.tsx
+++ b/src/components/common/approval/ApproveToken.tsx
@@ -39,7 +39,7 @@ export const ApproveToken: FC<Props> = ({
   const { getTokenById } = useTokens();
   const token = getTokenById(data?.address || '');
   const mutation = useSetUserApproval();
-  // Gasprice on SEI is cheap, best practice is to use exact amount approval
+  // When gasprice is cheap, best practice is to use exact amount approval
   const [isLimited, setIsLimited] = useState(
     !!config.network.defaultLimitedApproval
   );
diff --git a/src/components/core/error/ErrorUserBlocked.tsx b/src/components/core/error/ErrorUserBlocked.tsx
index 9e7d8468c..f308c5239 100644
--- a/src/components/core/error/ErrorUserBlocked.tsx
+++ b/src/components/core/error/ErrorUserBlocked.tsx
@@ -3,6 +3,7 @@ import { NewTabLink, externalLinks } from 'libs/routing';
 import { ErrorWrapper } from 'components/core/error/ErrorWrapper';
 import { Button } from 'components/common/button';
 import { ReactComponent as IconWarning } from 'assets/icons/warning.svg';
+import config from 'config';
 
 export const ErrorUserBlocked = () => {
   const { disconnect } = useWagmi();
@@ -11,7 +12,7 @@ export const ErrorUserBlocked = () => {
     <ErrorWrapper
       icon={<IconWarning />}
       title="Wallet Blocked"
-      text="For compliance reasons, this wallet has been blocked from using the Carbon App."
+      text={`For compliance reasons, this wallet has been blocked from using the ${config.appName} App.`}
       variant="error"
     >
       <div className="space-y-10">
diff --git a/src/components/debug/DebugConfig.tsx b/src/components/debug/DebugConfig.tsx
new file mode 100644
index 000000000..def02243d
--- /dev/null
+++ b/src/components/debug/DebugConfig.tsx
@@ -0,0 +1,97 @@
+import { FormEvent, useLayoutEffect, useRef, useState } from 'react';
+import { lsService } from 'services/localeStorage';
+import { Button } from 'components/common/button';
+import { Warning } from 'components/common/WarningMessageWithIcon';
+import { defaultConfig } from 'config';
+import { AppConfigSchema } from 'config/configSchema';
+import { AppConfig } from 'config/types';
+import * as v from 'valibot';
+
+const formatConfig = (config?: Partial<AppConfig>) =>
+  JSON.stringify(config, undefined, 4);
+
+export const DebugConfig = () => {
+  const savedConfigOverride = formatConfig(lsService.getItem('configOverride'));
+  const [configOverride, setConfigOverride] = useState(savedConfigOverride);
+  const [error, setError] = useState('');
+  const textAreaRef = useRef<HTMLTextAreaElement>(null);
+
+  const errorMessage = 'Failed parsing JSON file';
+  const saveConfigOverride = (configOverride?: string) => {
+    try {
+      if (!configOverride) {
+        setConfigOverride('');
+        lsService.removeItem('configOverride');
+      } else {
+        const parsedConfig = JSON.parse(configOverride || '');
+        v.parse(v.partial(AppConfigSchema), parsedConfig);
+        lsService.setItem('configOverride', parsedConfig);
+      }
+      setError('');
+      window?.location.reload();
+    } catch (error) {
+      setError(errorMessage);
+    }
+  };
+
+  const handleConfigChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    setConfigOverride(e.target.value);
+  };
+
+  useLayoutEffect(() => {
+    if (!textAreaRef.current) return;
+    textAreaRef.current.style.height = 'inherit'; // to reduce on delete
+    const defaultHeight = 5; // px
+    const newHeight = Math.max(textAreaRef.current.scrollHeight, defaultHeight); // px
+    textAreaRef.current.style.height = `${newHeight}px`;
+  }, [configOverride]);
+
+  const handleLoadDefault = () => {
+    const parsedDefaultConfig = formatConfig(defaultConfig);
+    setConfigOverride(parsedDefaultConfig);
+  };
+
+  const submit = (e: FormEvent) => {
+    e.preventDefault();
+    saveConfigOverride(configOverride);
+  };
+
+  const reset = (e: FormEvent) => {
+    e.preventDefault();
+    saveConfigOverride();
+  };
+
+  return (
+    <form
+      onSubmit={submit}
+      onReset={reset}
+      className="rounded-18 bg-background-900 flex flex-col items-center space-y-20 p-20"
+    >
+      <h2 className="text-center">Set Config</h2>
+      <label htmlFor="custom-config-json">Config Override</label>
+
+      <div className="w-full">
+        <textarea
+          ref={textAreaRef}
+          id="custom-config-json"
+          placeholder="Enter config file overrides in JSON format"
+          value={configOverride}
+          onChange={handleConfigChange}
+          className="rounded-18 w-full break-all bg-black px-16 py-8"
+        />
+      </div>
+      {!!error && (
+        <Warning isError message={error} htmlFor="custom-config-json" />
+      )}
+      <Button data-testid="save-config" type="submit" fullWidth>
+        Save
+      </Button>
+      <Button type="button" onClick={handleLoadDefault} fullWidth>
+        Load Default Config
+      </Button>
+      <Button type="reset" fullWidth>
+        Reset
+      </Button>
+    </form>
+  );
+};
diff --git a/src/components/simulator/input/BuySellBlockNew/Header.tsx b/src/components/simulator/input/BuySellBlockNew/Header.tsx
index d76513c43..f5bca3e72 100644
--- a/src/components/simulator/input/BuySellBlockNew/Header.tsx
+++ b/src/components/simulator/input/BuySellBlockNew/Header.tsx
@@ -78,7 +78,7 @@ export const BuySellHeader: FC<Props> = (props) => {
           sendEventOnMount={{ buy }}
           iconClassName="text-white/60"
           element={
-            <>
+            <p>
               This section will define the order details in which you are
               willing to {buy ? 'buy' : 'sell'} {base.symbol} at.
               <br />
@@ -87,7 +87,7 @@ export const BuySellHeader: FC<Props> = (props) => {
               <br />
               <b>Range</b> will allow you to define a range of prices to{' '}
               {buy ? 'buy' : 'sell'} the token at.
-            </>
+            </p>
           }
         />
       </div>
diff --git a/src/components/strategies/common/OrderHeader.tsx b/src/components/strategies/common/OrderHeader.tsx
index 654793821..137d5a08d 100644
--- a/src/components/strategies/common/OrderHeader.tsx
+++ b/src/components/strategies/common/OrderHeader.tsx
@@ -63,7 +63,7 @@ export const OrderHeader: FC<Props> = (props) => {
         sendEventOnMount={{ buy }}
         iconClassName="text-white/60"
         element={
-          <>
+          <p>
             This section will define the order details in which you are willing
             to {buy ? 'buy' : 'sell'} {base.symbol} at.
             <br />
@@ -72,7 +72,7 @@ export const OrderHeader: FC<Props> = (props) => {
             <br />
             <b>Range</b> will allow you to define a range of prices to{' '}
             {buy ? 'buy' : 'sell'} the token at.
-          </>
+          </p>
         }
       />
     </header>
diff --git a/src/components/strategies/overview/StrategyContent.tsx b/src/components/strategies/overview/StrategyContent.tsx
index c986974f7..28b943ea6 100644
--- a/src/components/strategies/overview/StrategyContent.tsx
+++ b/src/components/strategies/overview/StrategyContent.tsx
@@ -6,6 +6,7 @@ import { StrategyBlockCreate } from 'components/strategies/overview/strategyBloc
 import { CarbonLogoLoading } from 'components/common/CarbonLogoLoading';
 import { cn } from 'utils/helpers';
 import styles from './StrategyContent.module.css';
+import config from 'config';
 
 type Props = {
   strategies: StrategyWithFiat[];
@@ -44,7 +45,12 @@ export const _StrategyContent: FC<Props> = ({
       className={cn('xl:gap-25 grid gap-20 lg:gap-10', styles.strategyList)}
     >
       {strategies.map((s) => (
-        <StrategyBlock key={s.id} strategy={s} isExplorer={isExplorer} />
+        <StrategyBlock
+          key={s.id}
+          strategy={s}
+          isExplorer={isExplorer}
+          showStrategyRoi={config.showStrategyRoi}
+        />
       ))}
       {!isExplorer && <StrategyBlockCreate />}
     </ul>
diff --git a/src/components/strategies/overview/StrategyFilterSort.tsx b/src/components/strategies/overview/StrategyFilterSort.tsx
index d109f5749..3ca7b2816 100644
--- a/src/components/strategies/overview/StrategyFilterSort.tsx
+++ b/src/components/strategies/overview/StrategyFilterSort.tsx
@@ -7,6 +7,7 @@ import { ReactComponent as IconFilter } from 'assets/icons/filter.svg';
 import { lsService } from 'services/localeStorage';
 import { useStrategyCtx } from 'hooks/useStrategies';
 import { cn } from 'utils/helpers';
+import config from 'config';
 
 // [START] Used for localStorage migration: Remove it after Nov 2023
 export enum EnumStrategySort {
@@ -31,6 +32,9 @@ const isEnumSort = (
 
 export const getSortFromLS = (): StrategySort => {
   const sort = lsService.getItem('strategyOverviewSort');
+  const isRoiSort = sort === 'roiDesc' || sort === 'roiAsc';
+  if (!config.showStrategyRoi && (sort === undefined || isRoiSort))
+    return 'recent';
   if (sort === undefined) return 'roiDesc';
   return isEnumSort(sort) ? strategySortMapping[sort] : sort;
 };
@@ -74,6 +78,12 @@ export const strategySort = {
   roiDesc: 'ROI (Descending)',
   totalBudgetDesc: 'Total Budget',
 };
+
+if (config.showStrategyRoi) {
+  strategySort['roiAsc'] = '';
+  strategySort['roiDesc'] = '';
+}
+
 export type StrategySort = keyof typeof strategySort;
 
 interface Props {
diff --git a/src/components/strategies/overview/strategyBlock/StrategyBlock.tsx b/src/components/strategies/overview/strategyBlock/StrategyBlock.tsx
index 31d1fec0f..9eab6637f 100644
--- a/src/components/strategies/overview/strategyBlock/StrategyBlock.tsx
+++ b/src/components/strategies/overview/strategyBlock/StrategyBlock.tsx
@@ -4,21 +4,22 @@ import { m, mItemVariant } from 'libs/motion';
 import { StrategyBlockBuySell } from 'components/strategies/overview/strategyBlock/StrategyBlockBuySell';
 
 import { cn } from 'utils/helpers';
-import { StrategyBlockRoi } from './StrategyBlockRoi';
-import { StrategyBlockBudget } from './StrategyBlockBudget';
 import { StrategyBlockHeader } from './StrategyBlockHeader';
 import { StrategyGraph } from './StrategyGraph';
+import { StrategyBlockInfo } from './StrategyBlockInfo';
 
 interface Props {
   strategy: StrategyWithFiat;
   className?: string;
   isExplorer?: boolean;
+  showStrategyRoi?: boolean;
 }
 
 export const StrategyBlock: FC<Props> = ({
   strategy,
   className,
   isExplorer,
+  showStrategyRoi,
 }) => {
   return (
     <m.li
@@ -30,8 +31,10 @@ export const StrategyBlock: FC<Props> = ({
       data-testid={`${strategy.base.symbol}/${strategy.quote.symbol}`}
     >
       <StrategyBlockHeader strategy={strategy} isExplorer={isExplorer} />
-      <StrategyBlockRoi strategy={strategy} />
-      <StrategyBlockBudget strategy={strategy} />
+      <StrategyBlockInfo
+        strategy={strategy}
+        showStrategyRoi={showStrategyRoi}
+      />
       <div
         className={cn(
           'rounded-8 border-background-800 col-start-1 col-end-3 grid grid-cols-2 grid-rows-[auto_auto] border-2',
diff --git a/src/components/strategies/overview/strategyBlock/StrategyBlockBudget.tsx b/src/components/strategies/overview/strategyBlock/StrategyBlockBudget.tsx
index 96ad472e7..aad62ac73 100644
--- a/src/components/strategies/overview/strategyBlock/StrategyBlockBudget.tsx
+++ b/src/components/strategies/overview/strategyBlock/StrategyBlockBudget.tsx
@@ -6,10 +6,11 @@ import { useFiatCurrency } from 'hooks/useFiatCurrency';
 import { StrategyWithFiat } from 'libs/queries';
 
 interface Props {
+  fullWidth?: boolean;
   strategy: StrategyWithFiat;
 }
 
-export const StrategyBlockBudget: FC<Props> = ({ strategy }) => {
+export const StrategyBlockBudget: FC<Props> = ({ strategy, fullWidth }) => {
   const baseFiat = useFiatCurrency(strategy.base);
   const quoteFiat = useFiatCurrency(strategy.quote);
   const noFiatValue = !baseFiat.hasFiatValue() && !quoteFiat.hasFiatValue();
@@ -22,7 +23,8 @@ export const StrategyBlockBudget: FC<Props> = ({ strategy }) => {
     <article
       className={cn(
         'rounded-8 border-background-800 flex flex-col border-2 p-16',
-        strategy.status === 'active' ? '' : 'opacity-50'
+        strategy.status === 'active' ? '' : 'opacity-50',
+        !!fullWidth ? 'col-start-1 col-end-3 flex-row justify-between' : ''
       )}
     >
       <Tooltip element={<TooltipContent />}>
diff --git a/src/components/strategies/overview/strategyBlock/StrategyBlockInfo.tsx b/src/components/strategies/overview/strategyBlock/StrategyBlockInfo.tsx
new file mode 100644
index 000000000..05a7eab1c
--- /dev/null
+++ b/src/components/strategies/overview/strategyBlock/StrategyBlockInfo.tsx
@@ -0,0 +1,18 @@
+import { FC } from 'react';
+import { StrategyWithFiat } from 'libs/queries';
+import { StrategyBlockRoi } from 'components/strategies/overview/strategyBlock/StrategyBlockRoi';
+import { StrategyBlockBudget } from 'components/strategies/overview/strategyBlock/StrategyBlockBudget';
+
+interface Props {
+  strategy: StrategyWithFiat;
+  showStrategyRoi?: boolean;
+}
+
+export const StrategyBlockInfo: FC<Props> = ({ strategy, showStrategyRoi }) => {
+  return (
+    <>
+      {!!showStrategyRoi && <StrategyBlockRoi strategy={strategy} />}
+      <StrategyBlockBudget strategy={strategy} fullWidth={!showStrategyRoi} />
+    </>
+  );
+};
diff --git a/src/components/strategies/overview/utils.ts b/src/components/strategies/overview/utils.ts
index 507d07c7a..87e7b1b66 100644
--- a/src/components/strategies/overview/utils.ts
+++ b/src/components/strategies/overview/utils.ts
@@ -56,9 +56,11 @@ export const getCompareFunctionBySortType = (sortType: StrategySort) => {
   return sortFn[sortType] ?? sortFn['roiDesc'];
 };
 export const getSortAndFilterItems = () => {
-  const sortItems = Object.entries(strategySort).map(([item, title]) => {
-    return { item: item as StrategySort, title };
-  });
+  const sortItems = Object.entries(strategySort)
+    .filter(([_item, title]) => !!title)
+    .map(([item, title]) => {
+      return { item: item as StrategySort, title };
+    });
 
   const filterItems = Object.entries(strategyFilter).map(([item, title]) => {
     return { item: item as StrategyFilter, title };
diff --git a/src/config/celo/common.ts b/src/config/celo/common.ts
index 42c35ca19..825ad8944 100644
--- a/src/config/celo/common.ts
+++ b/src/config/celo/common.ts
@@ -23,6 +23,7 @@ export const commonConfig: AppConfig = {
   blockedConnectors: ['Tailwind', 'Compass Wallet', 'Seif'],
   walletConnectProjectId: '',
   isSimulatorEnabled: false,
+  showStrategyRoi: true,
   policiesLastUpdated: '31 Jul, 2024',
   network: {
     name: 'Celo Network',
diff --git a/src/config/configSchema.ts b/src/config/configSchema.ts
new file mode 100644
index 000000000..f817177b9
--- /dev/null
+++ b/src/config/configSchema.ts
@@ -0,0 +1,108 @@
+import { selectableConnectionNames } from 'libs/wagmi/wagmi.types';
+import * as v from 'valibot';
+
+const ConnectorSchema = v.array(
+  v.union(selectableConnectionNames.map((name) => v.literal(name)))
+);
+
+const AddressSchema = v.pipe(v.string(), v.regex<`0x${string}`>(/^0x(.*)$/));
+
+export const AppConfigSchema = v.object({
+  hidden: v.optional(v.boolean()),
+  mode: v.union([v.literal('development'), v.literal('production')]),
+  appName: v.string(),
+  appUrl: v.string(),
+  carbonApi: v.string(),
+  externalLinks: v.optional(v.record(v.string(), v.string())),
+  selectedConnectors: ConnectorSchema,
+  blockedConnectors: v.optional(ConnectorSchema),
+  walletConnectProjectId: v.string(),
+  isSimulatorEnabled: v.boolean(),
+  showStrategyRoi: v.optional(v.boolean()),
+  sentryDSN: v.optional(v.string()),
+  policiesLastUpdated: v.optional(v.string()),
+  network: v.object({
+    name: v.string(),
+    logoUrl: v.string(),
+    chainId: v.number(),
+    rpc: v.object({
+      url: v.string(),
+      headers: v.optional(v.record(v.string(), v.string())),
+    }),
+    blockExplorer: v.object({
+      name: v.string(),
+      url: v.string(),
+    }),
+    defaultLimitedApproval: v.optional(v.boolean()),
+    gasToken: v.object({
+      name: v.string(),
+      symbol: v.string(),
+      decimals: v.number(),
+      address: v.string(),
+      logoURI: v.string(),
+    }),
+  }),
+  sdk: v.object({
+    cacheTTL: v.number(),
+  }),
+  defaultTokenPair: v.tuple([v.string(), v.string()]),
+  popularPairs: v.array(v.tuple([v.string(), v.string()])),
+  popularTokens: v.object({
+    base: v.array(v.string()),
+    quote: v.array(v.string()),
+  }),
+  tokenListOverride: v.array(
+    v.object({
+      name: v.string(),
+      symbol: v.string(),
+      decimals: v.number(),
+      address: v.string(),
+      logoURI: v.string(),
+    })
+  ),
+  tokenLists: v.array(
+    v.object({
+      uri: v.string(),
+      parser: v.optional(v.string()),
+    })
+  ),
+  addresses: v.object({
+    tokens: v.intersect([
+      v.object({
+        ZERO: v.string(),
+      }),
+      v.record(v.string(), v.string()),
+    ]),
+    carbon: v.object({
+      carbonController: v.string(),
+      voucher: v.string(),
+    }),
+  }),
+  utils: v.union([
+    v.object({
+      multicall3: v.object({
+        address: AddressSchema,
+        blockCreated: v.optional(v.number()),
+      }),
+    }),
+    v.record(
+      v.string(),
+      v.object({
+        address: AddressSchema,
+        blockCreated: v.optional(v.number()),
+      })
+    ),
+  ]),
+  tenderly: v.object({
+    nativeTokenDonorAccount: v.string(),
+    faucetAmount: v.number(),
+    faucetTokens: v.array(
+      v.object({
+        decimals: v.number(),
+        tokenContract: v.string(),
+        donorAccount: v.string(),
+        symbol: v.string(),
+      })
+    ),
+  }),
+});
diff --git a/src/config/ethereum/common.ts b/src/config/ethereum/common.ts
index acd58d277..c30bd1df7 100644
--- a/src/config/ethereum/common.ts
+++ b/src/config/ethereum/common.ts
@@ -37,6 +37,7 @@ export const commonConfig: AppConfig = {
   blockedConnectors: ['Tailwind', 'Compass Wallet', 'Seif'],
   walletConnectProjectId: 'f9d8863ab6c03f2293d7d56d7c0c0853',
   isSimulatorEnabled: true,
+  showStrategyRoi: true,
   policiesLastUpdated: '18 April, 2023',
   network: {
     name: 'Ethereum Network',
diff --git a/src/config/index.ts b/src/config/index.ts
index 9515eff68..8e1ba539b 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -6,7 +6,7 @@ import celoDev from './celo/development';
 import celoProd from './celo/production';
 import blastDev from './blast/development';
 import blastProd from './blast/production';
-export { pairsToExchangeMapping } from './utils';
+import { handleConfigOverrides } from './utils';
 
 const configs = {
   ethereum: {
@@ -41,6 +41,8 @@ if (!configs[network][mode]) {
   throw new Error(`NODE_ENV should be ${modes}, got "${mode}"`);
 }
 
+export { pairsToExchangeMapping } from './utils';
+
 export const networks = Object.entries(configs)
   .filter(([_id, config]) => config[mode].hidden !== true)
   .map(([id, config]) => {
@@ -54,4 +56,6 @@ export const networks = Object.entries(configs)
     };
   });
 
-export default configs[network][mode];
+export const defaultConfig = configs[network][mode];
+const currentConfig = handleConfigOverrides(defaultConfig);
+export default currentConfig;
diff --git a/src/config/sei/common.ts b/src/config/sei/common.ts
index b810aa732..2f0338556 100644
--- a/src/config/sei/common.ts
+++ b/src/config/sei/common.ts
@@ -1,9 +1,5 @@
 import { AppConfig } from 'config/types';
 import IconSeiLogo from 'assets/logos/seilogo.svg';
-import {
-  tokenSeiListParser,
-  tokenDragonswapListParser,
-} from 'config/sei/utils';
 
 const addresses = {
   SEI: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
@@ -87,11 +83,11 @@ export const commonConfig: AppConfig = {
   tokenLists: [
     {
       uri: 'https://raw.githubusercontent.com/Sei-Public-Goods/sei-assetlist/main/assetlist.json',
-      parser: tokenSeiListParser('pacific-1'),
+      parser: 'tokenSeiListParser',
     },
     {
       uri: 'https://raw.githubusercontent.com/dragonswap-app/assets/main/tokenlist-sei-mainnet.json',
-      parser: tokenDragonswapListParser('dragonswap-app/assets', 'logos'),
+      parser: 'tokenDragonswapListParser',
     },
   ],
   tenderly: {
diff --git a/src/config/types.ts b/src/config/types.ts
index d2c9c4449..7213d0205 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -1,79 +1,4 @@
-import { TokenList } from 'libs/tokens';
-import { SelectableConnectionName } from 'libs/wagmi';
-import { FaucetToken } from 'utils/tenderly';
+import * as v from 'valibot';
+import { AppConfigSchema } from './configSchema';
 
-type address = `0x${string}`;
-type ContractDetails = { address: address; blockCreated?: number };
-
-export interface AppConfig {
-  hidden?: boolean;
-  mode: 'development' | 'production';
-  appName: string;
-  appUrl: string;
-  carbonApi: string;
-  externalLinks?: Record<string, string>;
-  selectedConnectors: SelectableConnectionName[];
-  blockedConnectors?: SelectableConnectionName[];
-  walletConnectProjectId: string;
-  isSimulatorEnabled: boolean;
-  sentryDSN?: string;
-  policiesLastUpdated?: string;
-  network: {
-    name: string;
-    logoUrl: string;
-    chainId: number;
-    rpc: {
-      url: string;
-      headers?: Record<string, string>;
-    };
-    blockExplorer: { name: string; url: string };
-    defaultLimitedApproval?: boolean;
-    gasToken: {
-      name: string;
-      symbol: string;
-      decimals: number;
-      address: string;
-      logoURI: string;
-    };
-  };
-  sdk: {
-    cacheTTL: number;
-  };
-  defaultTokenPair: [string, string];
-  popularPairs: [string, string][];
-  popularTokens: {
-    base: string[];
-    quote: string[];
-  };
-  tokenListOverride: {
-    name: string;
-    symbol: string;
-    decimals: number;
-    address: string;
-    logoURI: string;
-  }[];
-  tokenLists: {
-    uri: string;
-    parser?: (data: any) => Promise<TokenList> | TokenList;
-  }[];
-  addresses: {
-    tokens: { ZERO: string } & Record<string, string>;
-    carbon: {
-      carbonController: string;
-      voucher: string;
-    };
-  };
-  utils: {
-    multicall3: ContractDetails;
-    [contractName: string]: ContractDetails;
-  };
-  tenderly: {
-    nativeTokenDonorAccount: string;
-    faucetAmount: number;
-    faucetTokens: FaucetToken[];
-  };
-  ui?: {
-    /** Which chart to use for price history */
-    priceChart?: 'native' | 'tradingView';
-  };
-}
+export type AppConfig = v.InferOutput<typeof AppConfigSchema>;
diff --git a/src/config/utils.ts b/src/config/utils.ts
index 3fde21647..01a27964a 100644
--- a/src/config/utils.ts
+++ b/src/config/utils.ts
@@ -1,3 +1,10 @@
+import { TokenList } from 'libs/tokens';
+import { tokenDragonswapListParser, tokenSeiListParser } from './sei/utils';
+import { lsService } from 'services/localeStorage';
+import { AppConfigSchema } from './configSchema';
+import * as v from 'valibot';
+import { AppConfig } from './types';
+
 export const pairsToExchangeMapping: { [key: string]: string } = {
   ETHUSDT: 'BINANCE:ETHUSDT',
   ETHDAI: 'UNISWAP3ETH:WETHDAI',
@@ -258,3 +265,34 @@ export const pairsToExchangeMapping: { [key: string]: string } = {
   SEIBNB: 'BINANCE:SEIBNB',
   SEITUSD: 'BINANCE:SEITUSD',
 };
+
+export const tokenParserMapKeys = [
+  'tokenDragonswapListParser',
+  'tokenSeiListParser',
+] as const;
+
+export const tokenParserMap: Record<
+  string,
+  (data: any) => Promise<TokenList> | TokenList
+> = {
+  tokenDragonswapListParser: tokenDragonswapListParser(
+    'dragonswap-app/assets',
+    'logos'
+  ),
+  tokenSeiListParser: tokenSeiListParser('pacific-1'),
+};
+
+export const handleConfigOverrides = (defaultConfig: AppConfig) => {
+  const configOverride = lsService.getItem('configOverride');
+
+  const currentConfig = { ...defaultConfig, ...configOverride };
+  const parseResult = v.safeParse(AppConfigSchema, currentConfig);
+
+  if (parseResult.issues) {
+    console.log("Couldn't load config, clearing config overrides...");
+    lsService.removeItem('configOverride');
+    return defaultConfig;
+  }
+  console.log('Config loaded successfully');
+  return parseResult.output as AppConfig;
+};
diff --git a/src/libs/modals/modals/ModalTokenList/ModalTokenList.tsx b/src/libs/modals/modals/ModalTokenList/ModalTokenList.tsx
index 0577be579..cd0312037 100644
--- a/src/libs/modals/modals/ModalTokenList/ModalTokenList.tsx
+++ b/src/libs/modals/modals/ModalTokenList/ModalTokenList.tsx
@@ -35,6 +35,7 @@ export const ModalTokenList: ModalFC<ModalTokenListData> = ({ id, data }) => {
     removeFavoriteToken,
     favoriteTokens,
     popularTokens,
+    duplicateSymbols,
   } = useModalTokenList({ id, data });
 
   const handleKeyDown = (e: KeyboardEvent) => {
@@ -71,6 +72,7 @@ export const ModalTokenList: ModalFC<ModalTokenListData> = ({ id, data }) => {
             favorites: favoriteTokens,
             popular: popularTokens,
           }}
+          duplicateSymbols={duplicateSymbols}
           onSelect={onSelect}
           search={search}
           onAddFavorite={addFavoriteToken}
diff --git a/src/libs/modals/modals/ModalTokenList/ModalTokenListContent.tsx b/src/libs/modals/modals/ModalTokenList/ModalTokenListContent.tsx
index 3367af758..f044ce69f 100644
--- a/src/libs/modals/modals/ModalTokenList/ModalTokenListContent.tsx
+++ b/src/libs/modals/modals/ModalTokenList/ModalTokenListContent.tsx
@@ -14,12 +14,14 @@ import { lsService } from 'services/localeStorage';
 import { ReactComponent as IconStar } from 'assets/icons/star.svg';
 import { WarningWithTooltip } from 'components/common/WarningWithTooltip/WarningWithTooltip';
 import { CategoryWithCounter } from 'libs/modals/modals/common/CategoryWithCounter';
+import { ModalTokenListDuplicateWarning } from 'libs/modals/modals/ModalTokenList/ModalTokenListDuplicateWarning';
 
 const categories = ['popular', 'favorites', 'all'] as const;
 export type ChooseTokenCategory = (typeof categories)[number];
 
 type Props = {
   tokens: { [k in ChooseTokenCategory]: Token[] };
+  duplicateSymbols: string[];
   onSelect: (token: Token) => void;
   search: string;
   onAddFavorite: (token: Token) => void;
@@ -28,6 +30,7 @@ type Props = {
 
 export const ModalTokenListContent: FC<Props> = ({
   tokens,
+  duplicateSymbols,
   onSelect,
   search,
   onAddFavorite,
@@ -47,7 +50,7 @@ export const ModalTokenListContent: FC<Props> = ({
   const rowVirtualizer = useVirtualizer({
     count: _tokens.length,
     getScrollElement: () => parentRef.current,
-    estimateSize: () => 55,
+    estimateSize: () => 60,
     overscan: 10,
   });
 
@@ -68,7 +71,7 @@ export const ModalTokenListContent: FC<Props> = ({
   const suspiciousTokenTooltipMsg =
     'This token is not part of any known token list. Always conduct your own research before trading.';
 
-  const selectCatergory = (e: FormEvent<HTMLFieldSetElement>) => {
+  const selectCategory = (e: FormEvent<HTMLFieldSetElement>) => {
     if (e.target instanceof HTMLInputElement) {
       setSelectedList(e.target.value as ChooseTokenCategory);
     }
@@ -79,7 +82,7 @@ export const ModalTokenListContent: FC<Props> = ({
       <fieldset
         aria-label="Filter tokens"
         className="grid grid-cols-3 px-4"
-        onChange={selectCatergory}
+        onChange={selectCategory}
       >
         {categories.map((category) => (
           <CategoryWithCounter
@@ -130,6 +133,9 @@ export const ModalTokenListContent: FC<Props> = ({
                     <div className="text-12 max-w-full truncate text-white/60">
                       {token.name ?? token.symbol}
                     </div>
+                    {duplicateSymbols.includes(token.symbol) && (
+                      <ModalTokenListDuplicateWarning token={token} />
+                    )}
                   </div>
                 </button>
                 <button
diff --git a/src/libs/modals/modals/ModalTokenList/ModalTokenListDuplicateWarning.tsx b/src/libs/modals/modals/ModalTokenList/ModalTokenListDuplicateWarning.tsx
new file mode 100644
index 000000000..8aa60fe19
--- /dev/null
+++ b/src/libs/modals/modals/ModalTokenList/ModalTokenListDuplicateWarning.tsx
@@ -0,0 +1,48 @@
+import { Tooltip } from 'components/common/tooltip/Tooltip';
+import { NewTabLink } from 'libs/routing';
+import { Token } from 'libs/tokens';
+import { getExplorerLink } from 'utils/blockExplorer';
+import { shortenString } from 'utils/helpers';
+import { NATIVE_TOKEN_ADDRESS } from 'utils/tokens';
+import { ReactComponent as IconLink } from 'assets/icons/link.svg';
+import { ReactComponent as IconWarning } from 'assets/icons/warning.svg';
+import { FC } from 'react';
+
+type Props = {
+  token: Token;
+};
+
+export const ModalTokenListDuplicateWarning: FC<Props> = ({ token }) => {
+  const isNativeToken = token.address === NATIVE_TOKEN_ADDRESS;
+
+  const duplicatedTokenTooltipElement = (token: Token) => {
+    if (isNativeToken) return 'This is the native token of the chain.';
+
+    return (
+      <>
+        <p>
+          It appears there might be multiple tokens with the same symbol. Please
+          ensure you select the correct address.
+          <br /> {token.symbol}:<br />
+        </p>
+        <div className="flex items-center">
+          {token.address}
+          <NewTabLink to={getExplorerLink('token', token.address)}>
+            <IconLink className="ml-6 w-14 text-white/80" />
+          </NewTabLink>
+        </div>
+      </>
+    );
+  };
+
+  return (
+    <div className="text-12 flex max-w-full truncate py-2 text-white/60">
+      {isNativeToken ? 'Native Gas Token' : shortenString(token.address)}
+      <Tooltip maxWidth={450} element={duplicatedTokenTooltipElement(token)}>
+        <span>
+          <IconWarning className="ml-5 size-14 text-white/60" />
+        </span>
+      </Tooltip>
+    </div>
+  );
+};
diff --git a/src/libs/modals/modals/ModalTokenList/useModalTokenList.ts b/src/libs/modals/modals/ModalTokenList/useModalTokenList.ts
index 40c58746e..df94cfbf2 100644
--- a/src/libs/modals/modals/ModalTokenList/useModalTokenList.ts
+++ b/src/libs/modals/modals/ModalTokenList/useModalTokenList.ts
@@ -75,6 +75,16 @@ export const useModalTokenList = ({ id, data }: Props) => {
     [tokens, excludedTokens, includedTokens]
   );
 
+  const duplicateSymbols = useMemo(() => {
+    const seenSymbol: Record<string, boolean> = {};
+    const duplicates = new Set<string>();
+    for (const token of tokens) {
+      if (seenSymbol[token.symbol]) duplicates.add(token.symbol);
+      seenSymbol[token.symbol] = true;
+    }
+    return Array.from(duplicates);
+  }, [tokens]);
+
   const _favoriteTokens = useMemo(
     () =>
       favoriteTokens.filter(
@@ -157,6 +167,7 @@ export const useModalTokenList = ({ id, data }: Props) => {
     showImportToken,
     showNoResults,
     filteredTokens,
+    duplicateSymbols,
     onSelect,
     isPending,
     isError,
diff --git a/src/libs/queries/extApi/roi.ts b/src/libs/queries/extApi/roi.ts
index 4debaf8fc..e53326907 100644
--- a/src/libs/queries/extApi/roi.ts
+++ b/src/libs/queries/extApi/roi.ts
@@ -2,11 +2,15 @@ import { useQuery } from '@tanstack/react-query';
 import { QueryKey } from 'libs/queries/queryKey';
 import { FIVE_MIN_IN_MS } from 'utils/time';
 import { carbonApi } from 'utils/carbonApi';
+import config from 'config';
 
 export const useGetRoi = () => {
   return useQuery({
     queryKey: QueryKey.roi(),
-    queryFn: async () => carbonApi.getRoi(),
+    // Note: config.showStrategyRoi is not used in the 'enabled' option because
+    // useGetRoi.isFetched is used as an 'enabled' signal for other queries.
+    // If this flag is set to false, the query will finish fetching but not fetch from the API.
+    queryFn: async () => !!config.showStrategyRoi && carbonApi.getRoi(),
     refetchInterval: FIVE_MIN_IN_MS,
     staleTime: FIVE_MIN_IN_MS,
   });
diff --git a/src/libs/routing/utils.ts b/src/libs/routing/utils.ts
index adb85d454..ac858d8c5 100644
--- a/src/libs/routing/utils.ts
+++ b/src/libs/routing/utils.ts
@@ -106,10 +106,10 @@ export const getLastVisitedPair = () => {
 // Validate Search Params //
 
 export type SearchParamsValidator<T> = {
-  [key in keyof T]: v.BaseSchema<any, any>;
+  [key in keyof T]: v.GenericSchema<any, any>;
 };
 
-export const validArrayOf = (schema: v.BaseSchema<string, any>) => {
+export const validArrayOf = (schema: v.GenericSchema<string, any>) => {
   return v.array(schema);
 };
 
@@ -117,28 +117,31 @@ export const validLiteral = (array: string[]) => {
   return v.union(array.map((l) => v.literal(l)));
 };
 
-export const validNumber = v.string([
-  v.custom((value: string) => isNaN(Number(formatNumber(value))) === false),
-]);
+export const validNumber = v.pipe(
+  v.string(),
+  v.check((value: string) => isNaN(Number(formatNumber(value))) === false)
+);
 
 export const validNumberType = v.number();
 
-export const validAddress = v.string([
-  v.custom((value: string) => {
+export const validAddress = v.pipe(
+  v.string(),
+  v.check((value: string) => {
     try {
       utils.getAddress(value.toLocaleLowerCase());
       return true;
     } catch {
       return false;
     }
-  }),
-]);
+  })
+);
 
 export const validString = v.string();
 
-export const validBoolean = v.boolean([
-  v.custom((value) => value === true || value === false),
-]);
+export const validBoolean = v.pipe(
+  v.boolean(),
+  v.check((value) => value === true || value === false)
+);
 
 export const validMarginalPrice = v.union([
   validNumber,
diff --git a/src/libs/tokens/tokenHelperFn.ts b/src/libs/tokens/tokenHelperFn.ts
index d6b9dc383..d97de230f 100644
--- a/src/libs/tokens/tokenHelperFn.ts
+++ b/src/libs/tokens/tokenHelperFn.ts
@@ -4,6 +4,7 @@ import { Token, TokenList } from 'libs/tokens/token.types';
 import { Token as TokenContract } from 'abis/types';
 import { lsService } from 'services/localeStorage';
 import config from 'config';
+import { tokenParserMap } from 'config/utils';
 
 const getLogoByURI = (uri: string | undefined) =>
   uri && uri.startsWith('ipfs') ? buildIpfsUri(uri.split('//')[1]) : uri;
@@ -29,7 +30,9 @@ export const fetchTokenLists = async () => {
         );
       }
 
-      const parsedResult = parser ? await parser(result) : result;
+      const parsedResult = parser
+        ? await tokenParserMap[parser](result)
+        : result;
 
       return {
         ...parsedResult,
diff --git a/src/libs/wagmi/wagmi.types.ts b/src/libs/wagmi/wagmi.types.ts
index e2466aa5c..dc60df928 100644
--- a/src/libs/wagmi/wagmi.types.ts
+++ b/src/libs/wagmi/wagmi.types.ts
@@ -5,14 +5,18 @@ import {
 } from '@ethersproject/providers';
 import { Connector } from 'libs/wagmi';
 
+export const selectableConnectionNames = [
+  'MetaMask',
+  'WalletConnect',
+  'Coinbase Wallet',
+  'Safe',
+  'Tailwind',
+  'Compass Wallet',
+  'Seif',
+] as const;
+
 export type SelectableConnectionName =
-  | 'MetaMask'
-  | 'WalletConnect'
-  | 'Coinbase Wallet'
-  | 'Safe'
-  | 'Tailwind'
-  | 'Compass Wallet'
-  | 'Seif';
+  (typeof selectableConnectionNames)[number];
 
 export interface CarbonWagmiProviderContext {
   user: string | undefined;
diff --git a/src/pages/debug/index.tsx b/src/pages/debug/index.tsx
index a4d8f37a8..66b3a3478 100644
--- a/src/pages/debug/index.tsx
+++ b/src/pages/debug/index.tsx
@@ -10,6 +10,7 @@ import { DebugCreateStrategy } from 'components/debug/DebugCreateStrategy';
 import { DebugFiatCurrency } from 'components/debug/DebugFiatCurrency';
 import { DebugOrderBook } from 'components/debug/DebugOrderBook';
 import { DebugSDKConfig } from 'components/debug/DebugSDKConfig';
+import { DebugConfig } from 'components/debug/DebugConfig';
 
 export const DebugPage = () => {
   return (
@@ -25,6 +26,7 @@ export const DebugPage = () => {
         <DebugCreateStrategy />
         <DebugFiatCurrency />
         <DebugOrderBook />
+        <DebugConfig />
         <DebugSDKConfig />
       </div>
     </Page>
diff --git a/src/pages/strategy/index.tsx b/src/pages/strategy/index.tsx
index 7718b0a58..ac60808df 100644
--- a/src/pages/strategy/index.tsx
+++ b/src/pages/strategy/index.tsx
@@ -10,8 +10,6 @@ import { TokensOverlap } from 'components/common/tokensOverlap';
 import { cn } from 'utils/helpers';
 import { useGetStrategy } from 'libs/queries';
 import { useStrategiesWithFiat } from 'hooks/useStrategies';
-import { StrategyBlockRoi } from 'components/strategies/overview/strategyBlock/StrategyBlockRoi';
-import { StrategyBlockBudget } from 'components/strategies/overview/strategyBlock/StrategyBlockBudget';
 import { StrategyBlockBuySell } from 'components/strategies/overview/strategyBlock/StrategyBlockBuySell';
 import { StrategyGraph } from 'components/strategies/overview/strategyBlock/StrategyGraph';
 import {
@@ -35,6 +33,8 @@ import {
   DateRangePicker,
   datePickerPresets,
 } from 'components/common/datePicker/DateRangePicker';
+import config from 'config';
+import { StrategyBlockInfo } from 'components/strategies/overview/strategyBlock/StrategyBlockInfo';
 
 export const StrategyPage = () => {
   const { history } = useRouter();
@@ -82,6 +82,7 @@ export const StrategyPage = () => {
   }
   const base = strategy.base;
   const quote = strategy.quote;
+  const showStrategyRoi = config.showStrategyRoi;
 
   return (
     <Page hideTitle={true} className="gap-20">
@@ -104,8 +105,10 @@ export const StrategyPage = () => {
       <section className="flex flex-col gap-16 md:flex-row">
         <article className="bg-background-900 grid grid-cols-2 grid-rows-[auto_auto_auto] gap-16 rounded p-24 md:w-[400px]">
           <h2 className="text-18 font-weight-500 col-span-2">Strategy Info</h2>
-          <StrategyBlockRoi strategy={strategy} />
-          <StrategyBlockBudget strategy={strategy} />
+          <StrategyBlockInfo
+            strategy={strategy}
+            showStrategyRoi={showStrategyRoi}
+          />
           <div
             className={cn(
               'rounded-8 border-background-800 col-start-1 col-end-3 grid grid-cols-2 grid-rows-[auto_auto] border-2',
diff --git a/src/services/localeStorage/index.ts b/src/services/localeStorage/index.ts
index f4de3a1ab..6582aea53 100644
--- a/src/services/localeStorage/index.ts
+++ b/src/services/localeStorage/index.ts
@@ -18,6 +18,7 @@ import {
   removeItem,
 } from 'utils/migrateLocalStorage';
 import { NotificationPreference } from 'libs/notifications/NotificationPreferences';
+import { AppConfig } from 'config/types';
 
 // ************************** /
 // BEWARE!! Keys are not to be removed or changed without setting a proper clean-up and migration logic in place!! Same for changing the app version!
@@ -51,6 +52,7 @@ interface LocalStorageSchema {
   simDisclaimerLastSeen: number;
   lastSdkCache: { timestamp: number; ttl: number };
   notificationPreferences: NotificationPreference;
+  configOverride: Partial<AppConfig>;
 }
 
 // ************************** /
diff --git a/yarn.lock b/yarn.lock
index 4f476e522..07e414177 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10314,10 +10314,10 @@ uuid@^9.0.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
   integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
 
-valibot@^0.28.1:
-  version "0.28.1"
-  resolved "https://registry.yarnpkg.com/valibot/-/valibot-0.28.1.tgz#c64893bbdb60cd26fe1163756250f2b3434af35e"
-  integrity sha512-zQnjwNJuXk6362Leu0+4eFa/SMwRom3/hEvH6s1EGf3oXIPbo2WFKDra9ymnbVh3clLRvd8hw4sKF5ruI2Lyvw==
+valibot@^0.34.0:
+  version "0.34.0"
+  resolved "https://registry.yarnpkg.com/valibot/-/valibot-0.34.0.tgz#4c1710fd02faddd33df8a3c3aeb07466c99f046a"
+  integrity sha512-TELvxO0hEB1/6XjTS5Jfi4dS0oyawA5flxs4/sK/tSUXnlLMiKTMYE6Atuu0a7kvtP3eqPv3yZ80msfM+qMDHA==
 
 valtio@1.11.2:
   version "1.11.2"