diff --git a/src/app/loans/loans-view/loans-view.component.html b/src/app/loans/loans-view/loans-view.component.html
index 3af5c9613..96d567a74 100644
--- a/src/app/loans/loans-view/loans-view.component.html
+++ b/src/app/loans/loans-view/loans-view.component.html
@@ -23,6 +23,9 @@
                 <br />
                 <span *ngIf="loanDetailsData.clientName"> Client Name: {{loanDetailsData.clientName}} </span> <br />
                 <span *ngIf="loanDetailsData.group"> Group Name: {{loanDetailsData.group.name}} </span>
+                <span *ngIf="loanDetailsData.delinquencyRange">
+                  Loan Account Classification : {{loanDetailsData?.delinquencyRange.classification}}
+                </span>
               </h3>
             </div>
 
diff --git a/src/app/loans/loans-view/repayment-schedule-tab/repayment-schedule-tab.component.html b/src/app/loans/loans-view/repayment-schedule-tab/repayment-schedule-tab.component.html
index 39526b7cb..f882f6b88 100644
--- a/src/app/loans/loans-view/repayment-schedule-tab/repayment-schedule-tab.component.html
+++ b/src/app/loans/loans-view/repayment-schedule-tab/repayment-schedule-tab.component.html
@@ -1,9 +1,5 @@
 <div class="container">
 
-  <ng-container *ngIf="loanDetails.delinquencyRange">
-    <h3>Loan Account Classification : {{loanDetails?.delinquencyRange.classification}}</h3>
-  </ng-container>
-
   <table mat-table [dataSource]="repaymentScheduleDetails.periods">
 
     <ng-container matColumnDef="number">
diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
index 8d23b14b4..b67b38cfa 100644
--- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
+++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
@@ -74,7 +74,8 @@ export class TransactionsTabComponent implements OnInit {
    */
   showTransactions(transactionsData: any) {
     if (transactionsData.type.id === 2 || transactionsData.type.id === 4 || transactionsData.type.id === 1
-      || transactionsData.type.id === 21 || transactionsData.type.id === 22 || transactionsData.type.id === 23) {
+      || transactionsData.type.id === 20 || transactionsData.type.id === 21 || transactionsData.type.id === 22
+      || transactionsData.type.id === 23) {
       this.router.navigate([transactionsData.id], { relativeTo: this.route });
     }
   }
diff --git a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
index 2dee46f34..59873fd62 100644
--- a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
+++ b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
@@ -1,7 +1,7 @@
 <div fxLayoutAlign="end" class="container m-b-20 transaction-buttons" fxLayoutGap="2%"
   *ngIf="!(transactionData.type.contra)">
   <span *mifosxHasPermission="'ADJUST_LOAN'">
-    <button mat-raised-button color="primary" [routerLink]="'edit'">
+    <button mat-raised-button color="primary" [routerLink]="'edit'" *ngIf="allowEdition">
       <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;Edit
     </button>
   </span>
diff --git a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
index b17ca9a4c..edcec8556 100644
--- a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
+++ b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
@@ -24,6 +24,8 @@ export class ViewTransactionComponent {
 
   /** Transaction data. */
   transactionData: any;
+  /** Is Editable */
+  allowEdition = true;
 
   /**
    * Retrieves the Transaction data from `resolve`.
@@ -42,6 +44,8 @@ export class ViewTransactionComponent {
               private settingsService: SettingsService) {
     this.route.data.subscribe((data: { loansAccountTransaction: any }) => {
       this.transactionData = data.loansAccountTransaction;
+      this.allowEdition = !(this.transactionData.type.id === 20 || this.transactionData.type.id === 21 || this.transactionData.type.id === 22
+        || this.transactionData.type.id === 23);
     });
   }