diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts b/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
index c72a3b807..5d6cc999a 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
@@ -37,8 +37,8 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
-            valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3),
-          },
+            valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3)
+          }
         }),
         value: false
       };
@@ -49,7 +49,7 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-            valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3),
+            valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -63,7 +63,7 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
         placeholders: {
           thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-          valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3),
+          valueRatio: (asiaPacificMarketValueRatio * 100).toPrecision(3)
         }
       }),
       value: true
@@ -90,7 +90,7 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
   public getName() {
     return this.i18nService.getTranslation({
       id: 'rule.regionalMarketClusterRiskAsiaPacific',
-      languageCode: this.getLanguageCode(),
+      languageCode: this.getLanguageCode()
     });
   }
 
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts b/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
index 8469d7f61..fa13a9e57 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
@@ -39,7 +39,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
-            valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3),
+            valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -51,7 +51,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-            valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3),
+            valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -65,7 +65,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
         placeholders: {
           thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-          valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3),
+          valueRatio: (emergingMarketsValueRatio * 100).toPrecision(3)
         }
       }),
       value: true
@@ -92,7 +92,7 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
   public getName() {
     return this.i18nService.getTranslation({
       id: 'rule.regionalMarketClusterRiskEmergingMarkets',
-      languageCode: this.getLanguageCode(),
+      languageCode: this.getLanguageCode()
     });
   }
 
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts b/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
index a910c441b..3bbe7af84 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
@@ -37,7 +37,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
-            valueRatio: (europeMarketValueRatio * 100).toPrecision(3),
+            valueRatio: (europeMarketValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -49,7 +49,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-            valueRatio: (europeMarketValueRatio * 100).toPrecision(3),
+            valueRatio: (europeMarketValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -63,7 +63,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
         placeholders: {
           thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-          valueRatio: (europeMarketValueRatio * 100).toPrecision(3),
+          valueRatio: (europeMarketValueRatio * 100).toPrecision(3)
         }
       }),
       value: true
@@ -90,7 +90,7 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
   public getName() {
     return this.i18nService.getTranslation({
       id: 'rule.regionalMarketClusterRiskEurope',
-      languageCode: this.getLanguageCode(),
+      languageCode: this.getLanguageCode()
     });
   }
 
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts b/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
index 38be7b5fc..952e14795 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
@@ -37,7 +37,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
-            valueRatio: (japanMarketValueRatio * 100).toPrecision(3),
+            valueRatio: (japanMarketValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -49,7 +49,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-            valueRatio: (japanMarketValueRatio * 100).toPrecision(3),
+            valueRatio: (japanMarketValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -63,7 +63,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
         placeholders: {
           thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-          valueRatio: (japanMarketValueRatio * 100).toPrecision(3),
+          valueRatio: (japanMarketValueRatio * 100).toPrecision(3)
         }
       }),
       value: true
@@ -90,7 +90,7 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
   public getName() {
     return this.i18nService.getTranslation({
       id: 'rule.regionalMarketClusterRiskJapan',
-      languageCode: this.getLanguageCode(),
+      languageCode: this.getLanguageCode()
     });
   }
 
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts b/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
index 69e56bb15..f022ecff9 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
@@ -37,7 +37,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
-            valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3),
+            valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -49,7 +49,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
           languageCode: this.getLanguageCode(),
           placeholders: {
             thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-            valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3),
+            valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3)
           }
         }),
         value: false
@@ -63,7 +63,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
         placeholders: {
           thresholdMax: (ruleSettings.thresholdMax * 100).toPrecision(3),
           thresholdMin: (ruleSettings.thresholdMin * 100).toPrecision(3),
-          valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3),
+          valueRatio: (northAmericaMarketValueRatio * 100).toPrecision(3)
         }
       }),
       value: true
@@ -90,7 +90,7 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
   public getName() {
     return this.i18nService.getTranslation({
       id: 'rule.regionalMarketClusterRiskNorthAmerica',
-      languageCode: this.getLanguageCode(),
+      languageCode: this.getLanguageCode()
     });
   }
 
