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 a484510cd..941540547 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
@@ -52,11 +52,12 @@
       <mat-datepicker #repaymentsPicker></mat-datepicker>
     </mat-form-field>
 
-    <h4 fxFlex="98%" class="mat-h4">Repaid Every <i class="fas fa-question" matTooltip="These fields are input to calculating the repayment schedule for a loan account and are used to determine when payments are due."></i></h4>
+    <h4 fxFlex="98%" class="mat-h4">Repaid Every</h4>
 
     <mat-form-field fxFlex="48%">
       <mat-label>Repaid every</mat-label>
-      <input type="number" matInput required formControlName="repaymentEvery">
+      <input type="number" matInput required formControlName="repaymentEvery"
+      matTooltip="These fields are input to calculating the repayment schedule for a loan account and are used to determine when payments are due.">
       <mat-error *ngIf="loansAccountTermsForm.controls.repaymentEvery.hasError('required')">
         Repaid every is <strong>required</strong>
       </mat-error>
diff --git a/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.html b/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.html
index 2c9bcad4e..6677f49d3 100644
--- a/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.html
+++ b/src/app/products/loan-products/edit-loan-product/edit-loan-product.component.html
@@ -71,6 +71,8 @@
         >
         </mifosx-loan-product-payment-strategy-step>
 
+        <mifosx-stepper-buttons></mifosx-stepper-buttons>
+
       </mat-step>
 
       <mat-step completed>
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.html
index ae8386903..a23953cf7 100644
--- a/src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.html
+++ b/src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.html
@@ -19,7 +19,3 @@
         </ng-template>
     </mat-tab>
 </mat-tab-group>
-
-<div fxLayout="row wrap" fxLayout.lt-md="column" fxLayoutAlign="center" >
-  <mifosx-stepper-buttons fxFlex="100%" fxLayoutGap="2%"></mifosx-stepper-buttons>
-</div>