diff --git a/ng6-seed/package-lock.json b/ng6-seed/package-lock.json
index 6c56cb46a..67231c52a 100644
--- a/ng6-seed/package-lock.json
+++ b/ng6-seed/package-lock.json
@@ -4273,8 +4273,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4295,14 +4294,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4317,20 +4314,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4447,8 +4441,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4460,7 +4453,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4475,7 +4467,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4483,14 +4474,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4509,7 +4498,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4590,8 +4578,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4603,7 +4590,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4689,8 +4675,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4726,7 +4711,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4746,7 +4730,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4790,14 +4773,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts
index e3797f2b0..cd1d19cb3 100644
--- a/ng6-seed/src/app/dashboard/dashboard.component.ts
+++ b/ng6-seed/src/app/dashboard/dashboard.component.ts
@@ -49,7 +49,7 @@ export class DashboardComponent {
   globalChartOptions: any = {
     responsive: false,
     legend: {
-      display: false,
+      display: true,
       position: 'bottom'
     }
   };
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index 5f7d00dd2..d21a1d3ac 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -6,6 +6,7 @@
                         <mat-accordion 
                                 *ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index"
                                 [formGroupName]="i">
+                                <!-- {{bankingForm.controls.itemRows['controls']}} -->
                             <mat-expansion-panel class="banlFields" [expanded]="step == i">
                                 <mat-expansion-panel-header>
                                     <mat-panel-title>
@@ -59,7 +60,10 @@
                                         <mat-icon  >delete</mat-icon>
                                 </button>
                             </mat-expansion-panel>
-                
+                           <div *ngIf="bankingForm.controls.itemRows['controls'].length == (i+1)">
+                            <button  class="mr-1 mb-1" color="primary" mat-raised-button mat-icon-button matTooltip="Add More Banking Details" matTooltipPosition="above"  (click)="addBankdetails(i)">
+                                    <mat-icon >add</mat-icon>
+        </button></div>
                         </mat-accordion>
                     </div>
                     <div fxLayout="row" class="pt-1">
@@ -71,9 +75,9 @@
                             </div>
                           </div>
                     <div style="text-align: right;" class="pt-1">
-                            <button class="mr-1 mb-1" color="primary" mat-raised-button mat-icon-button matTooltip="Add More Banking Details" matTooltipPosition="above"    (click)="addBankdetails(i)">
+                            <!-- <button  class="mr-1 mb-1" color="primary" mat-raised-button mat-icon-button matTooltip="Add More Banking Details" matTooltipPosition="above"  (click)="addBankdetails(i)">
                                     <mat-icon >add</mat-icon>
-        </button>
+        </button> -->
                             <button class="mr-1 mb-1" type="submit" mat-raised-button mat-icon-button type="submit" matTooltip="Submit" matTooltipPosition="above"   (click)="bankSubmit()"><mat-icon>save</mat-icon>
                             </button>
                    </div>
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
index 063a5d1bd..b99d4d8e8 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts
@@ -30,7 +30,7 @@ import {ActivatedRoute, Router} from "@angular/router";
 export class BankingDetailsComponent implements OnInit {
     @Input() pdid: number;
     public bankingForm: FormGroup;
-    step: any;
+    step: number;
     private notifier: NotifierService;
 
     constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
@@ -85,12 +85,16 @@ export class BankingDetailsComponent implements OnInit {
             vintage: ['', Validators.compose([Validators.required])],
         });
     }
-    addBankdetails(i) {
-        this.step = i++;
+    addBankdetails(index: any) {
+        console.log('index value -',index);
+        //this.step++;
+        this.step = index++;               
+        console.log('step value -',this.step);                                                                                                                                                                                                                                                                                                                                                                                                                     
         const control = <FormArray>this.bankingForm.controls['itemRows'];
         control.push(this.createBankarray());
     }
     deleteBankdetails(index: number) {
+        console.log('index value -',index);
         const control = <FormArray>this.bankingForm.controls['itemRows'];
         control.removeAt(index);
     }
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 3ca14565e..f39261d1d 100644
--- a/ng6-seed/src/app/template/questions/edit/edit.component.html
+++ b/ng6-seed/src/app/template/questions/edit/edit.component.html
@@ -12,14 +12,14 @@
             <mat-error *ngIf="submitted && f.fk_question_category.hasError('required')" class="mat-text-warn">You must Select Category.</mat-error>
           </mat-form-field>
         </div>
-        <div fxFlex="50">
+        <!-- <div fxFlex="50">
           <mat-form-field>
             <mat-select placeholder="Select Group" formControlName="fk_question_group_id">
               <mat-option *ngFor="let gp of m_group" [value]="gp.question_group_id">{{ gp.group_name }}</mat-option>
             </mat-select>
             <mat-error *ngIf="submitted && f.fk_question_group_id.hasError('required')" class="mat-text-warn">You must Select Group.</mat-error>
           </mat-form-field>
-        </div>
+        </div> -->
       </div>
       <div fxLayout="row" fxLayoutAlign="start none">
         <div class="example-full-width">
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 4db0e5967..843c2d2eb 100644
--- a/ng6-seed/src/app/template/questions/edit/edit.component.ts
+++ b/ng6-seed/src/app/template/questions/edit/edit.component.ts
@@ -93,7 +93,7 @@ export class EditComponent implements OnInit {
       question: [this.data.question, Validators.compose([Validators.required])],
       description: [this.data.description, Validators.compose([Validators.required])],
       fk_question_category: [this.data.fk_question_category, Validators.compose([Validators.required])],
-      fk_question_group_id: [this.data.fk_question_group_id, Validators.compose([Validators.required])],
+      // fk_question_group_id: [this.data.fk_question_group_id, Validators.compose([Validators.required])],
       fk_question_answertype: [this.data.fk_question_answertype, Validators.compose([Validators.required])],
       isactive: [this.data.isactive],
       answers: this._formBuilder.array([
@@ -115,7 +115,7 @@ export class EditComponent implements OnInit {
     return this._formBuilder.group({
       answer: [ans, Validators.compose([Validators.required])],
       question_answer_id: [fk_id],
-      fk_question_group_id: [fk_question_group_id],
+      // fk_question_group_id: [fk_question_group_id],
       isactive: [isAct]
     });
   }