diff --git a/apps/client/src/app/pages/i18n/i18n-page.html b/apps/client/src/app/pages/i18n/i18n-page.html
index e848ce4e4..5db40a5b0 100644
--- a/apps/client/src/app/pages/i18n/i18n-page.html
+++ b/apps/client/src/app/pages/i18n/i18n-page.html
@@ -12,79 +12,6 @@
       </li>
       <li i18n="@@myAccount">My Account</li>
       <li i18n="@@rule.accountClusterRisk.category">Account Cluster Risks</li>
-      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific">Asia-Pacific</li>
-      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.max">
-        The Asia-Pacific market contribution of your current investment
-        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.min">
-        The Asia-Pacific market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.true">
-        The Asia-Pacific market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is within the range of
-        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets">
-        Emerging Markets
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.max">
-        The Emerging Markets contribution of your current investment
-        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.min">
-        The Emerging Markets contribution of your current investment
-        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.true">
-        The Emerging Markets contribution of your current investment
-        ($&#123;valueRatio&#125;%) is within the range of
-        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskEurope">Europe</li>
-      <li i18n="@@rule.regionalMarketClusterRiskEurope.false.max">
-        The Europe market contribution of your current investment
-        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskEurope.false.min">
-        The Europe market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskEurope.true">
-        The Europe market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is within the range of
-        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskJapan">Japan</li>
-      <li i18n="@@rule.regionalMarketClusterRiskJapan.false.max">
-        The Japan market contribution of your current investment
-        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskJapan.false.min">
-        The Japan market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskJapan.true">
-        The Japan market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is within the range of
-        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
-      </li>
-
-      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica">North America</li>
-      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.max">
-        The North America market contribution of your current investment
-        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.min">
-        The North America market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
-      </li>
-      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.true">
-        The North America market contribution of your current investment
-        ($&#123;valueRatio&#125;%) is within the range of
-        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
-      </li>
       <li i18n="@@rule.accountClusterRiskCurrentInvestment">Investment</li>
       <li i18n="@@rule.accountClusterRiskCurrentInvestment.false">
         Over $&#123;thresholdMax&#125;% of your current investment is at
@@ -222,6 +149,78 @@
       <li i18n="@@rule.regionalMarketClusterRisk.category">
         Regional Market Cluster Risks
       </li>
+      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific">Asia-Pacific</li>
+      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.max">
+        The Asia-Pacific market contribution of your current investment
+        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.min">
+        The Asia-Pacific market contribution of your current investment
+        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.true">
+        The Asia-Pacific market contribution of your current investment
+        ($&#123;valueRatio&#125;%) is within the range of
+        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets">
+        Emerging Markets
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.max">
+        The Emerging Markets contribution of your current investment
+        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.min">
+        The Emerging Markets contribution of your current investment
+        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.true">
+        The Emerging Markets contribution of your current investment
+        ($&#123;valueRatio&#125;%) is within the range of
+        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskEurope">Europe</li>
+      <li i18n="@@rule.regionalMarketClusterRiskEurope.false.max">
+        The Europe market contribution of your current investment
+        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskEurope.false.min">
+        The Europe market contribution of your current investment
+        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskEurope.true">
+        The Europe market contribution of your current investment
+        ($&#123;valueRatio&#125;%) is within the range of
+        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskJapan">Japan</li>
+      <li i18n="@@rule.regionalMarketClusterRiskJapan.false.max">
+        The Japan market contribution of your current investment
+        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskJapan.false.min">
+        The Japan market contribution of your current investment
+        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskJapan.true">
+        The Japan market contribution of your current investment
+        ($&#123;valueRatio&#125;%) is within the range of
+        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica">North America</li>
+      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.max">
+        The North America market contribution of your current investment
+        ($&#123;valueRatio&#125;%) exceeds $&#123;thresholdMax&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.min">
+        The North America market contribution of your current investment
+        ($&#123;valueRatio&#125;%) is below $&#123;thresholdMin&#125;%
+      </li>
+      <li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.true">
+        The North America market contribution of your current investment
+        ($&#123;valueRatio&#125;%) is within the range of
+        $&#123;thresholdMin&#125;% and $&#123;thresholdMax&#125;%
+      </li>
       <li i18n="@@slogan">Open Source Wealth Management Software</li>
     </ul>
   </div>