diff --git a/nym-wallet/src/pages/Admin/index.tsx b/nym-wallet/src/pages/Admin/index.tsx
index 1f88cd8a91..2139671b09 100644
--- a/nym-wallet/src/pages/Admin/index.tsx
+++ b/nym-wallet/src/pages/Admin/index.tsx
@@ -29,93 +29,28 @@ const AdminForm: React.FC<{
         <Grid container spacing={3}>
           <Grid item xs={12}>
             <TextField
-              {...register('minimum_mixnode_bond')}
+              {...register('minimum_mixnode_pledge')}
               required
               variant="outlined"
               id="minimum_mixnode_bond"
               name="minimum_mixnode_bond"
               label="Minumum mixnode bond"
               fullWidth
-              error={!!errors.minimum_mixnode_bond}
-              helperText={errors?.minimum_mixnode_bond?.message}
+              error={!!errors.minimum_mixnode_pledge}
+              helperText={errors?.minimum_mixnode_pledge?.message}
             />
           </Grid>
           <Grid item xs={12}>
             <TextField
-              {...register('minimum_gateway_bond')}
+              {...register('minimum_gateway_pledge')}
               required
               variant="outlined"
               id="minimum_gateway_bond"
               name="minimum_gateway_bond"
               label="Minumum gateway bond"
               fullWidth
-              error={!!errors.minimum_gateway_bond}
-              helperText={errors?.minimum_gateway_bond?.message}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <TextField
-              {...register('mixnode_bond_reward_rate')}
-              required
-              variant="outlined"
-              id="mixnode_bond_reward_rate"
-              name="mixnode_bond_reward_rate"
-              label="Mixnode bond reward rate"
-              fullWidth
-              error={!!errors.mixnode_bond_reward_rate}
-              helperText={errors?.mixnode_bond_reward_rate?.message}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <TextField
-              {...register('gateway_bond_reward_rate')}
-              required
-              variant="outlined"
-              id="gateway_bond_reward_rate"
-              name="gateway_bond_reward_rate"
-              label="Gateway bond reward rate"
-              fullWidth
-              error={!!errors.gateway_bond_reward_rate}
-              helperText={errors?.gateway_bond_reward_rate?.message}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <TextField
-              {...register('mixnode_delegation_reward_rate')}
-              required
-              variant="outlined"
-              id="mixnode_delegation_reward_rate"
-              name="mixnode_delegation_reward_rate"
-              label="Mixnode Delegation Reward Rate"
-              fullWidth
-              error={!!errors.mixnode_delegation_reward_rate}
-              helperText={errors?.mixnode_delegation_reward_rate?.message}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <TextField
-              {...register('gateway_delegation_reward_rate')}
-              required
-              variant="outlined"
-              id="gateway_delegation_reward_rate"
-              name="gateway_delegation_reward_rate"
-              label="Gateway Delegation Reward Rate"
-              fullWidth
-              error={!!errors.gateway_delegation_reward_rate}
-              helperText={errors?.gateway_delegation_reward_rate?.message}
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <TextField
-              {...register('epoch_length')}
-              required
-              variant="outlined"
-              id="epochLength"
-              name="epochLength"
-              label="Epoch length (hours)"
-              fullWidth
-              error={!!errors.epoch_length}
-              helperText={errors?.epoch_length?.message}
+              error={!!errors.minimum_gateway_pledge}
+              helperText={errors?.minimum_gateway_pledge?.message}
             />
           </Grid>
           <Grid item xs={12}>
diff --git a/nym-wallet/src/pages/settings/system-variables.tsx b/nym-wallet/src/pages/settings/system-variables.tsx
index 5d7aa3dea7..ee68e8484e 100644
--- a/nym-wallet/src/pages/settings/system-variables.tsx
+++ b/nym-wallet/src/pages/settings/system-variables.tsx
@@ -10,7 +10,7 @@ import { updateMixnode } from '../../requests';
 import { ClientContext } from '../../context/main';
 
 type TFormData = {
-  profitMarginPercent: number;
+  profitMarginPercent: string;
 };
 
 const DataField = ({ title, info, Indicator }: { title: string; info: string; Indicator: React.ReactElement }) => (
@@ -76,7 +76,7 @@ export const SystemVariables = ({
 
   const onSubmit = async (data: TFormData) => {
     try {
-      await updateMixnode({ profitMarginPercent: data.profitMarginPercent });
+      await updateMixnode({ profitMarginPercent: +data.profitMarginPercent });
       await userBalance.fetchBalance();
       onUpdate();
       setNodeUpdateResponse('success');
diff --git a/nym-wallet/src/pages/welcome/_legacy_create-account.tsx b/nym-wallet/src/pages/welcome/_legacy_create-account.tsx
index 7c1997a584..304ec6a059 100644
--- a/nym-wallet/src/pages/welcome/_legacy_create-account.tsx
+++ b/nym-wallet/src/pages/welcome/_legacy_create-account.tsx
@@ -3,8 +3,9 @@ import { Alert, Button, Card, CardActions, CardContent, CardHeader, Stack, Typog
 import { createAccount } from '../../requests';
 import { TCreateAccount } from '../../types';
 import { CopyToClipboard } from '../../components';
+import { TPages } from './types';
 
-export const CreateAccountContent: React.FC<{ showSignIn: () => void }> = ({ showSignIn }) => {
+export const CreateAccountContent: React.FC<{ page: TPages; showSignIn: () => void }> = ({ page, showSignIn }) => {
   const [accountDetails, setAccountDetails] = useState<TCreateAccount>();
   const [error, setError] = useState<Error>();
 
diff --git a/nym-wallet/src/types/rust/stateparams.ts b/nym-wallet/src/types/rust/stateparams.ts
index 22f6653c0e..68c3e018e9 100644
--- a/nym-wallet/src/types/rust/stateparams.ts
+++ b/nym-wallet/src/types/rust/stateparams.ts
@@ -1,2 +1,6 @@
-
-export interface TauriContractStateParams { minimum_mixnode_pledge: string, minimum_gateway_pledge: string, mixnode_rewarded_set_size: number, mixnode_active_set_size: number, }
\ No newline at end of file
+export interface TauriContractStateParams {
+  minimum_mixnode_pledge: string;
+  minimum_gateway_pledge: string;
+  mixnode_rewarded_set_size: number;
+  mixnode_active_set_size: number;
+}