diff --git a/assets/data/error-proposals.json b/assets/data/error-proposals.json
new file mode 100644
index 00000000..a5aed45d
--- /dev/null
+++ b/assets/data/error-proposals.json
@@ -0,0 +1,3 @@
+[
+  "103700040478888763716057861639293706989913755085520977741041074598448586673404"
+]
\ No newline at end of file
diff --git a/components/layout/LayoutSidebar.vue b/components/layout/LayoutSidebar.vue
index 4cc34aed..5fea326e 100644
--- a/components/layout/LayoutSidebar.vue
+++ b/components/layout/LayoutSidebar.vue
@@ -237,10 +237,10 @@ const mainMenuItems = computed(() => {
       notification: amountLeftToAuction.value && isTransferEpoch.value,
     },
     {
-      title: "Protocol Fees",
-      path: "/fees/",
+      title: "Rewards",
+      path: "/rewards/",
       isShow: isAuctionActive.value,
-      dataTest: "sidebar-link-fees",
+      dataTest: "sidebar-link-rewards",
     },
     {
       title: "Wrap/Unwrap",
diff --git a/components/proposal/Card.vue b/components/proposal/Card.vue
index 909e9c87..37187f91 100644
--- a/components/proposal/Card.vue
+++ b/components/proposal/Card.vue
@@ -1,22 +1,40 @@
 <template>
-  <div class="mb-4 bg-transparent">
+  <div
+    class="mb-4 bg-transparent"
+    :class="{ 'border border-red-500': isProposalWithError }"
+  >
     <article
       :data-test="hasVoted ? 'voted' : 'not-voted'"
       class="text-white bg-grey-800 p-6 lg:p-8"
     >
+      <div
+        v-if="isProposalWithError"
+        class="flex items-center gap-2 mb-2 bg-red-500 p-2 leading-tight"
+      >
+        <span class="-mb-1">CAUTION: Suspicious or wrong proposal</span>
+        <VTooltip placement="right">
+          <img src="/img/icon-info.svg" class="w-6 h-6" alt="" />
+          <template #popper>
+            <div class="max-w-80 text-sm">
+              This proposal has been labeled as suspicious or wrong by the M^0
+              Foundation. We recommend to vote <b>NO</b>.
+            </div>
+          </template>
+        </VTooltip>
+      </div>
       <ProposalTypeBadge
         v-if="proposal.votingType !== 'Standard' || proposal.state !== 'Active'"
         :type="proposal.votingType"
         class="mb-4"
       />
 
-      <div class="mb-4">
-        <h2 class="text-2xl break-all">
+      <div class="mb-4 text-xl lg:text-2xl break-words">
+        <h3>
           {{ title }}
-        </h2>
+        </h3>
       </div>
 
-      <div class="text-grey-500 font-inter mb-4 break-words">
+      <div class="text-grey-500 max-lg:text-sm font-inter mb-4 break-words">
         {{ truncate(onlyDescription, { length: 450 }) }}
       </div>
 
@@ -161,6 +179,7 @@ import { useAccount, useReadContract, useBlockNumber } from "use-wagmi";
 import { Hash, Abi } from "viem";
 import { useMVotingPower } from "@/lib/hooks";
 import { MProposal } from "@/lib/api/types";
+import errorProposals from "@/assets/data/error-proposals.json";
 
 export interface ProposalCardProps {
   proposal: MProposal;
@@ -198,6 +217,10 @@ watch(reasonForVote, (value) => {
   emit("update-reason-for-vote", value, props.proposal.proposalId);
 });
 
+const isProposalWithError = computed(() => {
+  return errorProposals?.some((id) => id === props.proposal.proposalId);
+});
+
 const isVoteYesActive = computed(() => {
   // vote has been casted to Yes
   if (voteEvent && voteEvent.value?.support === true) return "active";
diff --git a/components/proposal/InputDynamic.vue b/components/proposal/InputDynamic.vue
index 6581944a..9c8196a9 100644
--- a/components/proposal/InputDynamic.vue
+++ b/components/proposal/InputDynamic.vue
@@ -34,7 +34,7 @@
 
     <div
       v-if="props.modelValueErrors?.length"
-      class="text-red-500 text-xs my-2 h-4"
+      class="text-red-500 text-xs my-2 h-4 font-inter"
     >
       <p v-for="error of props.modelValueErrors" :key="error.$uid">
         {{ error.$message }}
@@ -68,8 +68,8 @@ const value = useVModelWrapper<InputProps>(props, emit, "modelValue");
 const hasErrors = computed(() => props.modelValueErrors?.length);
 </script>
 
-<style>
+<style scoped>
 .error {
-  @apply border border-red-500;
+  @apply bg-transparent border border-red-500;
 }
 </style>
diff --git a/components/proposal/InputProtocolConfigOperation.vue b/components/proposal/InputProtocolConfigOperation.vue
index 7c5761cd..fde5ce2e 100644
--- a/components/proposal/InputProtocolConfigOperation.vue
+++ b/components/proposal/InputProtocolConfigOperation.vue
@@ -53,7 +53,7 @@ const inputs = {
   penalty_rate: {
     component: InputDynamic,
     props: {
-      decorator: "%",
+      decorator: "BPS",
       maska: masks.percentage,
     },
   },
@@ -77,7 +77,7 @@ const inputs = {
   mint_ratio: {
     component: InputDynamic,
     props: {
-      decorator: "%",
+      decorator: "BPS",
       maska: masks.percentage,
     },
   },
@@ -94,7 +94,6 @@ const inputs = {
     component: InputDynamic,
     props: {
       decorator: "contract",
-      maska: masks.ethereumAddress,
     },
   },
 
@@ -102,14 +101,13 @@ const inputs = {
     component: InputDynamic,
     props: {
       decorator: "contract",
-      maska: masks.ethereumAddress,
     },
   },
 
   base_minter_rate: {
     component: InputDynamic,
     props: {
-      decorator: "%",
+      decorator: "BPS",
       maska: masks.percentage,
     },
   },
@@ -117,7 +115,7 @@ const inputs = {
   max_earner_rate: {
     component: InputDynamic,
     props: {
-      decorator: "%",
+      decorator: "BPS",
       maska: masks.percentage,
     },
   },
diff --git a/components/proposal/Preview.vue b/components/proposal/Preview.vue
index 84258e24..829c2df0 100644
--- a/components/proposal/Preview.vue
+++ b/components/proposal/Preview.vue
@@ -15,7 +15,7 @@
       </h2>
 
       <div
-        class="text-grey-400 my-1 font-inter text-xs truncate w-52 lg:w-full"
+        class="text-grey-500 my-1 font-inter text-xs truncate w-52 lg:w-full"
       >
         Proposed by
         <u><MAddressAvatar :address="proposal?.proposer" /></u>
diff --git a/cypress/e2e/basic-emergency/proposals-emergency-setKey-protocol-config.cy.ts b/cypress/e2e/basic-emergency/proposals-emergency-setKey-protocol-config.cy.ts
index 7862ff8f..b079372c 100644
--- a/cypress/e2e/basic-emergency/proposals-emergency-setKey-protocol-config.cy.ts
+++ b/cypress/e2e/basic-emergency/proposals-emergency-setKey-protocol-config.cy.ts
@@ -1,6 +1,6 @@
 describe("Proposals", () => {
   describe("type action: Emergency setKey", () => {
-    const value = "1";
+    const value = "60";
     const key = "mint_delay";
     const description = `Add config ${key} = ${value}`;
     let proposalUrl = "";
diff --git a/cypress/e2e/basic/basic_governance_configuration.cy.ts b/cypress/e2e/basic/basic_governance_configuration.cy.ts
index e75381fa..d3c19f79 100644
--- a/cypress/e2e/basic/basic_governance_configuration.cy.ts
+++ b/cypress/e2e/basic/basic_governance_configuration.cy.ts
@@ -40,6 +40,7 @@ describe("Governance configuration", () => {
       "Distribution Vault",
       "Registrar",
       "M Token",
+      "Smart $M",
     ]
 
     // non-changeable parameters table
diff --git a/lib/api/modules/governor/modules/proposal/proposals.ts b/lib/api/modules/governor/modules/proposal/proposals.ts
index 25a1db6d..6b2f6af4 100644
--- a/lib/api/modules/governor/modules/proposal/proposals.ts
+++ b/lib/api/modules/governor/modules/proposal/proposals.ts
@@ -8,10 +8,9 @@ import {
   fromHex,
   toFunctionSelector,
   parseAbiItem,
+  trim,
 } from "viem";
 
-import pick from "lodash/pick";
-
 import { GovernorModule } from "../GovernorModule";
 import { GovernanceType } from "../../governor.types";
 import {
@@ -142,8 +141,6 @@ export class Proposals extends GovernorModule {
       removeSelectorFromCallData(calldata),
     );
 
-    const key = hexWith32BytesToString(params[0]);
-
     const decodeValue = (key: string, value: string) => {
       if (["minter_rate_model", "earner_rate_model"].includes(key)) {
         return hexWith32BytesToAddress(value as Hash);
@@ -156,7 +153,10 @@ export class Proposals extends GovernorModule {
       return decodeAbiParameters([{ type: "uint256" }], value as Hash);
     };
 
-    const value = decodeValue(key, params[1]);
+    const tempKey = hexWith32BytesToString(params[0]);
+    const isOtherKey = tempKey.includes("�");
+    const key = isOtherKey ? params[0] : tempKey;
+    const value = isOtherKey ? trim(params[1]) : decodeValue(key, params[1]);
 
     return { proposalType, params: [key, value] };
   }
diff --git a/nuxt.config.ts b/nuxt.config.ts
index e8c7247e..bae93da1 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -58,7 +58,7 @@ export default defineNuxtConfig({
           "pages/delegate.vue",
         ]
       : auctionActive === false
-        ? ["pages/auction.vue", "pages/fees.vue"]
+        ? ["pages/auction.vue", "pages/rewards.vue"]
         : undefined, //no router is ignored
   imports: {
     dirs: ["./stores"],
diff --git a/pages/config/governance.vue b/pages/config/governance.vue
index e32752de..bbca8ab0 100644
--- a/pages/config/governance.vue
+++ b/pages/config/governance.vue
@@ -105,6 +105,10 @@ const immutable = computed(() => {
       key: "mToken",
       value: getMToken().value,
     },
+    {
+      key: "smartMContract",
+      value: useNetworkStore().getNetwork().value.contracts.wrappedMToken,
+    },
   ];
 });
 
@@ -188,6 +192,12 @@ const inmutableParametersData = [
     description:
       "$M is a fungible token that can be generated by a Minter by locking Eligible Collateral in a secure off-chain facility.",
   },
+  {
+    title: "Smart $M",
+    key: "smartMContract",
+    description:
+      "Our next-gen wrapper contract for the $M cryptodollar. This wrapper maintains a 1:1 rate with $M and offers integrators unprecedented control over yield in DeFi protocols.",
+  },
   {
     title: "Distribution Vault",
     key: "vault",
diff --git a/pages/proposal/create.vue b/pages/proposal/create.vue
index 0239cb7f..e51c3773 100644
--- a/pages/proposal/create.vue
+++ b/pages/proposal/create.vue
@@ -205,9 +205,15 @@ import {
   writeContract,
   readContract,
 } from "@wagmi/core";
-import { encodeFunctionData, encodeAbiParameters, Hash, erc20Abi } from "viem";
+import {
+  encodeFunctionData,
+  encodeAbiParameters,
+  Hash,
+  erc20Abi,
+  isAddress,
+} from "viem";
 import { useAccount } from "use-wagmi";
-import { required, minLength, maxLength, url } from "@vuelidate/validators";
+import { required, minLength, url, helpers } from "@vuelidate/validators";
 import { useVuelidate } from "@vuelidate/core";
 import { storeToRefs } from "pinia";
 
@@ -271,6 +277,21 @@ const formData = reactive({
   discussionURL: null,
 });
 
+const validations = {
+  address: helpers.withMessage(
+    "Address is not valid",
+    (value: string) => isAddress(value) || !value,
+  ),
+  range: (min: number, max: number) =>
+    helpers.withMessage(
+      `Invalid value, acceptable range is ${min}-${max}`,
+      (value: string) => {
+        const numberValue = Number(value);
+        return numberValue >= min && numberValue <= max;
+      },
+    ),
+};
+
 const rules = computed(() => {
   const constRules = {
     description: { required, minLength: minLength(6) },
@@ -286,8 +307,7 @@ const rules = computed(() => {
       proposalValue: { required },
       proposalValue2: {
         required,
-        minLength: minLength(42),
-        maxLength: maxLength(42),
+        addressValidation: validations.address,
       },
       proposalValue3: {},
       ...constRules,
@@ -299,22 +319,21 @@ const rules = computed(() => {
       proposalValue: { required },
       proposalValue2: {
         required,
-        minLength: minLength(42),
-        maxLength: maxLength(42),
+        addressValidation: validations.address,
       },
       proposalValue3: {
         required,
-        minLength: minLength(42),
-        maxLength: maxLength(42),
+        addressValidation: validations.address,
       },
       ...constRules,
     };
   }
 
   if (["setKey"].includes(type)) {
+    const selectedKey = formData.proposalValue || "";
     return {
       proposalValue: { required },
-      proposalValue2: { required },
+      proposalValue2: getKeyBasedValidation(selectedKey),
       proposalValue3: {},
       ...constRules,
     };
@@ -336,7 +355,7 @@ const rules = computed(() => {
     ].includes(type)
   ) {
     return {
-      proposalValue: { required },
+      proposalValue: { required, range: validations.range(10, 100) },
       proposalValue2: {},
       proposalValue3: {},
       ...constRules,
@@ -854,20 +873,6 @@ function buildCalldatas(formData) {
         return addressToHexWith32Bytes(inp);
       }
 
-      if (
-        [
-          "penalty_rate",
-          "mint_ratio",
-          "base_minter_rate",
-          "max_earner_rate",
-        ].includes(key)
-      ) {
-        return encodeAbiParameters(
-          [{ type: "uint256" }],
-          [BigInt(percentageToBasispoints(inp))],
-        );
-      }
-
       return encodeAbiParameters([{ type: "uint256" }], [BigInt(inp)]);
     };
 
@@ -924,6 +929,33 @@ function buildCalldatasTtg(functionName: any, args: any) {
   });
 }
 
+function getKeyBasedValidation(key: string) {
+  switch (key) {
+    case "minter_rate_model":
+    case "earner_rate_model":
+      return { required, address: validations.address };
+    case "base_minter_rate":
+    case "max_earner_rate":
+      return { required, range: validations.range(1, 5000) };
+    case "penalty_rate":
+      return { required, range: validations.range(1, 1000) };
+    case "update_collateral_interval":
+      return { required, range: validations.range(60, 31536000) }; // 1 minute to 1 year
+    case "update_collateral_threshold":
+      return { required, range: validations.range(1, 10) };
+    case "mint_delay":
+      return { required, range: validations.range(60, 86400) }; // 1 minute to 1 day
+    case "mint_ttl":
+      return { required, range: validations.range(3600, 864000) }; // 1 hour to 10 days
+    case "mint_ratio":
+      return { required, range: validations.range(50, 100) }; // Percent range
+    case "minter_freeze_time":
+      return { required, range: validations.range(3600, 2592000) }; // 1 hour to 1 month
+    default:
+      return { required };
+  }
+}
+
 function onBack() {
   isPreview.value = false;
   previewDescription.value = null;
diff --git a/pages/fees.vue b/pages/rewards.vue
similarity index 75%
rename from pages/fees.vue
rename to pages/rewards.vue
index 3ccdc15d..b635bb9f 100644
--- a/pages/fees.vue
+++ b/pages/rewards.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <PageTitle class="px-6 lg:p-0 mb-8">
-      <template #default>Protocol Fees</template>
+      <template #default>Rewards</template>
       <template #subtitle>
         <p class="text-grey-500 font-inter">
-          In exchange for ZERO holders' guardianship over protocol governance,
+          In exchange for ZERO holders' participation in protocol governance,
           they will receive the remainder of the protocol fees.
           <a
             href="https://docs.m0.org/m-0-documentation-portal/overview/whitepaper/iii.-governance/iii.ii-operation/iii.ii.viii-zero-claiming-of-residual-value"
@@ -17,37 +17,7 @@
       </template>
     </PageTitle>
 
-    <div class="px-6 lg:p-0 my-8">
-      <h3 class="text-sm font-inter text-grey-200 mb-3">
-        Total amount to be distributed among all holders
-      </h3>
-      <div class="flex flex-wrap gap-6 lg:gap-12">
-        <MIconLoading v-if="loadingData" />
-        <div v-for="(token, i) in cashTokens" v-else :key="token.address">
-          <span class="token-label">{{ token.name }}</span>
-          <MTokenAmount
-            :amount="formatUnits(token.distributable, token.decimals)"
-            :image="`/img/tokens/${token.symbol.toLowerCase()}.svg`"
-            :name="token.name"
-            size="20"
-          />
-          <MButton
-            class="distribute-button"
-            :is-loading="token.isDistributing"
-            :disabled="token.isDistributing || token.distributable === 0n"
-            @click="distributeRewards(token, i)"
-          >
-            Distribute
-          </MButton>
-        </div>
-      </div>
-    </div>
-
     <div class="px-6 lg:p-0 my-12">
-      <h3 class="text-sm font-inter text-grey-200 mb-3">
-        Claimable as ZERO holder
-      </h3>
-
       <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
         <MIconLoading v-if="loadingData" />
         <div
@@ -58,17 +28,40 @@
         >
           <div class="flex justify-between items-end">
             <div>
-              <h4 class="mb-3">{{ token.name }}</h4>
-              <span class="token-label">Claimable balance</span>
+              <h4 class="mb-3 text-2xl">{{ token.name }}</h4>
+              <span class="token-label">Available for distribution:</span>
+              <div>
+                <span class="text-sm">
+                  {{ token.symbol }}
+                  {{ formatUnits(token.distributable, token.decimals) }}
+                </span>
+              </div>
+            </div>
+
+            <MButton
+              class="min-w-32 flex justify-center"
+              :is-loading="token.isDistributing"
+              :disabled="token.isDistributing || token.distributable === 0n"
+              version="outline-light"
+              @click="distributeRewards(token, i)"
+            >
+              Distribute
+            </MButton>
+          </div>
+          <hr class="my-6 border-grey-700" />
+
+          <div class="flex justify-between items-end">
+            <div>
+              <span class="token-label">Available for claiming:</span>
               <MTokenAmount
-                :amount="token.claimable"
+                :amount="formatUnits(token.claimable, token.decimals)"
                 :image="`/img/tokens/${token.symbol.toLowerCase()}.svg`"
                 :name="token.name"
                 size="30"
               />
             </div>
             <MButton
-              :disabled="token.claimable === 0n || token.isClaiming"
+              class="min-w-32 flex justify-center"
               :is-loading="token.isClaiming"
               @click="claimTokenRewards(token, i)"
               >Claim</MButton
@@ -76,10 +69,6 @@
           </div>
         </div>
       </div>
-
-      <p class="token-label my-3">
-        Residual balance will be claimed to the connected address.
-      </p>
     </div>
   </div>
 </template>
@@ -111,9 +100,13 @@ const alerts = useAlertsStore();
 
 const allowedCashTokens = computed(() => ttg.governors.zero.allowedCashTokens);
 
-const claimEpochStart = computed(() =>
-  BigInt(epoch.value.current.asNumber - 50),
-);
+const claimEpochStart = computed(() => {
+  if (!epoch.value.current) return 0n;
+  return epoch.value.current.asNumber > 5000
+    ? BigInt(epoch.value.current.asNumber - 5000)
+    : 1n;
+});
+
 const claimEpochEnd = computed(() => BigInt(epoch.value.current.asNumber - 1));
 
 onMounted(async () => {
@@ -234,7 +227,4 @@ const claimTokenRewards = async (token, index) => {
 .token-label {
   @apply text-grey-500 text-xxs font-inter mb-1;
 }
-.distribute-button {
-  @apply mt-4 text-xs !important;
-}
 </style>