diff --git a/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html b/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html
index e57b06e26..7ca448fce 100644
--- a/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html
+++ b/src/app/clients/clients-view/client-actions/take-survey/take-survey.component.html
@@ -1,11 +1,11 @@
-<div class="container mat-typography" style="padding-bottom: 20px;">
+<div class="container mat-typography">
 
   <div class="mat-elevation-z2 surveyCont">
 
     <div class="surveySelect" fxLayout="row">
 
       <mat-label class="nameLabel">Survey Name</mat-label>
-      <mat-select class="surveyOption" (selectionChange)="onSurveyChange($event)">
+      <mat-select (selectionChange)="onSurveyChange($event)">
         <mat-option *ngFor="let surveyData of allSurveyData" [value]="surveyData">
           {{surveyData.name}}
         </mat-option>
@@ -52,7 +52,7 @@
 
     </div>
 
-    <button mat-raised-button class="button-cancel" color="danger" [routerLink]="['../']">Cancel</button>
+    <button mat-raised-button class="button-cancel" color="danger" [routerLink]="['../../general']">Cancel</button>
     <button mat-raised-button class="button-submit" color="primary" (click)=submit()>Submit</button>
 
   </div>
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.html
index 1232c8f26..4c484e497 100644
--- a/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.html
+++ b/src/app/clients/clients-view/custom-dialogs/upload-image-dialog/upload-image-dialog.component.html
@@ -2,11 +2,11 @@
 
 <div>
 
-  <mifosx-file-upload flex="60%" (change)="onFileSelect($event)"></mifosx-file-upload>
+  <mifosx-file-upload flex="60%" (change)="onFileSelect($event)" acceptFilter=".png,.jpeg,.jpg"></mifosx-file-upload>
 
   <mat-dialog-actions align="end">
       <button mat-raised-button mat-dialog-close>Cancel</button>
       <button mat-raised-button color="primary" [disabled]="!image" [mat-dialog-close]="image">Confirm</button>
   </mat-dialog-actions>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.html b/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.html
index 4dd72a1e4..cc86616d3 100644
--- a/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.html
+++ b/src/app/clients/clients-view/custom-dialogs/upload-signature-dialog/upload-signature-dialog.component.html
@@ -2,11 +2,11 @@
 
 <div>
 
-  <mifosx-file-upload flex="60%" (change)="onFileSelect($event)"></mifosx-file-upload>
+  <mifosx-file-upload flex="60%" (change)="onFileSelect($event)" acceptFilter=".png,.jpeg,.jpg"></mifosx-file-upload>
 
   <mat-dialog-actions align="end">
       <button mat-raised-button mat-dialog-close>Cancel</button>
       <button mat-raised-button color="primary" [disabled]="!signature" [mat-dialog-close]="signature">Confirm</button>
   </mat-dialog-actions>
 
-</div>
\ No newline at end of file
+</div>
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 f8137aa8a..400111aba 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
@@ -192,13 +192,15 @@
 
     <h4 fxFlex="98%" class="mat-h4">Moratorium</h4>
 
-    <mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnPrincipalPayment" class="margin-v">
-      On Principal Payment
-    </mat-checkbox>
+    <mat-form-field fxFlex="48%">
+      <mat-label>Grace on principal payment</mat-label>
+      <input type="number" matInput formControlName="graceOnPrincipalPayment">
+    </mat-form-field>
 
-    <mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnInterestPayment" class="margin-v">
-      On Interest Payment
-    </mat-checkbox>
+    <mat-form-field fxFlex="48%">
+      <mat-label>Grace on interest payment</mat-label>
+      <input type="number" matInput formControlName="graceOnInterestPayment">
+    </mat-form-field>
 
     <mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnArrearsAgeing" class="margin-v">
       On Arreas Aging
diff --git a/src/app/organization/bulk-import/view-bulk-import/view-bulk-import.component.html b/src/app/organization/bulk-import/view-bulk-import/view-bulk-import.component.html
index de4be05be..646633ae8 100644
--- a/src/app/organization/bulk-import/view-bulk-import/view-bulk-import.component.html
+++ b/src/app/organization/bulk-import/view-bulk-import/view-bulk-import.component.html
@@ -5,11 +5,11 @@
     <mat-card fxLayout="column" fxLayoutGap="2%" fxFlex="50%">
 
       <h3><strong>{{bulkImport.name}} Template</strong></h3>
-  
+
       <form [formGroup]="bulkImportForm">
-  
+
         <mat-card-content>
-  
+
           <div *ngIf="bulkImport.formFields >= 1">
             <mat-form-field fxFlex>
               <mat-label>Office</mat-label>
@@ -20,7 +20,7 @@
               </mat-select>
             </mat-form-field>
           </div>
-  
+
           <div *ngIf="bulkImport.formFields >= 2">
             <mat-form-field fxFlex>
               <mat-label>Staff</mat-label>
@@ -31,7 +31,7 @@
               </mat-select>
             </mat-form-field>
           </div>
-  
+
           <div *ngIf="bulkImport.formFields === 3">
             <mat-form-field fxFlex>
               <mat-label>Legal Form</mat-label>
@@ -41,26 +41,26 @@
               </mat-select>
             </mat-form-field>
           </div>
-  
+
         </mat-card-content>
-  
+
       </form>
