diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html
index 0d806f948..0d36576e6 100644
--- a/ng6-seed/src/app/dashboard/dashboard.component.html
+++ b/ng6-seed/src/app/dashboard/dashboard.component.html
@@ -17,96 +17,83 @@
        </div>
   </div> -->
   <div fxLayout="row wrap"> 
-    <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
+    <div fxFlex.gt-sm="60%" fxFlex="100" class="m-gap">
         <mat-card>
-           <mat-card-title>Full</mat-card-title>
+           <mat-card-title>Today's Details</mat-card-title>
            <mat-card-subtitle></mat-card-subtitle>
            <hr> 
             <mat-card-content>
                 <div class="w-100 h-300px">
-                    <ngx-charts-gauge    [view]="view"  [scheme]="colorScheme" [results]="full" [min]="0" [max]="100" [angleSpan]="240" [startAngle]="-120" [units]="'PD'" [bigSegments]="10" [smallSegments]="5" >
-                    </ngx-charts-gauge>
+                        <span>Full</span>
+                    <ngx-charts-advanced-pie-chart    [view]="view"  [scheme]="colorScheme" [results]="full"  [gradient]="gradient" >
+                    </ngx-charts-advanced-pie-chart>
                 </div>
-            </mat-card-content> 
-        </mat-card>
-     </div>
-     <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
-        <mat-card>
-           <mat-card-title>Smart</mat-card-title>
-           <mat-card-subtitle></mat-card-subtitle>
-           <hr>      
-            <mat-card-content>
-                <div class="w-100 h-300px">
-                    <ngx-charts-gauge  [view]="view" [scheme]="colorScheme" [results]="smart" [min]="0" [max]="100" [angleSpan]="240" [startAngle]="-120" [units]="'PD'" [bigSegments]="10" [smallSegments]="5" >
-                    </ngx-charts-gauge>
-                </div>
-            </mat-card-content> 
-        </mat-card>
-     </div>
-     <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
-        <mat-card>
-           <mat-card-title>Tele</mat-card-title>
-           <mat-card-subtitle></mat-card-subtitle>
-           <hr> 
-            <mat-card-content>
-                <div class="w-100 h-300px">
 
-                    <ngx-charts-gauge  [view]="view" [scheme]="colorScheme" [results]="tele" [min]="0" [max]="100" [angleSpan]="240" [startAngle]="-120" [units]="'PD'" [bigSegments]="10" [smallSegments]="5" >
-                    </ngx-charts-gauge>
-                </div>
+                <div class="w-100 h-300px">
+                    <span>Semi</span>
+                        <ngx-charts-advanced-pie-chart    [view]="view"  [scheme]="colorScheme" [results]="smart"  [gradient]="gradient" >
+                        </ngx-charts-advanced-pie-chart>
+                    </div>
+                    <div class="w-100 h-300px">
+                        <span>Tele</span>
+                            <ngx-charts-advanced-pie-chart    [view]="view"  [scheme]="colorScheme" [results]="tele"  [gradient]="gradient" >
+                            </ngx-charts-advanced-pie-chart>
+                        </div>
             </mat-card-content> 
         </mat-card>
      </div>
