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..be43192a6 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>
@@ -36,7 +33,7 @@
               </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>
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/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>