-      
+
       <div fxFlex="13%">
         <button mat-raised-button color="primary" (click)="downloadTemplate()" *mifosxHasPermission="bulkImport.permission">
           <i class="fa fa-download"></i>&nbsp;&nbsp;Download
         </button>
       </div>
-  
+
     </mat-card>
-  
+
     <mat-card fxLayout="column" fxLayoutGap="2%" fxFlex="50%">
-  
+
       <h3><strong>{{bulkImport.name}}</strong></h3>
 
       <h4>Select Excel File</h4>
 
-      <mifosx-file-upload  flex="75%" (change)="onFileSelect($event)"></mifosx-file-upload>
+      <mifosx-file-upload flex="75%" (change)="onFileSelect($event)" acceptFilter=".xls,.xlsx"></mifosx-file-upload>
 
       <mat-hint *ngIf="bulkImport.name === 'Clients'">Please retain the value Entity/Person in the filename.</mat-hint>
 
@@ -71,7 +71,7 @@
       </div>
 
       <div *ngIf="bulkImport.formFields >= 2" fxFlex class="cover"></div>
-  
+
     </mat-card>
 
   </div>
@@ -146,5 +146,5 @@
     <mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
 
   </mat-card>
-  
+
 </div>
diff --git a/src/app/self-service/users/view-user/view-user.component.html b/src/app/self-service/users/view-user/view-user.component.html
index 3682d638d..b1856848e 100644
--- a/src/app/self-service/users/view-user/view-user.component.html
+++ b/src/app/self-service/users/view-user/view-user.component.html
@@ -27,7 +27,8 @@
       <div fxLayout="row wrap" class="content">
 
         <div fxFlex="100%" class="header">
-          <fa-icon icon="circle" size="lg" matTooltip="{{ user.status }}" matTooltipPosition="above"></fa-icon>&nbsp;&nbsp;
+          <fa-icon icon="circle" size="lg" matTooltip="{{ user.status }}" matTooltipPosition="above"></fa-icon>
+          &nbsp;&nbsp;
           ID: {{ user.id }}
         </div>
 
@@ -115,6 +116,9 @@
 
     </mat-card-content>
 
+    <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
+      <button type="button" color="primary" mat-raised-button [routerLink]="['../../']">Back</button>
+    </mat-card-actions>
   </mat-card>
 
 </div>
diff --git a/src/app/shared/file-upload/file-upload.component.html b/src/app/shared/file-upload/file-upload.component.html
index 7145fb4e9..55f54fafb 100644
--- a/src/app/shared/file-upload/file-upload.component.html
+++ b/src/app/shared/file-upload/file-upload.component.html
@@ -14,4 +14,4 @@
 
 </div>
 
-<input type="file" #uploadFile (change)="onFileSelect($event)" [style.display]="'none'">
+<input type="file" #uploadFile accept="{{acceptFilter}}" (change)="onFileSelect($event)" [style.display]="'none'">
diff --git a/src/app/shared/file-upload/file-upload.component.ts b/src/app/shared/file-upload/file-upload.component.ts
index 852e1717c..976eca12c 100644
--- a/src/app/shared/file-upload/file-upload.component.ts
+++ b/src/app/shared/file-upload/file-upload.component.ts
@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
 
 /**
  * Custom file upload component based on angular material.
@@ -9,15 +9,23 @@ import { Component, Input, Output, EventEmitter } from '@angular/core';
   templateUrl: './file-upload.component.html',
   styleUrls: ['./file-upload.component.scss']
 })
-export class FileUploadComponent {
+export class FileUploadComponent implements OnInit {
 
   /** Form field flex dimension */
   @Input() flex: any;
+  @Input() acceptFilter: string;
+
   /** Selected file name */
   fileName: File;
 
   constructor() { }
 
+  ngOnInit() {
+    if (!this.acceptFilter) {
+      this.acceptFilter = '.xls,.xlsx,.pdf,.doc,.docx,.png,.jpeg,.jpg';
+    }
+  }
+
   /**
    * Sets the file name.
    * @param {any} event File input change event.
diff --git a/src/app/system/configurations/business-date-tab/business-date-tab.component.html b/src/app/system/configurations/business-date-tab/business-date-tab.component.html
index 799be8dbd..0fd6f76b8 100644
--- a/src/app/system/configurations/business-date-tab/business-date-tab.component.html
+++ b/src/app/system/configurations/business-date-tab/business-date-tab.component.html
@@ -39,14 +39,14 @@
 
               <div fxLayoutGap="2%" fxFlex="22%" class="options-wrapper">
                 <span *ngIf="isEditInProgress && (dateIndex == 0)">
-                  <button mat-stroked-button color="primary" [disabled]="businessDateForm.pristine" (click)="submit()"
+                  <button mat-raised-button color="primary" [disabled]="businessDateForm.pristine" (click)="submit()"
                     *mifosxHasPermission="'UPDATE_BUSINESSDATE'">
                     Submit
                   </button>
+                  <button mat-raised-button (click)="editInProgressToggle(0)">
+                    Cancel
+                  </button>
                 </span>
-                <button mat-button *ngIf="isEditInProgress && (dateIndex == 0)" (click)="editInProgressToggle(0)">
-                  Cancel
-                </button>
                 <button type="button" color="primary" *ngIf="!isEditInProgress" mat-icon-button matTooltip="Edit the Business Date"
                   matTooltipPosition="above" (click)="editInProgressToggle(0)">
                   <fa-icon icon="edit" size="lg"></fa-icon>