+     
+     <div fxFlex.gt-sm="40%" fxFlex="100" class="m-gap">
+            <mat-card class="p-2">
+                    <!---<h4>Profile Settings</h4>-->
+                    <mat-tab-group >
+                       <mat-tab>
+                          <ng-template mat-tab-label>Lenderwise</ng-template> 
+                          <mat-card-content>
+                                <mat-list>
+                                        <ng-template let-item let-last="last" ngFor [ngForOf]="lenderpd">
+                                           <mat-list-item> 
+                                              <h3 mat-line> {{item.lendername}} / {{item.billingaddr}} </h3>
+                                              <p mat-line> Full  -{{item.fullpd}} / Smart  -{{item.smartpd}} / Tele - {{item.telepd}} </p>
+                                           </mat-list-item>
+                                        </ng-template>
+                                     </mat-list>
+                          </mat-card-content>
+                       </mat-tab>
+                       <mat-tab>
+                          <ng-template mat-tab-label>CityWise</ng-template> 
+                          <mat-list>
+                                <ng-template let-item let-last="last" ngFor [ngForOf]="citywisepd">
+                                   <mat-list-item> 
+                                      <h3 mat-line> {{item.cityname}} </h3>
+                                      <p mat-line> Full -{{item.fullpd}} / Smart  -{{item.smartpd}} / Tele - {{item.telepd}}</p>
+                                   </mat-list-item>
+                                </ng-template>
+                             </mat-list>
+                             <mat-card-content>
+                              
+                          </mat-card-content>
+                       </mat-tab>
+                       <mat-tab>
+                          <ng-template mat-tab-label><span fxFlex="80">Alert</span> <span fxFlex="20"><mat-icon color="primary"> warning</mat-icon></span></ng-template>
+                          <mat-card-content>
+                                <mat-list>
+                                        <ng-template let-item let-last="last" ngFor [ngForOf]="message">
+                                           <mat-list-item> 
+                                              <!--<img mat-list-avatar src="{{item.photo}}" alt="">-->
+                                              <h3 mat-line> {{item.applicantname}} </h3>
+                                              <p mat-line> {{item.applicantid}}</p>
+                                              <p mat-line> {{item.lendername}} - {{item.status}} </p>
+                                           </mat-list-item>
+                                        </ng-template>
+                                     </mat-list>
+                          </mat-card-content>
+                       </mat-tab>
+                    </mat-tab-group>
+                 </mat-card>
+     </div>
 </div>
-  <!--Lender,Citywise, Same Status-->
- 
-  <div fxLayout="row wrap">
-      <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
-          <mat-card>
-             <mat-card-title>Lenderwise</mat-card-title>
-             <mat-card-subtitle>Triggered Today</mat-card-subtitle>
-             <hr>
-             <mat-list>
-                <ng-template let-item let-last="last" ngFor [ngForOf]="lenderpd">
-                   <mat-list-item> 
-                      <h3 mat-line> {{item.lendername}} / {{item.billingaddr}} </h3>
-                      <p mat-line> Full  -{{item.fullpd}} / Smart  -{{item.smartpd}} / Tele - {{item.telepd}} </p>
-                   </mat-list-item>
-                </ng-template>
-             </mat-list>
-          </mat-card>
-       </div>
-      <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
-          <mat-card>
-             <mat-card-title>Citywise</mat-card-title>
-             <mat-card-subtitle>Triggered Today</mat-card-subtitle>
-             <hr>
-             <mat-list>
-                <ng-template let-item let-last="last" ngFor [ngForOf]="citywisepd">
-                   <mat-list-item> 
-                      <h3 mat-line> {{item.cityname}} </h3>
-                      <p mat-line> Full -{{item.fullpd}} / Smart  -{{item.smartpd}} / Tele - {{item.telepd}}</p>
-                   </mat-list-item>
-                </ng-template>
-             </mat-list>
-          </mat-card>
-       </div> 
-      <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap">
-         <mat-card>
-            <mat-card-title><span fxFlex="80">Alert</span> <span fxFlex="20"><mat-icon color="primary"> warning</mat-icon></span></mat-card-title>
-            <mat-card-subtitle>Unscheduled</mat-card-subtitle>
-            <hr>
-            <mat-list>
-               <ng-template let-item let-last="last" ngFor [ngForOf]="message">
-                  <mat-list-item> 
-                     <!--<img mat-list-avatar src="{{item.photo}}" alt="">-->
-                     <h3 mat-line> {{item.applicantname}} </h3>
-                     <p mat-line> {{item.applicantid}}</p>
-                     <p mat-line> {{item.lendername}} - {{item.status}} </p>
-                  </mat-list-item>
-               </ng-template>
-            </mat-list>
-         </mat-card>
-      </div> 
-   </div>
+  
+   
+      
 </div>  
