diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html
index f6c94179d..2bff87041 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html
@@ -266,7 +266,7 @@
           <td><span>{{recurringDepositsAccountData.interestCalculationType.value}}</span></td>
         </tr>
         <tr>
-          <td># {{"labels.inputs.Days in Year" | translate }}</td>
+          <td>{{"labels.inputs.Days in Year" | translate }}</td>
           <td><span>{{recurringDepositsAccountData.interestCalculationDaysInYearType.value}}</span></td>
         </tr>
         <tr *ngIf="recurringDepositsAccountData.preClosurePenalApplicable">
@@ -295,7 +295,7 @@
           <td><span>{{recurringDepositsAccountData.interestCalculationType.value}}</span></td>
         </tr>
         <tr>
-          <td># {{"labels.inputs.Days in Year" | translate }}</td>
+          <td>{{"labels.inputs.Days in Year" | translate }}</td>
           <td><span>{{recurringDepositsAccountData.interestCalculationDaysInYearType.value}}</span></td>
         </tr>
         <tr *ngIf="recurringDepositsAccountData.preClosurePenalApplicable">
diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
index 100f6ee48..09e2fa4d6 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
@@ -86,7 +86,7 @@
       </mat-select>
     </mat-form-field>
 
-    <mat-form-field fxFlex="20%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2">
+    <mat-form-field fxFlex="14%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2">
       <mat-label>{{"labels.inputs.Select On" | translate}}</mat-label>
       <mat-select formControlName="repaymentFrequencyNthDayType">
         <mat-option *ngFor="let repaymentFrequencyNthDayType of repaymentFrequencyNthDayTypeData"
@@ -96,7 +96,7 @@
       </mat-select>
     </mat-form-field>
 
-    <mat-form-field fxFlex="20%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2">
+    <mat-form-field fxFlex="14%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2">
       <mat-label>{{"labels.inputs.Select Day" | translate}}</mat-label>
       <mat-select formControlName="repaymentFrequencyDayOfWeekType">
         <mat-option *ngFor="let repaymentFrequencyDayOfWeekType of repaymentFrequencyDaysOfWeekTypeData"
@@ -124,7 +124,7 @@
         </mat-select>
       </mat-form-field>
     
-      <mat-form-field fxFlex="23%">
+      <mat-form-field fxFlex="14%">
         <mat-label>{{"labels.inputs.Amortization" | translate}}</mat-label>
         <mat-select required matTooltip="{{ 'tooltips.The Amortization value' | translate}}" formControlName="amortizationType">
           <mat-option *ngFor="let amortizationType of amortizationTypeData" [value]="amortizationType.id">
@@ -135,8 +135,13 @@
           {{"labels.inputs.Amortization Type" | translate}} {{"labels.commons.is" | translate}} <strong>{{"labels.commons.required" | translate}}</strong>
         </mat-error>
       </mat-form-field>
+      
+      <mat-form-field fxFlex="14%" *ngIf="isEqualPrincipalPayments()">
+        <mat-label>{{"labels.inputs.Principal Percentage Per Installment" | translate}}</mat-label>
+        <input type="number" matInput formControlName="fixedPrincipalPercentagePerInstallment">
+      </mat-form-field>
 
-      <mat-checkbox fxFlex="23%" formControlName="isEqualAmortization"
+      <mat-checkbox fxFlex="14%" formControlName="isEqualAmortization"
         [checked]="loansAccountTermsData?.isEqualAmortization">
         <p>{{"labels.inputs.Is Equal Amortization" | translate}}</p>
       </mat-checkbox>
@@ -175,6 +180,7 @@
       </div>
 
     </ng-container>
+    <h4 fxFlex="98%" class="mat-h4">{{"labels.inputs.Loan Schedule" | translate}}</h4>
 
     <div fxFlex="48%" *ngIf="loanScheduleType">
       <span fxFlex="40%"><p>{{"labels.inputs.Loan Schedule Type" | translate}}</p></span>
diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
index 2a9829926..73207d16a 100644
--- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
+++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
@@ -269,10 +269,19 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         this.calculateLoanTerm(numberOfRepayments, repaymentEvery);
       });
 
-      this.loansAccountTermsForm.get('loanTermFrequencyType').valueChanges
+    this.loansAccountTermsForm.get('loanTermFrequencyType').valueChanges
         .subscribe(loanTermFrequencyType => {
           this.loansAccountTermsForm.patchValue({'repaymentFrequencyType': loanTermFrequencyType});
       });
+
+    this.loansAccountTermsForm.get('amortizationType').valueChanges
+      .subscribe(amortizationType => {
+        if (amortizationType === 0) {  // Equal Principal Payments
+          this.loansAccountTermsForm.addControl('fixedPrincipalPercentagePerInstallment', new UntypedFormControl(''));
+        } else {  // Equal Installments
+          this.loansAccountTermsForm.removeControl('fixedPrincipalPercentagePerInstallment');
+        }
+    });
   }
 
   setAdvancedPaymentStrategyControls(): void {
@@ -282,7 +291,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         this.loansAccountTermsForm.removeControl('fixedLength');
         if (this.loansAccountTermsData.product.fixedLength) {
           this.loansAccountTermsForm.addControl('interestRatePerPeriod', new UntypedFormControl({value: 0, disabled: true}, Validators.required));
-          this.loansAccountTermsForm.addControl('fixedLength', new UntypedFormControl({value: this.loansAccountTermsData.product.fixedLength, disabled: true}));
+          this.loansAccountTermsForm.addControl('fixedLength', new UntypedFormControl(this.loansAccountTermsData.product.fixedLength));
         } else {
           this.loansAccountTermsForm.addControl('interestRatePerPeriod', new UntypedFormControl(this.loansAccountTermsData.interestRatePerPeriod, Validators.required));
         }
@@ -296,6 +305,10 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
     return false;
   }
 
