diff --git a/ng6-seed/src/app/template/questions/edit/edit.component.html b/ng6-seed/src/app/template/questions/edit/edit.component.html
index 1df0e8b87..e12eb9c4d 100644
--- a/ng6-seed/src/app/template/questions/edit/edit.component.html
+++ b/ng6-seed/src/app/template/questions/edit/edit.component.html
@@ -38,6 +38,11 @@
             <mat-error *ngIf="submitted && f.fk_question_answertype.hasError('required')" class="mat-text-warn">You must Select Answer Type.</mat-error>
           </mat-form-field>
         </div>
+        <div fxLayout="row" fxLayoutAlign="start none">
+          <mat-checkbox formControlName="isactive" [ngModel]="f.isactive.value === 1 ? true : false"
+            (ngModelChange)="f.get('isactive').value = $event ? 1 : 0">Active/InActive</mat-checkbox>
+      
+        </div>
         <div fxLayout="row" fxLayoutAlign="start none">
           <div formArrayName="answers" class="example-full-width">
             <div *ngFor="let answ of f_ans.controls; let i=index">
@@ -65,10 +70,7 @@
             <!--<a (click)="addLanguage()" style="cursor: default">Add another Answer </a>-->
           </div>
         </div>
-        <div fxLayout="row" fxLayoutAlign="start none">
-          <mat-checkbox formControlName="isactive" [ngModel]="f.isactive.value == 1 ? true : f.isactive.value == 0 ? false : null"
-            (ngModelChange)="_addQuesFrom.controls['isactive'].setValue($event ? 1 : 0)">Active/InActive</mat-checkbox>
-        </div>
+     
         <!--Error List Shown Here-->
         <!--<ul>
         <li *ngFor="let err of errorMessage">
diff --git a/ng6-seed/src/app/template/questions/edit/edit.component.ts b/ng6-seed/src/app/template/questions/edit/edit.component.ts
index cd8fddab7..16268c336 100644
--- a/ng6-seed/src/app/template/questions/edit/edit.component.ts
+++ b/ng6-seed/src/app/template/questions/edit/edit.component.ts
@@ -193,7 +193,7 @@ export class EditComponent implements OnInit {
 
   /** To Reset Popup Data */
   onReset() {
-    // this._addQuesFrom.reset();
+    this._addQuesFrom.reset();
     this.loadFormData();
     this.loadAnsData();
   }
diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html
index 05242bf78..3743bbaae 100644
--- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html
+++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.html
@@ -30,7 +30,7 @@
      
     <div class="row" style="text-align:right;">
         <button mat-raised-button mat-icon-button color="primary" class="mr-1 mb-1 hover-icon"   matTooltip="Add More Category" matTooltipPosition="above" (click)="addLanguage(null, $event); false"><mat-icon>add</mat-icon></button>
-        <!--<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>-->
+        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="reset()"><mat-icon>settings_backup_restore</mat-icon></button>
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
     </div>
 </form>
\ No newline at end of file
diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.ts b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.ts
index d49a929c1..82ed34c83 100644
--- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.ts
+++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-category/edit-category.component.ts
@@ -233,6 +233,12 @@ export class EditCategoryComponent implements OnInit, OnDestroy, AfterViewInit {
     return seenDuplicate;
   }
 
+  reset() {
+      const arr = <FormArray>this._editTempCategoryFrom.controls.temp_category;
+      arr.controls.splice(0);
+      this.getTemplateCategoryDetails();
+  }
+
   ngOnDestroy(): void {
     //Called once, before the instance is destroyed.
     //Add 'implements OnDestroy' to the class.
diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html
index 3051cb3da..37b72530b 100644
--- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html
+++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.html
@@ -48,7 +48,7 @@
     <div class="row" style="text-align:right;">
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" color="primary" matTooltip="Add More Lender Details" matTooltipPosition="above" (click)="addLanguage(null, $event); false"><mat-icon>add</mat-icon></button>
   
-        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>
+        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="reset()"><mat-icon>settings_backup_restore</mat-icon></button>
         <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
     </div>
 </form>
\ No newline at end of file
diff --git a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts
index 781a76274..86b705623 100644
--- a/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts
+++ b/ng6-seed/src/app/template/templates/templates-list/edit/edit-lender/edit-lender.component.ts
@@ -207,6 +207,12 @@ export class EditLenderComponent implements OnInit {
     }
   }
 
+  reset() {
+    const arr = <FormArray>this._editTempLenderFrom.controls.temp_lender;
+    arr.controls.splice(0);
+    this.getTemplateLenderDetails();
+  }
+
 
   checkDuplicateInObject(inputArray) {
     let seenDuplicate = false;