\ No newline at end of file
diff --git a/ng6-seed/src/app/dashboard/dashboard.component.ts b/ng6-seed/src/app/dashboard/dashboard.component.ts
index 7d56ca23f..2303afb15 100644
--- a/ng6-seed/src/app/dashboard/dashboard.component.ts
+++ b/ng6-seed/src/app/dashboard/dashboard.component.ts
@@ -18,7 +18,7 @@ export class DashboardComponent {
   public showYAxisLabel = true;
   public yAxisLabel = 'PD'; 
   view: any[];
-  width = 350;
+  width =600;
   height= 250;
   public colorScheme = {
     domain: ['#673ab7', '#f44336', '#009688 ', '#2196f3', '#234278 ', '#2a1653']
@@ -30,6 +30,34 @@ export class DashboardComponent {
   this.view = [this.width, this.height];
  
  }
+//pie chart
+  single: Object[]  = [
+  {
+    name: 'Germany',
+    value: 40632
+  },
+  {
+    name: 'USA',
+    value: 49737
+  },
+  {
+    name: 'France',
+    value: 36745
+  },
+  {
+    name: 'UK',
+    value: 36240
+  },
+  {
+    name: 'Spain',
+    value: 33000
+  },
+  {
+    name: 'Italy',
+    value: 35800
+  }
+];
+
   //Full Pd Data
   full: Object[] = [
     {
diff --git a/ng6-seed/src/app/dashboard/dashboard.module.ts b/ng6-seed/src/app/dashboard/dashboard.module.ts
index 771a0da1e..ac863a047 100644
--- a/ng6-seed/src/app/dashboard/dashboard.module.ts
+++ b/ng6-seed/src/app/dashboard/dashboard.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
-import { MatIconModule, MatCardModule, MatButtonModule, MatListModule, MatProgressBarModule, MatMenuModule } from '@angular/material';
+import { MatIconModule, MatCardModule,MatTabsModule, MatButtonModule, MatListModule, MatProgressBarModule, MatMenuModule } from '@angular/material';
 import { FlexLayoutModule } from '@angular/flex-layout';
 
 import { ChartsModule } from 'ng2-charts/ng2-charts';
@@ -9,7 +9,7 @@ import { NgxChartsModule} from '@swimlane/ngx-charts';
 import { NgxDatatableModule } from '@swimlane/ngx-datatable';
 
 import { DashboardComponent } from './dashboard.component';
-import { DashboardRoutes } from './dashboard.routing';
+import { DashboardRoutes } from './dashboard.routing'; 
 
 @NgModule({
   imports: [
@@ -17,6 +17,7 @@ import { DashboardRoutes } from './dashboard.routing';
     RouterModule.forChild(DashboardRoutes),
     MatIconModule,
     MatCardModule,
+    MatTabsModule,
     MatButtonModule,
     MatListModule,
     MatProgressBarModule,
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
index 5f314f0fa..2eeaee0f3 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html
@@ -5,9 +5,9 @@
                   {{master.pd_date_of_initiation}}
                 </div>
                  <div *ngFor="let master of pdMasterData" class="ml-xs mr-xs pt-1"   fxFlex="25" style="text-align:right;" >
-                  <button  *ngIf="master.pd_type_name" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Allocation" matTooltipPosition="above" (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
+                  <button  *ngIf="master.pd_type_name" mat-raised-button  mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master)"><mat-icon>verified_user</mat-icon></button>
                         <button *ngIf="master.pd_type_name" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master)"><mat-icon>schedule</mat-icon></button>
-                        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="PD Details" matTooltipPosition="above" (click)="getPDStart(viewID)"><mat-icon>question_answer</mat-icon></button>
+                        <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(viewID)"><mat-icon>question_answer</mat-icon></button>
                     <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"  type="button" matTooltip="Close" matTooltipPosition="above" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>        
                     <br><span style="color:red;text-align:center">{{master.pd_allocated_to}} -{{master.pd_status_name}}</span>
                   </div>
diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html
index 8a13984ef..b7939606b 100644
--- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html
@@ -1,6 +1,6 @@
 <div style="max-height: 580px;">
     <form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
-        <mat-card style="padding: 6px;">
+       
             <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
                 <h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2>
                 <div style="width: 20%;"></div>
@@ -11,10 +11,10 @@
             </div>
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
-                    <mat-select placeholder="Select Entity Type" formControlName="fk_entity_type_id">
+                    <mat-select placeholder="Entity Type" formControlName="fk_entity_type_id">
                         <mat-option *ngFor="let enti of entityOptions" [value]="enti.entity_type_id">{{ enti.name }}</mat-option>
                     </mat-select>
-                    <mat-error *ngIf="submitted && f.fk_entity_type_id.hasError('required')" class="mat-text-warn">You must Select Entity Type.</mat-error>
+                    <mat-error *ngIf="submitted && f.fk_entity_type_id.hasError('required')" class="mat-text-warn">Entity Type Required.</mat-error>
                 </mat-form-field>
             </div>
             <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
@@ -33,7 +33,7 @@
                 <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="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
             </div>
-        </mat-card>
+        
     </form>
 </div>
 <notifier-container></notifier-container>
\ No newline at end of file
diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts
index 103a7af08..160825999 100644
--- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts
+++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts
@@ -37,7 +37,7 @@ import { EntityService } from './../../service/entity/entity.service';
 })
 export class EntityAddComponent implements OnInit {
 
-  public pageTitle: string = "Entity";
+  public pageTitle: string = "Add New Entity";
   public subTitle1: string = "Tax Info";
   public subTitle2: string = "Contacts";
   public _addQuesFrom: FormGroup;
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html
index de197c7cd..122865cdc 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/dialog-add-edit-billing-info.component.html
@@ -3,9 +3,9 @@
           <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
     </div>
     <mat-card>
-        <h4>{{editAddType}} - Billing Information Details</h4>
-        <hr>
-        <!--{{data | json}}-->
+        <h4 style="padding:1%">Billing Information Details</h4>
+        
+        <!--{{data | json}}--> 
         <form [formGroup]="_editEntityBillingInfoFrom" (submit)="onSubmit()">
             <div fxLayout="row wrap" fxLayout.xs="column" fxLayoutGap="2%" fxLayoutAlign="start center">
                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@@ -63,7 +63,7 @@
                 <div formArrayName="contacts" class="example-full-width">
                     <div *ngFor="let conts of f_contacts.controls; let i=index">
                         <div [formGroupName]="i">
-                             <div fxLayout="row wrap" fxLayout.xs="column" fxLayoutGap="2%" fxLayoutAlign="center center">
+                             <div fxLayout="row wrap" fxLayout.xs="column" fxLayoutGap="2%" fxLayoutAlign="start center">
                                 <mat-form-field fxFlex="0 1 auto" class="ml-xs">
                                     <input matInput placeholder="Contact Person Name" formControlName="contact_person">
                                     <mat-error *ngIf="submitted && conts['controls'].contact_person.hasError('required')" class="mat-text-warn">You must Include Person Name.</mat-error>
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
index 1cc230026..1d27932de 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-billing-info/entity-edit-billing-info.component.html
@@ -1,5 +1,5 @@
 <div fxLayout="row wrap" fxLayoutAlign="end">
-    <button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Contact Person" matTooltipPosition="above" (click)="editDetails(null); false"><mat-icon>add</mat-icon></button>
+    <button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Billing Information" matTooltipPosition="above" (click)="editDetails(null); false"><mat-icon>add</mat-icon></button>
 </div>
 <mat-card *ngFor="let data of entityBillingInfoRecord">
    <div fxLayout="row wrap" fxLayout.xs="column" fxLayoutGap="2%" fxLayoutAlign="center center">
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
index f80cb252e..d9dd8b47d 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity-edit-region/entity-edit-region.component.html
@@ -42,9 +42,10 @@
                 </div>
             </div>
         </mat-card>
-        <button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Contact Person" matTooltipPosition="above" (click)="addRegionFormData(null, $event); false"><mat-icon>add</mat-icon></button>
-    </div>
+         </div>
     <div class="row" style="text-align:right;">
+            <button mat-raised-button mat-icon-button class="mr-1 mb-1" color="primary" matTooltip="Add More Region Information" matTooltipPosition="above" (click)="addRegionFormData(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="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
     </div>
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html
index 267cd60f1..164d895e5 100644
--- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html
@@ -186,10 +186,10 @@
             (click)="backToList()"><mat-icon>close</mat-icon></button>
     </div>
     <mat-card style="padding: 6px;" *ngIf="entityNameRecord">
-        <h6>Entity Details ({{this.entityNameRecord.entity_name}})</h6>
+        <h6>Entity Details ({{this.entityNameRecord.entity_name}})</h6><br>
             
         <form [formGroup]="_editEntityNameFrom" (submit)="onSubmit()">
-           <hr>
+         
             <div>
                 <div fxLayout="row wrap" fxLayout.xs="column" fxLayoutGap="2%" fxLayoutAlign="center center">
                     <div fxFlex="30%">
diff --git a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
index 355e784e1..32b8be9c7 100644
--- a/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
+++ b/ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
@@ -1,14 +1,11 @@
 <div *ngIf="listView">
-  <mat-card>
-    <div style="margin: 6px; padding: 4px;">
-      <div class="p_title" style="font-size: 26px; font-style: bold;">Entity Master</div>
-      <hr>
-    </div>
-    <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none">
+  <mat-card>    
+    <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none" style="padding-top:1%">
       <div fxFlex="80%">
-      </div>
+          <mat-card-title><span style="font-size:24px"> Entity Master</span></mat-card-title>
+        </div>
       <div fxFlex="20%">
-        <button mat-fab class="mr-1 mb-1" color="primary" (click)="addNewEntity()"><mat-icon>add</mat-icon></button>
+        <button mat-fab class="mr-1 mb-1" color="primary"matTooltip="Add New Entity" matTooltipPosition="above"  (click)="addNewEntity()"><mat-icon>add</mat-icon></button>
       </div>
     </div>
     <ng-container *ngIf="enityList.length > 0">
@@ -21,9 +18,9 @@
                   {{ product.entity_name }}
                 </div>
                 <div fxFlex="0 1 auto" class="ml-xs" fxFlex="40%">
-                  <div><b>{{ product.full_name }} ({{product.short_name}})</b></div>
+                  <div> {{ product.full_name }} ({{product.short_name}})</div>
                   <div> {{ product.branch_name }} </div>
-                  <div> {{product.city_name}}, {{product.state_name}} </div>
+                  <div> {{product.city_name}}<span *ngIf="product.state_name">,</span> {{product.state_name}} </div>
                 </div>
                 <div fxFlex="0 1 auto" class="ml-xs" fxFlex="30%">
                   <div> {{ product.phone_number }}</div>
@@ -34,9 +31,9 @@
                 <div fxFlex="0 1 auto" class="ml-xs">
                 </div>
               </div>
-            </div>
+            </div> 
             <div fxFlex="10%">
-              <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="editEntity(product)"><mat-icon>edit</mat-icon></button>
+              <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editEntity(product)"><mat-icon>edit</mat-icon></button>
             </div>
           </div>
         </mat-card>
@@ -46,7 +43,7 @@
       <div class="no-record-found">No Record Found ... </div>
     </mat-card>
     <mat-paginator #paginator class="mat-elevation-z1" [length]="enityList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
-      [pageSizeOptions]="[5, 10, 25, 100]" (page)="pageEvent = $event; pageChange($event)">
+      [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
     </mat-paginator>
   </mat-card>
 </div>
diff --git a/ng6-seed/src/app/settings/entity/entity.module.ts b/ng6-seed/src/app/settings/entity/entity.module.ts
index 2c753d9cd..1f37cf8ed 100644
--- a/ng6-seed/src/app/settings/entity/entity.module.ts
+++ b/ng6-seed/src/app/settings/entity/entity.module.ts
@@ -35,7 +35,7 @@ import { EntityEditBillingInfoComponent } from './entity-edit/entity-edit-billin
 
 import { DialogAddEditBillingInfo } from './entity-edit/entity-edit-billing-info/entity-edit-billing-info.component';
 import { EntityEditVendorCityInfoComponent } from './entity-edit/entity-edit-vendor-city-info/entity-edit-vendor-city-info.component';
-
+import { MatTooltipModule } from '@angular/material/tooltip';
 /**
  * Custom angular notifier options
  */
@@ -93,6 +93,7 @@ const customNotifierOptions: NotifierOptions = {
     MatProgressBarModule,MatDialogModule, MatSortModule,
     MatToolbarModule,MatSelectModule,MatListModule, MatMenuModule,
     MatCheckboxModule,
+    MatTooltipModule,
     MatTabsModule,
     MatChipsModule,
   MatExpansionModule,
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;
diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html
index 1c5bcb485..13f6947ae 100644
--- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html
+++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.html
@@ -6,9 +6,7 @@
                 <div class="p-1" fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none">
                     <div fxFlex="80%">
                             <mat-card-title><span style="font-size:24px"> Template Master</span></mat-card-title>
-                             
-                
-                        <!--<form [formGroup]="filterFormGroupCtrl">
+                         <!--<form [formGroup]="filterFormGroupCtrl">
               <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutGap="0.5px" fxLayoutAlign="start none" style="padding: 6px;">
   <mat-select placeholder="Category" formControlName="category">
                 <mat-option *ngFor="let cat of categories" [value]="cat.question_categroy_id" (click)="getQuestionsMasters()">
@@ -32,11 +30,11 @@
 
                                 <div fxLayout="row" fxLayoutWrap fxLayoutAlign="start center">
                                     <div class="ml-xs" fxFlex="20%">
-                                       <b> {{ template.template_name }} </b>
+                                       <span> {{ template.template_name }}</span> 
                                     </div>
                                     <div class="ml-xs" fxFlex="80%">
-                                        <div *ngIf="template.lender_details.length > 0" class="text-line-limit">
-                                            <span *ngFor="let lender of template.lender_details ; let last = last"> {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} <i *ngIf="!last">,</i></span>
+                                        <div *ngIf="template.lender_details.length > 0">
+                                            <span *ngFor="let lender of template.lender_details ; let last = last"> {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} <i *ngIf="!last">,<br></i></span>
                                         </div>
                                     </div>
                                 </div>
diff --git a/ng6-seed/src/index.html b/ng6-seed/src/index.html
index e2f577376..be4ec30e1 100644
--- a/ng6-seed/src/index.html
+++ b/ng6-seed/src/index.html
@@ -121,20 +121,19 @@
                 transform: scale3D(0, 0, 1);
             }
         }
-        .mat-cell,.mat-form-field{
+        .mat-card-subtitle, .mat-card-content, .mat-card-header, .mat-card-title,.mat-cell,.mat-form-field{
             font-size:1.2rem !important;
         }
         .mat-header-cell{
             font-size:1.2rem !important;
             font-weight:800 !important;
         }
-
-      .swal2-header {
+        .swal2-title, .swal2-header {
         text-align:left !important;   
-        }
-        .swal2-title {
-            text-align:left !important;
-        }
+        }     
+        .mat-card-subtitle{
+            color:#000 !important;
+        }  
     </style>
     <link rel="icon" type="image/x-icon" href="favicon.ico">
     <link rel="stylesheet" href="assets/wheather-icon/css/weather-icons.min.css" />