+  isEqualPrincipalPayments(): boolean {
+    return (this.loansAccountTermsForm.value.amortizationType === 0);
+  }
+
   /** Create Loans Account Terms Form */
   createloansAccountTermsForm() {
     this.loansAccountTermsForm = this.formBuilder.group({
@@ -493,9 +506,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
    * Returns loans account terms form value.
    */
   get loansAccountTerms() {
-    const terms = this.loansAccountTermsForm.getRawValue();
-    delete terms['fixedLength'];
-    return terms;
+    return this.loansAccountTermsForm.getRawValue();
   }
 
   get loanCollateral() {
diff --git a/src/app/loans/loans-view/account-details/account-details.component.html b/src/app/loans/loans-view/account-details/account-details.component.html
index 22275b0dd..5d89d5417 100644
--- a/src/app/loans/loans-view/account-details/account-details.component.html
+++ b/src/app/loans/loans-view/account-details/account-details.component.html
@@ -1,27 +1,37 @@
-<div class="container">
+<div class="container p-b-20">
   <h3> {{"labels.heading.Loan Details" | translate}} </h3>
 
     <div fxLayout="row wrap" fxLayout.lt-md="column">
 
         <div fxFlexFill>
-            <span fxFlex="50%">{{"labels.inputs.Repayment Strategy" | translate}}:</span>
+            <span fxFlex="50%">{{"labels.inputs.Repayment Strategy" | translate}}</span>
             <span fxFlex="50%">{{ loanDetails.transactionProcessingStrategyName }}</span>
         </div>
 
         <div fxFlexFill>
-            <span fxFlex="50%">{{"labels.inputs.Repayments" | translate}}:</span>
+            <span fxFlex="50%">{{"labels.inputs.Repayments" | translate}}</span>
             <span fxFlex="50%">{{loanDetails.numberOfRepayments}} every {{loanDetails.repaymentEvery}}&nbsp;{{loanDetails.repaymentFrequencyType.value}}
-            <span *ngIf="loanDetails.repaymentFrequencyType?.id == 2 && loanDetails.repaymentFrequencyNthDayType?.id != 0 && loanDetails.repaymentFrequencyDayOfWeekType?.id != 0">
-              &nbsp;on&nbsp;{{loanDetails.repaymentFrequencyNthDayType?.value}}&nbsp;{{loanDetails.repaymentFrequencyDayOfWeekType?.value}}
+            <span *ngIf="loanDetails.repaymentFrequencyType?.id == 2 && loanDetails.repaymentFrequencyNthDayType?.id != 0 && loanDetails.repaymentFrequencyDayOfWeekType?.id != 0" class="m-l-10">
+              <span class="m-l-10">{{"labels.commons.on" | translate}}</span>{{loanDetails.repaymentFrequencyNthDayType?.value}}&nbsp;{{loanDetails.repaymentFrequencyDayOfWeekType?.value}}
             </span>
             </span>
         </div>
 
+        <div fxFlexFill *ngIf="loanDetails.fixedLength">
+            <span fxFlex="50%"> {{"labels.inputs.Fixed Length" | translate}} </span>
+            <span fxFlex="50%"> {{loanDetails.fixedLength}} {{loanDetails.repaymentFrequencyType.value}}</span>
+        </div>
+
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Amortization" | translate}} </span>
             <span fxFlex="50%"> {{loanDetails.amortizationType.value}} </span>
         </div>
 
+        <div fxFlexFill *ngIf="loanDetails.fixedPrincipalPercentagePerInstallment">
+            <span fxFlex="50%"> {{"labels.inputs.Principal Percentage Per Installment" | translate}} </span>
+            <span fxFlex="50%"> {{loanDetails.fixedPrincipalPercentagePerInstallment | formatNumber}} %</span>
+        </div>
+
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Equal Amortization" | translate}} </span>
             <span fxFlex="50%"> {{loanDetails.isEqualAmortization | yesNo}} </span>
@@ -29,7 +39,12 @@
 
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Interest" | translate}} </span>
-            <span fxFlex="50%"> {{loanDetails.annualInterestRate | formatNumber}} {{"labels.text.per annum" | translate}} ({{loanDetails.interestRatePerPeriod}} %&nbsp; {{loanDetails.interestRateFrequencyType.value}}) - {{"labels.text." + loanDetails.interestType.value | translate}} </span>
+            <span fxFlex="50%"> {{loanDetails.annualInterestRate | formatNumber}} % {{"labels.text.per annum" | translate}} ({{loanDetails.interestRatePerPeriod}} %&nbsp; {{loanDetails.interestRateFrequencyType.value}}) </span>
+        </div>
+
+        <div fxFlexFill>
+            <span fxFlex="50%"> {{"labels.inputs.Interest Type" | translate}} </span>
+            <span fxFlex="50%"> {{"labels.text." + loanDetails.interestType.value | translate}} </span>
         </div>
 
         <div fxFlexFill>
@@ -48,12 +63,12 @@
         </div>
 
         <div fxFlexFill>
-          <span fxFlex="50%"> Enable Installment Level Delinquency </span>
+          <span fxFlex="50%"> {{"labels.inputs.Enable Installment Level Delinquency" | translate}} </span>
           <span fxFlex="50%"> {{loanDetails.enableInstallmentLevelDelinquency | yesNo}} </span>
         </div>
 
         <div fxFlexFill>
-            <span fxFlex="50%"> Fund Source</span>
+            <span fxFlex="50%"> {{"labels.inputs.Fund Source" | translate}} </span>
             <span fxFlex="50%" *ngIf="loanDetails.fundName"> {{loanDetails.fundName}} </span>
             <span fxFlex="50%" *ngIf="!loanDetails.fundName"> {{"labels.inputs.Unassigned" | translate}} </span>
         </div>
@@ -73,11 +88,6 @@
             <span fxFlex="50%"> {{loanDetails.allowPartialPeriodInterestCalcualtion | yesNo}} </span>
         </div>
 
-        <div fxFlexFill>
-            <span fxFlex="50%"> {{"labels.inputs.Interest Type" | translate}}</span>
-            <span fxFlex="50%"> {{"labels.text." + loanDetails.interestType.value | translate}} </span>
-        </div>
-
         <div fxFlexFill>
             <span fxFlex="50%"> {{"labels.inputs.Submitted on" | translate}}</span>
             <span fxFlex="50%"> {{loanDetails.timeline.submittedOnDate | dateFormat }} </span>
diff --git a/src/app/products/charges/view-charge/view-charge.component.ts b/src/app/products/charges/view-charge/view-charge.component.ts
index 2148533ed..acb853b1c 100644
--- a/src/app/products/charges/view-charge/view-charge.component.ts
+++ b/src/app/products/charges/view-charge/view-charge.component.ts
@@ -37,7 +37,7 @@ export class ViewChargeComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private dialog: MatDialog,
-    private translateService:TranslateService) {
+    private translateService: TranslateService) {
     this.route.data.subscribe((data: { charge: any }) => {
       this.chargeData = data.charge;
       if (this.chargeData.minCap) {
@@ -57,7 +57,7 @@ export class ViewChargeComponent implements OnInit {
    */
   deleteCharge() {
     const deleteChargeDialogRef = this.dialog.open(DeleteDialogComponent, {
-      data: { deleteContext: this.translateService.instant('labels.inputs.Charge') + " " + this.chargeData.id}
+      data: { deleteContext: this.translateService.instant('labels.inputs.Charge') + ' ' + this.chargeData.id}
     });
     deleteChargeDialogRef.afterClosed().subscribe((response: any) => {
       if (response.delete) {
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html
index c2277c951..37d0ca4d4 100644
--- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html
+++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html
@@ -232,7 +232,7 @@
   </div>
 
   <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
-    <button mat-raised-button matStepperPrevious disabled>
+    <button mat-raised-button matStepperPrevious>
       <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
       Previous
     </button>
diff --git a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.html b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.html
index d674f6f84..e159c0a7f 100644
--- a/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.html
+++ b/src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-interest-rate-chart-step/recurring-deposit-product-interest-rate-chart-step.component.html
@@ -216,7 +216,7 @@
   </div>
 
   <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
-    <button mat-raised-button matStepperPrevious disabled>
+    <button mat-raised-button matStepperPrevious>
       <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
       Previous
     </button>
diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-currency-step/saving-product-currency-step.component.html b/src/app/products/saving-products/saving-product-stepper/saving-product-currency-step/saving-product-currency-step.component.html
index ef8ef78cf..e3db3f612 100644
--- a/src/app/products/saving-products/saving-product-stepper/saving-product-currency-step/saving-product-currency-step.component.html
+++ b/src/app/products/saving-products/saving-product-stepper/saving-product-currency-step/saving-product-currency-step.component.html
@@ -33,7 +33,7 @@
   </div>
 
   <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
-    <button mat-raised-button matStepperPrevious disabled>
+    <button mat-raised-button matStepperPrevious>
       <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
       {{'labels.buttons.Previous' | translate}}
     </button>
diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-settings-step/saving-product-settings-step.component.html b/src/app/products/saving-products/saving-product-stepper/saving-product-settings-step/saving-product-settings-step.component.html
index d19a44835..da7f6d990 100644
--- a/src/app/products/saving-products/saving-product-stepper/saving-product-settings-step/saving-product-settings-step.component.html
+++ b/src/app/products/saving-products/saving-product-stepper/saving-product-settings-step/saving-product-settings-step.component.html
@@ -122,7 +122,7 @@
   </div>
 
   <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
-    <button mat-raised-button matStepperPrevious disabled>
+    <button mat-raised-button matStepperPrevious>
       <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
       {{'labels.buttons.Previous' | translate}}
     </button>
diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-terms-step/saving-product-terms-step.component.html b/src/app/products/saving-products/saving-product-stepper/saving-product-terms-step/saving-product-terms-step.component.html
index 812bde3a6..560add4b1 100644
--- a/src/app/products/saving-products/saving-product-stepper/saving-product-terms-step/saving-product-terms-step.component.html
+++ b/src/app/products/saving-products/saving-product-stepper/saving-product-terms-step/saving-product-terms-step.component.html
@@ -63,7 +63,7 @@
   </div>
 
   <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
-    <button mat-raised-button matStepperPrevious disabled>
+    <button mat-raised-button matStepperPrevious>
       <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
       {{'labels.buttons.Previous' | translate}}
     </button>
diff --git a/src/app/savings/savings-account-view/general-tab/general-tab.component.html b/src/app/savings/savings-account-view/general-tab/general-tab.component.html
index b49f38a46..bb718fb77 100644
--- a/src/app/savings/savings-account-view/general-tab/general-tab.component.html
+++ b/src/app/savings/savings-account-view/general-tab/general-tab.component.html
@@ -126,7 +126,7 @@
           <td>{{savingsAccountData.interestCalculationType.value}}</td>
         </tr>
         <tr>
-          <td># {{'labels.inputs.Days in Year' | translate}}</td>
+          <td>{{'labels.inputs.Days in Year' | translate}}</td>
           <td>{{savingsAccountData.interestCalculationDaysInYearType.value}}</td>
         </tr>
         <tr *ngIf="savingsAccountData.withdrawalFee">
diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html
index 8862b1e03..7f3435b07 100644
--- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html
+++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html
@@ -93,7 +93,7 @@
   <div class="alert" [hidden]="accountWithTransactions">
     <div class="message">
       <i class="fa fa-exclamation-circle alert-check"></i>
-      {{ "labels.texts.No transaction was found" | translate }}
+      {{ "labels.text.No transaction was found" | translate }}
     </div>
   </div>
 </div>
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index f9a8f2447..1d99df5a2 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -544,7 +544,8 @@
       "numeral": "číslice",
       "required": "Požadované",
       "required and cannot be negative": "požadováno a nemůže být záporné",
-      "should": "by měl"
+      "should": "by měl",
+      "on": "na"
     },
     "heading": {
       "Account Linked Financial": "Seznam účtů spojených s různými finančními aktivitami. Chcete-li vědět více, klikněte:",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "Produkty s pevným vkladem",
       "Fixed EMI amount": "Pevná částka EMI",
       "Fixed Length": "Pevná délka",
+      "Principal Percentage Per Installment": "Pevné procento jistiny na splátku",
       "Floating Interest Rate": "Pohyblivá úroková sazba",
       "Floating Interest Rate Calculation Allowed": "Výpočet pohyblivé úrokové sazby povolen",
       "Floating Interest Rates": "Pohyblivé úrokové sazby",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index 4b4f4a309..e12cd9f1f 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -544,7 +544,8 @@
       "numeral": "Ziffer",
       "required": "erforderlich",
       "required and cannot be negative": "erforderlich und darf nicht negativ sein",
-      "should": "sollen"
+      "should": "sollen",
+      "on": "An"
     },
     "heading": {
       "Account Linked Financial": "Liste der Konten, die mit verschiedenen Finanzaktivitäten verknüpft sind. Um mehr zu erfahren, klicken Sie:",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "Festgeldprodukte",
       "Fixed EMI amount": "Fester EMI-Betrag",
       "Fixed Length": "Feste Länge",
+      "Principal Percentage Per Installment": "Fester Kapitalprozentsatz pro Rate",
       "Floating Interest Rate": "Variabler Zinssatz",
       "Floating Interest Rate Calculation Allowed": "Variable Zinssatzberechnung zulässig",
       "Floating Interest Rates": "Variable Zinssätze",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index 9f1aaa9b7..47ca57da8 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -544,7 +544,8 @@
             "numeral": "numeral",
             "required": "required",
             "required and cannot be negative": "required and cannot be negative",
-            "should": "should"
+            "should": "should",
+            "on": "on"
         },
         "heading": {
             "Account Linked Financial": "List of accounts linked to different financial activities. To know more click:",
@@ -1319,6 +1320,7 @@
             "Fixed Deposit Products": "Fixed Deposit Products",
             "Fixed EMI amount": "Fixed EMI amount",
             "Fixed Length": "Fixed Length",
+            "Principal Percentage Per Installment": "Principal Percentage Per Installment",
             "Floating Interest Rate": "Floating Interest Rate",
             "Floating Interest Rate Calculation Allowed": "Floating Interest Rate Calculation Allowed",
             "Floating Interest Rates": "Floating Interest Rates",
@@ -1462,7 +1464,7 @@
             "Is Dependent": "Is Dependent",
             "Is Dependent?": "Is Dependent",
             "Is Differential": "Is Differential",
-            "Is Equal Amortization": "Is Equal Amortization",
+            "Is Equal Amortization": "Is Equal Amortization?",
             "Is Floating Rate": "Is Floating Rate",
             "Is Floating calculation allowed?": "Is Floating calculation allowed?",
             "Is Interest Posting required on closure date": "Is Interest Posting required on closure date",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index 744621022..2a8fc8419 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -387,11 +387,11 @@
             "Download": "Descargar",
             "Download CSV": "Descargar CSV",
             "Edit": "Editar",
-            "Edit Code": "Editar código",
-            "Edit Schedule": "Editar horario",
-            "Edit Survey": "Editar encuesta",
+            "Edit Code": "Editar Código",
+            "Edit Schedule": "Editar Calendario",
+            "Edit Survey": "Editar Encuesta",
             "Enable": "Permitir",
-            "Expand All": "Expandir todo",
+            "Expand All": "Expandir Todo",
             "Export": "Exportar",
             "Export CSV": "Exportar CSV",
             "Export XLS": "Exportar XLS",
@@ -544,7 +544,8 @@
             "numeral": "número",
             "required": "requerido",
             "required and cannot be negative": "requerido y no puede ser negativo",
-            "should": "debería"
+            "should": "debería",
+            "on": "en"
         },
         "heading": {
             "Account Linked Financial": "Listado de cuentas vinculadas a diferentes actividades financieras. Para saber más haga clic en:",
@@ -791,7 +792,7 @@
             "Question": "Pregunta",
             "Recent Activities": "Actividades recientes",
             "Recover from Guarantor": "Recuperarse del garante",
-            "Recover Original Schedule": "Recuperar el horario original",
+            "Recover Original Schedule": "Recuperar el calendario original",
             "Recurring Deposit Accounts": "Cuentas de depósito recurrentes",
             "Recurring Deposit Details": "Detalles del Depósito Recurrente",
             "Recurring Deposit Products": "Productos de depósito recurrentes",
@@ -1320,6 +1321,7 @@
             "Fixed Deposit Products": "Productos de Depósito Fijo",
             "Fixed EMI amount": "Monto fijo de Cuota",
             "Fixed Length": "Longitud fija",
+            "Principal Percentage Per Installment": "Porcentaje de capital por cuota",
             "Floating Interest Rate": "Tasa de interés variable",
             "Floating Interest Rate Calculation Allowed": "Se permite el cálculo de la tasa de interés variable",
             "Floating Interest Rates": "Tasas de interés variables",
@@ -1684,7 +1686,7 @@
             "Order": "Orden",
             "Original": "Original",
             "Original Loan": "Crédito original",
-            "Original Schedule": "Horario original",
+            "Original Schedule": "Calendario original",
             "Output Type": "Tipo de salida",
             "Outstanding": "Pendiente",
             "Overdraft": "Sobregiro",
@@ -2633,7 +2635,7 @@
             "Notifications": "Notificaciones",
             "Organization": "Organización",
             "Organization available languages": "La organización puede seleccionar un idioma aquí entre los idiomas disponibles aquí.",
-            "Original Schedule": "Horario original",
+            "Original Schedule": "Calendario original",
             "Overdue Charges": "Comisiones Moratorias",
             "Password Preferences": "Preferencias de contraseña",
             "Passwords": "Contraseñas",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index b8e783cf5..d63599f0a 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -544,7 +544,8 @@
       "numeral": "numéral",
       "required": "requis",
       "required and cannot be negative": "obligatoire et ne peut pas être négatif",
-      "should": "devrait"
+      "should": "devrait",
+      "on": "sur"
     },
     "heading": {
       "Account Linked Financial": "Liste des comptes liés aux différentes activités financières. Pour en savoir plus cliquez :",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "Produits de dépôt fixe",
       "Fixed EMI amount": "Montant EMI fixe",
       "Fixed Length": "Longueur fixe",
+      "Principal Percentage Per Installment": "Pourcentage de capital fixe par versement",
       "Floating Interest Rate": "Taux d'intérêt flottant",
       "Floating Interest Rate Calculation Allowed": "Calcul du taux d'intérêt flottant autorisé",
       "Floating Interest Rates": "Taux d'intérêt flottants",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index 41cd032c2..823cb55f7 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -544,7 +544,8 @@
       "numeral": "numero",
       "required": "necessario",
       "required and cannot be negative": "obbligatorio e non può essere negativo",
-      "should": "Dovrebbe"
+      "should": "Dovrebbe",
+      "on": "SU"
     },
     "heading": {
       "Account Linked Financial": "Elenco dei conti collegati a diverse attività finanziarie. Per saperne di più clicca:",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "Prodotti a deposito fisso",
       "Fixed EMI amount": "Importo EMI fisso",
       "Fixed Length": "Lunghezza fissa",
+      "Principal Percentage Per Installment": "Percentuale capitale fissa per rata",
       "Floating Interest Rate": "Tasso di interesse variabile",
       "Floating Interest Rate Calculation Allowed": "Calcolo del tasso di interesse variabile consentito",
       "Floating Interest Rates": "Tassi di interesse variabili",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index 840b4b0ce..2419cdc7c 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -544,7 +544,8 @@
       "numeral": "숫자",
       "required": "필수의",
       "required and cannot be negative": "필수이며 음수일 수 없습니다.",
-      "should": "~해야 한다"
+      "should": "~해야 한다",
+      "on": "~에"
     },
     "heading": {
       "Account Linked Financial": "다양한 금융 활동과 연결된 계정 목록입니다. 자세한 내용을 보려면 다음을 클릭하세요.",
@@ -1321,6 +1322,7 @@
       "Fixed Deposit Products": "정기예금 상품",
       "Fixed EMI amount": "고정 EMI 양",
       "Fixed Length": "고정 길이",
+      "Principal Percentage Per Installment": "할부당 고정 원금 비율",
       "Floating Interest Rate": "변동금리",
       "Floating Interest Rate Calculation Allowed": "변동금리 계산 허용",
       "Floating Interest Rates": "변동금리",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index 24e860e4e..32f4837a9 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -544,7 +544,8 @@
       "numeral": "skaičius",
       "required": "reikalaujama",
       "required and cannot be negative": "privaloma ir negali būti neigiama",
-      "should": "turėtų"
+      "should": "turėtų",
+      "on": "įjungta"
     },
     "heading": {
       "Account Linked Financial": "Sąskaitų, susietų su įvairia finansine veikla, sąrašas. Norėdami sužinoti daugiau, spustelėkite:",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "Fiksuoto indėlio produktai",
       "Fixed EMI amount": "Fiksuota EMI suma",
       "Fixed Length": "Fiksuotas ilgis",
+      "Principal Percentage Per Installment": "Fiksuota pagrindinės įmokos procentinė dalis",
       "Floating Interest Rate": "Slankioji palūkanų norma",
       "Floating Interest Rate Calculation Allowed": "Leidžiamas kintamos palūkanų normos skaičiavimas",
       "Floating Interest Rates": "Kintamos palūkanų normos",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index dbba98648..7a81fb535 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -544,7 +544,8 @@
       "numeral": "cipars",
       "required": "nepieciešams",
       "required and cannot be negative": "obligāti un nevar būt negatīvs",
-      "should": "vajadzētu"
+      "should": "vajadzētu",
+      "on": "ieslēgts"
     },
     "heading": {
       "Account Linked Financial": "Ar dažādām finanšu darbībām saistīto kontu saraksts. Lai uzzinātu vairāk, noklikšķiniet:",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "Fiksētā depozīta produkti",
       "Fixed EMI amount": "Fiksēta EMI summa",
       "Fixed Length": "Fiksēts garums",
+      "Principal Percentage Per Installment": "Fiksēta pamatprocenti par iemaksu",
       "Floating Interest Rate": "Peldošā procentu likme",
       "Floating Interest Rate Calculation Allowed": "Atļauts mainīgās procentu likmes aprēķināšana",
       "Floating Interest Rates": "Peldošās procentu likmes",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index 1c3d5a0c7..6fbbc05c9 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -544,7 +544,8 @@
       "numeral": "संख्यात्मक",
       "required": "आवश्यक छ",
       "required and cannot be negative": "आवश्यक छ र नकारात्मक हुन सक्दैन",
-      "should": "गर्नुपर्छ"
+      "should": "गर्नुपर्छ",
+      "on": "मा"
     },
     "heading": {
       "Account Linked Financial": "विभिन्न वित्तीय गतिविधिहरु संग जोडिएको खाताहरु को सूची। थप जान्नको लागि क्लिक गर्नुहोस्:",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "फिक्स्ड डिपोजिट उत्पादनहरू",
       "Fixed EMI amount": "निश्चित EMI रकम",
       "Fixed Length": "निश्चित लम्बाई",
+      "Principal Percentage Per Installment": "निश्चित प्रिन्सिपल प्रतिशत प्रति किस्ता",
       "Floating Interest Rate": "फ्लोटिंग ब्याज दर",
       "Floating Interest Rate Calculation Allowed": "फ्लोटिंग ब्याज दर गणना अनुमति छ",
       "Floating Interest Rates": "फ्लोटिंग ब्याज दर",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index fe61a3acb..d40e4dd57 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -544,7 +544,8 @@
       "numeral": "numeral",
       "required": "obrigatório",
       "required and cannot be negative": "obrigatório e não pode ser negativo",
-      "should": "deve"
+      "should": "deve",
+      "on": "sobre"
     },
     "heading": {
       "Account Linked Financial": "Lista de contas vinculadas a diferentes atividades financeiras. Para saber mais clique:",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "Produtos de Depósito Fixo",
       "Fixed EMI amount": "Valor fixo de EMI",
       "Fixed Length": "Comprimento fixo",
+      "Principal Percentage Per Installment": "Porcentagem principal fixa por parcela",
       "Floating Interest Rate": "Taxa de juros flutuante",
       "Floating Interest Rate Calculation Allowed": "Cálculo de taxa de juros flutuante permitido",
       "Floating Interest Rates": "Taxas de juros flutuantes",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index 189641dbb..2f6e559b6 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -544,7 +544,8 @@
       "numeral": "nambari",
       "required": "inahitajika",
       "required and cannot be negative": "inahitajika na haiwezi kuwa hasi",
-      "should": "lazima"
+      "should": "lazima",
+      "on": "juu"
     },
     "heading": {
       "Account Linked Financial": "Orodha ya akaunti zilizounganishwa na shughuli tofauti za kifedha. Kujua zaidi bofya:",
@@ -1320,6 +1321,7 @@
       "Fixed Deposit Products": "Bidhaa za Amana zisizohamishika",
       "Fixed EMI amount": "Kiasi cha EMI kisichobadilika",
       "Fixed Length": "Urefu uliowekwa",
+      "Principal Percentage Per Installment": "Asilimia Kuu Iliyowekwa Kwa Kila Awamu",
       "Floating Interest Rate": "Kiwango cha Riba kinachoelea",
       "Floating Interest Rate Calculation Allowed": "Ukokotoaji wa Kiwango cha Riba Unaoelea Unaruhusiwa",
       "Floating Interest Rates": "Viwango vya Riba vinavyoelea",