diff --git a/ng6-seed/src/app/dashboard/dashboard.component.html b/ng6-seed/src/app/dashboard/dashboard.component.html
index 6b07abff7..d02b0aefb 100644
--- a/ng6-seed/src/app/dashboard/dashboard.component.html
+++ b/ng6-seed/src/app/dashboard/dashboard.component.html
@@ -1,5 +1,171 @@
 <div class="pad-wrap">
- <p>
-  Dashboard!
-</p>
+  <div fxLayout="row wrap"> 
+    <div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
+       <mat-card>
+          <div class="wheather-widget text-center grad-blue">
+             <div class="wheather-today">
+                <h3>PD Triggered</h3>               
+             </div> 
+                <div fxLayout="row wrap">
+                   <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                      <p>Full PD</p>  
+                      <h3>13</h3>
+                   </div>
+                   <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                      <p>Smart PD</p>
+                      <h3>13</h3>
+                   </div>
+                </div> 
+          </div>
+       </mat-card>
+    </div>
+    <div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
+      <mat-card>
+        <div class="wheather-widget text-center grad-blue">
+            <div class="wheather-today">
+              <h3>PD Allocated</h3>               
+            </div> 
+              <div fxLayout="row wrap">
+                  <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                    <p>Full PD</p>  
+                    <h3>33</h3>
+                  </div>
+                  <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                    <p>Smart PD</p>
+                    <h3>5</h3>
+                  </div>
+              </div> 
+        </div>
+      </mat-card>
+    </div>
+    <div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
+      <mat-card>
+        <div class="wheather-widget text-center grad-blue">
+            <div class="wheather-today">
+              <h3>PD Scheduled</h3>               
+            </div> 
+              <div fxLayout="row wrap">
+                  <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                    <p>Full PD</p>  
+                    <h3>20</h3>
+                  </div>
+                  <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                    <p>Smart PD</p>
+                    <h3>6</h3>
+                  </div>
+              </div> 
+        </div>
+      </mat-card>
+    </div>
+  </div>
+  <!--Second row card's section-->
+  <div fxLayout="row wrap"> 
+    <div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
+       <mat-card>
+          <div class="wheather-widget text-center grad-blue">
+             <div class="wheather-today">
+                <h3>PD Progress</h3>               
+             </div> 
+                <div fxLayout="row wrap">
+                   <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                      <p>Full PD</p>  
+                      <h3>34</h3>
+                   </div>
+                   <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                      <p>Smart PD</p>
+                      <h3>9</h3>
+                   </div>
+                </div> 
+          </div>
+       </mat-card>
+    </div>
+    <div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
+      <mat-card>
+        <div class="wheather-widget text-center grad-blue">
+            <div class="wheather-today">
+              <h3>PD Completed</h3>               
+            </div> 
+              <div fxLayout="row wrap">
+                  <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                    <p>Full PD</p>  
+                    <h3>65</h3>
+                  </div>
+                  <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                    <p>Smart PD</p>
+                    <h3>24</h3>
+                  </div>
+              </div> 
+        </div>
+      </mat-card>
+    </div>
+    <div class="column" fxFlex.sm="100" fxFlex.xs="100" fxFlex.md="33.33" fxFlex.lg="33.33" fxFlex.xl="33.33" fxFlex="100">
+      <mat-card>
+        <div class="wheather-widget text-center grad-blue">
+            <div class="wheather-today">
+              <h3>QC Completed</h3>               
+            </div> 
+              <div fxLayout="row wrap">
+                  <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                    <p>Full PD</p>  
+                    <h3>47</h3>
+                  </div>
+                  <div fxFlex.gt-sm="50%" fxFlex="100" class="p-gap wheather-child">
+                    <p>Smart PD</p>
+                    <h3>29</h3>
+                  </div>
+              </div> 
+        </div>
+      </mat-card>
+    </div>
+  </div>
+  <!--Lender,Citywise, Same Status-->
+  <div fxLayout="row wrap">
+      <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap p-gap">
+          <mat-card>
+             <mat-card-title>Lender</mat-card-title>
+             <mat-card-subtitle>PD 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 PD -{{item.fullpd}} / Smart PD -{{item.smartpd}} </p>
+                   </mat-list-item>
+                </ng-template>
+             </mat-list>
+          </mat-card>
+       </div>
+      <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap p-gap">
+          <mat-card>
+             <mat-card-title>Citywise</mat-card-title>
+             <mat-card-subtitle>PD 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 PD -{{item.fullpd}} / Smart PD -{{item.smartpd}} </p>
+                   </mat-list-item>
+                </ng-template>
+             </mat-list>
+          </mat-card>
+       </div> 
+      <div fxFlex.gt-sm="33.33%" fxFlex="100" class="m-gap p-gap">
+         <mat-card>
+            <mat-card-title>Information</mat-card-title>
+            <mat-card-subtitle>PD In Same Status</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 de294a8f4..d22f38292 100644
--- a/ng6-seed/src/app/dashboard/dashboard.component.ts
+++ b/ng6-seed/src/app/dashboard/dashboard.component.ts
@@ -9,4 +9,57 @@ export class DashboardComponent {
   constructor() {
 
   }
+  //Lender wise PD Triggered
+  lenderpd: Object[] = [{
+    lendername:'ICICI',
+    billingaddr:'Bangalore',
+    fullpd:'9',
+    smartpd:'6', 
+  }, {
+    lendername:'IOB',
+    billingaddr:'Chennai',
+    fullpd:'10',
+    smartpd:'5',
+  }, {
+    lendername:'SBI',
+    billingaddr:'Pune',
+    fullpd:'16',
+    smartpd:'3',
+  }, ];
+
+  //City Wise PD Triggered
+  citywisepd: Object[] = [{
+    cityname: 'Bangalore',
+    fullpd:'45',
+    smartpd:'17',
+  }, {
+    cityname: 'Chennai',
+    fullpd:'33',
+    smartpd:'16',
+  }, {
+    cityname: 'Salem',
+    fullpd:'22',
+    smartpd:'12',
+  }, ];
+
+  //Same status
+  message: Object[] = [{
+    applicantname: 'Saravana',
+    applicantid:'ICICITN0118000354',
+    lendername:'ICICI',
+    status:'Allocated', 
+    photo: 'assets/images/face3.jpg', 
+  }, {
+    applicantname: 'Kumaran',
+    applicantid:'IOBKA0418000578',
+    lendername:'IOB',
+    status:'Allocated', 
+    photo: 'assets/images/face6.jpg', 
+  }, {
+    applicantname: 'Priya',
+    applicantid:'SBIGA0118000241',
+    lendername:'SBI',
+    status:'Triggered', 
+    photo: 'assets/images/face4.jpg', 
+  }, ];
 }
diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html
index c35582094..da96ed323 100644
--- a/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html
@@ -17,11 +17,11 @@ fxLayoutAlign="center">
               <div class="ml-xs mr-xs"> 
                               <mat-form-field>
                                     <!-- <ngx-select-dropdown  [multiple]="false" [value]="citydatas.city_id"  [options]="citydatas" ></ngx-select-dropdown> -->
-                                    <mat-select placeholder="Pick Up City name" required [formControl]="_branchForm.controls['fk_city_id']">
+                                    <mat-select placeholder="City Name" required [formControl]="_branchForm.controls['fk_city_id']">
                                                 <!-- <mat-option (click)="onChangedData()" *ngFor="let masters of masterArray" [value]="masters.value" [disabled]="masters.disabled"> -->
                                                      <mat-option  *ngFor="let cd of citydatas"  [value]="cd.city_id">{{ cd.name }}</mat-option>
                                     </mat-select>
-                                    <mat-error *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</mat-error>
+                                    <mat-error *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">City Name Required.</mat-error>
                               </mat-form-field>
                               <!-- <small *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</small> -->
               </div>
@@ -29,7 +29,7 @@ fxLayoutAlign="center">
               <div class="ml-xs mr-xs"> 
                     <mat-form-field>
                           <input matInput type="text" placeholder="Branch Name" required [formControl]="_branchForm.controls['name']">
-                          <mat-error *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched">You must inculde a Branch Name</mat-error>
+                          <mat-error *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched">Branch Name Required</mat-error>
                     </mat-form-field>
                     <!-- <small *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</small> -->
               </div>
diff --git a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
index d7fb9940b..58640ef98 100644
--- a/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
+++ b/ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
@@ -17,7 +17,7 @@
             <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addBranch()" matTooltip="Add Branch" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
         </div>
     </div>
- 
+  
     <mat-table [dataSource]="dataSource" *ngIf="!noRecordFound" matSort>
     
         <ng-container matColumnDef="serialno">
diff --git a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html
index 4d1ddc672..c18a1fa26 100644
--- a/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html
@@ -31,17 +31,17 @@ fxLayoutAlign="center">
 
             <div class="ml-xs mr-xs"> 
                   <mat-form-field>
-                        <mat-select placeholder="Pick Up State Name" required [formControl]="_cityForm.controls['fk_state_id']">
+                        <mat-select placeholder="State Name" required [formControl]="_cityForm.controls['fk_state_id']">
                                          <mat-option  *ngFor="let sd of stateDatas"  [value]="sd.state_id">{{ sd.name }}</mat-option>
                         </mat-select>
-                        <mat-error *ngIf="!_cityForm.controls['fk_state_id'].valid && _cityForm.controls['fk_state_id'].touched" class="mat-text-warn">You must Pickup State Name.</mat-error>
+                        <mat-error *ngIf="!_cityForm.controls['fk_state_id'].valid && _cityForm.controls['fk_state_id'].touched" class="mat-text-warn">State Name Required.</mat-error>
                   </mat-form-field>
                   
             </div>
             <div class="ml-xs mr-xs"> 
                   <mat-form-field>
                         <input matInput type="text" placeholder="City Name" required [formControl]="_cityForm.controls['name']">
-                        <mat-error *ngIf="!_cityForm.controls['name'].valid && _cityForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                        <mat-error *ngIf="!_cityForm.controls['name'].valid && _cityForm.controls['name'].touched" class="mat-text-warn">City Name Required.</mat-error>
                   </mat-form-field>
                   
             </div>
diff --git a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html
index 4de4790c4..da88ac6b3 100644
--- a/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-dialog/comments-on-locality-dialog.component.html
@@ -32,7 +32,7 @@ fxLayoutAlign="center">
             <div class="ml-xs mr-xs"> 
                   <mat-form-field style="width: 100%">
                         <input matInput type="text" placeholder="Rating" required [formControl]="_CommentOnLocalityForm.controls['rating']">
-                        <mat-error *ngIf="!_CommentOnLocalityForm.controls['rating'].valid && _CommentOnLocalityForm.controls['rating'].touched" class="mat-text-warn">You must include a Rating.</mat-error>
+                        <mat-error *ngIf="!_CommentOnLocalityForm.controls['rating'].valid && _CommentOnLocalityForm.controls['rating'].touched" class="mat-text-warn">Rating Required.</mat-error>
                   </mat-form-field>
                   
             </div>
diff --git a/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html b/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html
index 618130537..f0df83f71 100644
--- a/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/company/company-dialog/company-dialog.component.html
@@ -16,38 +16,38 @@
               <div class="ml-xs mr-xs"> 
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Company Name" required [formControl]="_companyForm.controls['name']">
-                          <mat-error *ngIf="!_companyForm.controls['name'].valid && _companyForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                          <mat-error *ngIf="!_companyForm.controls['name'].valid && _companyForm.controls['name'].touched" class="mat-text-warn">Company Name Required.</mat-error>
                     </mat-form-field>
               </div>
 
               <div class="ml-xs mr-xs"> 
                   <mat-form-field style="width: 100%">
-                        <input matInput type="text" placeholder="Company addressline1" required [formControl]="_companyForm.controls['addressline1']">
-                        <mat-error  *ngIf="!_companyForm.controls['addressline1'].valid && _companyForm.controls['addressline1'].touched" class="mat-text-warn">You must include a addressline1.</mat-error>
+                        <input matInput type="text" placeholder="Company Address Line1" required [formControl]="_companyForm.controls['addressline1']">
+                        <mat-error  *ngIf="!_companyForm.controls['addressline1'].valid && _companyForm.controls['addressline1'].touched" class="mat-text-warn">Company Address Line1 Required.</mat-error>
                   </mat-form-field>     
               </div>
 
               <div class="ml-xs mr-xs"> 
                 <mat-form-field style="width: 100%">
-                      <input matInput type="text" placeholder="Company addressline2" required [formControl]="_companyForm.controls['addressline2']">
-                      <mat-error *ngIf="!_companyForm.controls['addressline2'].valid && _companyForm.controls['addressline2'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                      <input matInput type="text" placeholder="Company Address Line2" required [formControl]="_companyForm.controls['addressline2']">
+                      <mat-error *ngIf="!_companyForm.controls['addressline2'].valid && _companyForm.controls['addressline2'].touched" class="mat-text-warn">Company Address Line2 Required.</mat-error>
                 </mat-form-field>  
               </div>
 
               <div class="ml-xs mr-xs"> 
                   <mat-form-field style="width: 100%">
-                        <input matInput type="text" placeholder="Company addressline3" required [formControl]="_companyForm.controls['addressline3']">
-                        <mat-error *ngIf="!_companyForm.controls['addressline3'].valid && _companyForm.controls['addressline3'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                        <input matInput type="text" placeholder="Company Address Line3" required [formControl]="_companyForm.controls['addressline3']">
+                        <mat-error *ngIf="!_companyForm.controls['addressline3'].valid && _companyForm.controls['addressline3'].touched" class="mat-text-warn">Company Address Line3 Required.</mat-error>
                   </mat-form-field>    
               </div>
 
               <div class="ml-xs mr-xs"> 
                               <mat-form-field style="width: 100%">
-                              <mat-select placeholder="Pick Up City name" required [formControl]="_companyForm.controls['city']">
+                              <mat-select placeholder="City Name" required [formControl]="_companyForm.controls['city']">
 
                                           <mat-option  *ngFor="let cd of citydatas"  [value]="cd.city_id">{{ cd.name }}</mat-option>
                               </mat-select>
-                              <mat-error *ngIf="!_companyForm.controls['city'].valid && _companyForm.controls['city'].touched" class="mat-text-warn">You must include a City.</mat-error>
+                              <mat-error *ngIf="!_companyForm.controls['city'].valid && _companyForm.controls['city'].touched" class="mat-text-warn">City Name Required.</mat-error>
                         </mat-form-field>
                         <!-- <small *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pickup City Name.</small> -->
                </div>
@@ -55,7 +55,7 @@
               <div class="ml-xs mr-xs"> 
                   <mat-form-field style="width: 100%">
                         <input matInput type="text" placeholder="Pin code" required [formControl]="_companyForm.controls['pincode']">
-                        <mat-hint>pincode should be in 6 digit format</mat-hint>
+                        <mat-hint>Pincode should be in 6 digit format</mat-hint>
                         <!-- <mat-error *ngIf="_companyForm.controls['pincode'].hasError('required') && _companyForm.controls['pincode'].touched" class="mat-text-warn">You must include phone number.</mat-error> -->
                         <!-- <mat-error *ngIf="!_companyForm.controls['pincode'].valid && _companyForm.controls['pincode'].touched" class="mat-text-warn">You must include a pincode number.</mat-error> -->
                         <mat-error *ngIf="_companyForm.controls['pincode'].hasError('minlength') && _companyForm.controls['pincode'].touched" class="mat-text-warn">Your pincode must be at least 5 characters long.</mat-error>
@@ -65,10 +65,10 @@
 
               <div class="ml-xs mr-xs"> 
                   <mat-form-field style="width: 100%">
-                        <mat-select placeholder="Pick Up State Name" required [formControl]="_companyForm.controls['state']">
+                        <mat-select placeholder="State Name" required [formControl]="_companyForm.controls['state']">
                                     <mat-option  *ngFor="let sd of stateDatas"  [value]="sd.state_id">{{ sd.name }}</mat-option>
                         </mat-select>
-                         <mat-error *ngIf="!_companyForm.controls['state'].valid && _companyForm.controls['state'].touched" class="mat-text-warn">You must Pickup a State.</mat-error> 
+                         <mat-error *ngIf="!_companyForm.controls['state'].valid && _companyForm.controls['state'].touched" class="mat-text-warn">State Name Required.</mat-error> 
                   </mat-form-field>
               </div>
 
diff --git a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html
index 7198faac0..c445f8fe6 100644
--- a/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html
@@ -34,7 +34,7 @@ fxLayoutAlign="center">
             <div class="mb-1"> 
                   <mat-form-field style="width: 100%">
                         <input matInput type="text" placeholder="Description" required [formControl]="_customerBehaviourForm.controls['description']">
-                        <mat-error *ngIf="!_customerBehaviourForm.controls['description'].valid && _customerBehaviourForm.controls['description'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                        <mat-error *ngIf="!_customerBehaviourForm.controls['description'].valid && _customerBehaviourForm.controls['description'].touched" class="mat-text-warn">Description Required.</mat-error>
                   </mat-form-field>
                   
             </div>
diff --git a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html
index af713ed41..98f96e5e6 100644
--- a/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html
@@ -34,7 +34,7 @@ fxLayoutAlign="center">
             <div class="mb-1"> 
                   <mat-form-field style="width: 100%">
                         <input matInput type="text" placeholder="Name" required [formControl]="_customerSegmentForm.controls['name']">
-                        <mat-error *ngIf="!_customerSegmentForm.controls['name'].valid && _customerSegmentForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                        <mat-error *ngIf="!_customerSegmentForm.controls['name'].valid && _customerSegmentForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
                   </mat-form-field>
                   
             </div>
@@ -42,7 +42,7 @@ fxLayoutAlign="center">
             <div class="mb-1"> 
                       <mat-form-field style="width: 100%">
                             <input matInput type="text" placeholder="Abbrevation" required [formControl]="_customerSegmentForm.controls['abbr']">
-                            <mat-error *ngIf="!_customerSegmentForm.controls['abbr'].valid && _customerSegmentForm.controls['abbr'].touched" class="mat-text-warn">You must include a Abbrevation.</mat-error>
+                            <mat-error *ngIf="!_customerSegmentForm.controls['abbr'].valid && _customerSegmentForm.controls['abbr'].touched" class="mat-text-warn">Abbrevation Required.</mat-error>
                       </mat-form-field>
                       
                 </div>
diff --git a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html
index fd3e2e99a..c50de886e 100644
--- a/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html
@@ -32,7 +32,7 @@ fxLayoutAlign="center">
             <div class="ml-xs mr-xs"> 
                   <mat-form-field style="width: 100%">
                         <input matInput type="text" placeholder="Name" required [formControl]="_designationForm.controls['name']">
-                        <mat-error *ngIf="!_designationForm.controls['name'].valid && _designationForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                        <mat-error *ngIf="!_designationForm.controls['name'].valid && _designationForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
                   </mat-form-field>
                   
             </div>
@@ -42,7 +42,7 @@ fxLayoutAlign="center">
             <div class="ml-xs mr-xs"> 
                       <mat-form-field style="width: 100%">
                             <input matInput type="text" placeholder="Short Name" required [formControl]="_designationForm.controls['short_name']">
-                            <mat-error *ngIf="!_designationForm.controls['short_name'].valid && _designationForm.controls['short_name'].touched" class="mat-text-warn">You must include a Short Name.</mat-error>
+                            <mat-error *ngIf="!_designationForm.controls['short_name'].valid && _designationForm.controls['short_name'].touched" class="mat-text-warn">Short Name Required.</mat-error>
                       </mat-form-field>
                       
                 </div>
diff --git a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html
index caa3b9348..706429f5d 100644
--- a/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html
@@ -34,7 +34,7 @@ fxLayoutAlign="center">
                   <div class="ml-xs mr-xs"> 
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Frequency Name" required [formControl]="_frequencyForm.controls['name']">
-                          <mat-error *ngIf="!_frequencyForm.controls['name'].valid && _frequencyForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                          <mat-error *ngIf="!_frequencyForm.controls['name'].valid && _frequencyForm.controls['name'].touched" class="mat-text-warn">Frequency Name Required.</mat-error>
                     </mat-form-field>
                     
               </div>
diff --git a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html
index 9fae64052..5cae4c53a 100644
--- a/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html
@@ -33,7 +33,7 @@ fxLayoutAlign="center">
                   <div class="ml-xs mr-xs">
                         <mat-form-field style="width: 100%">
                               <input matInput type="text" placeholder="Classification Name" required [formControl]="_IndustryClassificationForm.controls['name']">
-                              <mat-error *ngIf="!_IndustryClassificationForm.controls['name'].valid && _IndustryClassificationForm.controls['name'].touched" class="mat-text-warn">You must include a Classified Name.</mat-error>
+                              <mat-error *ngIf="!_IndustryClassificationForm.controls['name'].valid && _IndustryClassificationForm.controls['name'].touched" class="mat-text-warn">Classified Name Required.</mat-error>
                         </mat-form-field>
                         
                   </div>
diff --git a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html
index e176790fd..3fba64166 100644
--- a/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html
@@ -32,7 +32,7 @@ fxLayoutAlign="center">
                   <div class="ml-xs mr-xs">
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Lender Hierarchy Name" required [formControl]="_lenderHierarchyForm.controls['lender_hierarchy']">
-                          <mat-error *ngIf="!_lenderHierarchyForm.controls['lender_hierarchy'].valid && _lenderHierarchyForm.controls['lender_hierarchy'].touched" class="mat-text-warn">You must include a Lender Hierarchy Name.</mat-error>
+                          <mat-error *ngIf="!_lenderHierarchyForm.controls['lender_hierarchy'].valid && _lenderHierarchyForm.controls['lender_hierarchy'].touched" class="mat-text-warn">Lender Hierarchy Name Required.</mat-error>
                     </mat-form-field>
                     
               </div>
diff --git a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html
index 21bb919a7..c6ca49362 100644
--- a/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html
@@ -32,7 +32,7 @@ fxLayout="row">
                   <div class="ml-xs mr-xs">
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Name" required [formControl]="_occupationForm.controls['name']">
-                          <mat-error *ngIf="!_occupationForm.controls['name'].valid && _occupationForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                          <mat-error *ngIf="!_occupationForm.controls['name'].valid && _occupationForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
                     </mat-form-field>
                     
               </div>
diff --git a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html
index bf39530f1..bf100ef8e 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html
@@ -33,8 +33,8 @@ fxLayoutAlign="center">
 
             <div class="ml-xs mr-xs">
                   <mat-form-field style="width: 100%">
-                        <input matInput type="text" placeholder="Name" required [formControl]="_pdLocationApproachForm.controls['description']">
-                        <mat-error *ngIf="!_pdLocationApproachForm.controls['description'].valid && _pdLocationApproachForm.controls['description'].touched" class="mat-text-warn">You must include a Description.</mat-error>
+                        <input matInput type="text" placeholder="Descriptiion" required [formControl]="_pdLocationApproachForm.controls['description']">
+                        <mat-error *ngIf="!_pdLocationApproachForm.controls['description'].valid && _pdLocationApproachForm.controls['description'].touched" class="mat-text-warn">Description Required.</mat-error>
                   </mat-form-field>
                   
             </div>
diff --git a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html
index bbc649150..643c7122a 100644
--- a/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html
@@ -33,8 +33,8 @@ fxLayoutAlign="center">
           
                       <div class="ml-xs mr-xs">
                             <mat-form-field style="width: 100%">
-                                  <input matInput type="text" placeholder="Name" required [formControl]="_pdTypeForm.controls['type_name']">
-                                  <mat-error *ngIf="!_pdTypeForm.controls['type_name'].valid && _pdTypeForm.controls['type_name'].touched" class="mat-text-warn">You must include a type_name.</mat-error>
+                                  <input matInput type="text" placeholder="Type Name" required [formControl]="_pdTypeForm.controls['type_name']">
+                                  <mat-error *ngIf="!_pdTypeForm.controls['type_name'].valid && _pdTypeForm.controls['type_name'].touched" class="mat-text-warn">Type Name Required.</mat-error>
                             </mat-form-field>
                 
                       </div>
diff --git a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html
index 5793c6d43..bd8c0551a 100644
--- a/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html
@@ -32,7 +32,7 @@ fxLayoutAlign="center">
                 <div class="ml-xs mr-xs">
                     <mat-form-field style="width: 100%">
                             <input matInput type="text" placeholder="Product Name" required [formControl]="_productMasterForm.controls['name']">
-                            <mat-error *ngIf="!_productMasterForm.controls['name'].valid && _productMasterForm.controls['name'].touched" class="mat-text-warn">You must include a Product name.</mat-error>
+                            <mat-error *ngIf="!_productMasterForm.controls['name'].valid && _productMasterForm.controls['name'].touched" class="mat-text-warn">Product Name Required.</mat-error>
                     </mat-form-field>
                     
                 </div>    
@@ -41,7 +41,7 @@ fxLayoutAlign="center">
                     <mat-form-field style="width: 100%">
                             <input matInput type="text" placeholder="Product Abbr" required [formControl]="_productMasterForm.controls['abbr']">
                     </mat-form-field>
-                    <mat-error *ngIf="!_productMasterForm.controls['abbr'].valid && _productMasterForm.controls['abbr'].touched" class="mat-text-warn">You must include a Product abbrevation.</mat-error>
+                    <mat-error *ngIf="!_productMasterForm.controls['abbr'].valid && _productMasterForm.controls['abbr'].touched" class="mat-text-warn">Product Abbrevation Required.</mat-error>
                 </div>
       
                 <div class="row" style="text-align:right;">
diff --git a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html
index 4158e2813..b54a9f9fd 100644
--- a/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html
@@ -16,7 +16,7 @@ fxLayoutAlign="center">
                 <div class="ml-xs mr-xs">
                     <mat-form-field style="width: 100%">
                             <input matInput type="text" placeholder="Category Name" required [formControl]="_questionCategoryForm.controls['categroy_name']">
-                            <mat-error *ngIf="!_questionCategoryForm.controls['categroy_name'].valid && _questionCategoryForm.controls['categroy_name'].touched" class="mat-text-warn">You must include a category name.</mat-error>
+                            <mat-error *ngIf="!_questionCategoryForm.controls['categroy_name'].valid && _questionCategoryForm.controls['categroy_name'].touched" class="mat-text-warn">Category Name Required.</mat-error>
                     </mat-form-field>  
                 </div>    
                     
diff --git a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html
index 92891a919..f652efa2a 100644
--- a/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html
@@ -34,7 +34,7 @@ fxLayoutAlign="center">
               <div class="ml-xs mr-xs"> 
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Name" required [formControl]="_regionsForm.controls['name']">
-                          <mat-error *ngIf="!_regionsForm.controls['name'].valid && _regionsForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                          <mat-error *ngIf="!_regionsForm.controls['name'].valid && _regionsForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
                     </mat-form-field>
                
               </div>
diff --git a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html
index 415e9ff95..3cce82541 100644
--- a/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html
@@ -34,7 +34,7 @@ fxLayoutAlign="center">
               <div class="ml-xs mr-xs"> 
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Name" required [formControl]="_relationShipForm.controls['name']">
-                          <mat-error *ngIf="!_relationShipForm.controls['name'].valid && _relationShipForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                          <mat-error *ngIf="!_relationShipForm.controls['name'].valid && _relationShipForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
                     </mat-form-field>
                     
               </div>
diff --git a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html
index 78827813d..fe54686e3 100644
--- a/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html
@@ -32,17 +32,17 @@ fxLayoutAlign="center">
 
                   <div class="ml-xs mr-xs"> 
                         <mat-form-field>
-                              <mat-select placeholder="Pick Up Region Name" required [formControl]="_statesForm.controls['fk_region_id']">
+                              <mat-select placeholder="Region Name" required [formControl]="_statesForm.controls['fk_region_id']">
                                                <mat-option  *ngFor="let sd of regionDatas"  [value]="sd.region_id">{{ sd.name }}</mat-option>
                               </mat-select>
-                              <mat-error *ngIf="!_statesForm.controls['fk_region_id'].valid && _statesForm.controls['fk_region_id'].touched" class="mat-text-warn">You must include a Region.</mat-error>
+                              <mat-error *ngIf="!_statesForm.controls['fk_region_id'].valid && _statesForm.controls['fk_region_id'].touched" class="mat-text-warn">Region Name Required.</mat-error>
                         </mat-form-field>
                   </div>
                   
               <div class="ml-xs mr-xs"> 
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Name" required [formControl]="_statesForm.controls['name']">
-                          <mat-error *ngIf="!_statesForm.controls['name'].valid && _statesForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                          <mat-error *ngIf="!_statesForm.controls['name'].valid && _statesForm.controls['name'].touched" class="mat-text-warn">Name Required.</mat-error>
                     </mat-form-field>
               
               </div>
@@ -58,7 +58,7 @@ fxLayoutAlign="center">
             <div class="ml-xs mr-xs"> 
                 <mat-form-field style="width: 100%">
                       <input matInput type="text" placeholder="Code" required [formControl]="_statesForm.controls['code']">
-                      <mat-error *ngIf="!_statesForm.controls['code'].valid && _statesForm.controls['code'].touched" class="mat-text-warn">You must include a Code.</mat-error>
+                      <mat-error *ngIf="!_statesForm.controls['code'].valid && _statesForm.controls['code'].touched" class="mat-text-warn">Code Required.</mat-error>
                 </mat-form-field>
                 
           </div>
diff --git a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html
index e0193cf07..55cb0254d 100644
--- a/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html
@@ -41,10 +41,10 @@ fxLayoutAlign="center">
                        </mat-form-field>  -->
                        <div class="ml-xs mr-xs"> 
                             <mat-form-field>
-                                  <mat-select placeholder="Pick Up Product Name" required [formControl]="_subProductMasterForm.controls['fk_product_id']">
+                                  <mat-select placeholder="Product Name" required [formControl]="_subProductMasterForm.controls['fk_product_id']">
                                                    <mat-option  *ngFor="let sd of productDatas"  [value]="sd.product_id">{{ sd.name }}</mat-option>
                                   </mat-select>
-                                  <mat-error *ngIf="!_subProductMasterForm.controls['fk_product_id'].valid && _subProductMasterForm.controls['fk_product_id'].touched" class="mat-text-warn">You must include a Product name.</mat-error> 
+                                  <mat-error *ngIf="!_subProductMasterForm.controls['fk_product_id'].valid && _subProductMasterForm.controls['fk_product_id'].touched" class="mat-text-warn">Product Name Required.</mat-error> 
                             </mat-form-field>
                       </div>
                      <!-- <mat-form-field style="width: 100%">
@@ -56,7 +56,7 @@ fxLayoutAlign="center">
                 <div class="ml-xs mr-xs"> 
                     <mat-form-field style="width: 100%">
                         <input matInput type="text" placeholder="Sub Product Name" required [formControl]="_subProductMasterForm.controls['name']">
-                        <mat-error *ngIf="!_subProductMasterForm.controls['name'].valid && _subProductMasterForm.controls['name'].touched" class="mat-text-warn">You must include a Sub Product name.</mat-error>
+                        <mat-error *ngIf="!_subProductMasterForm.controls['name'].valid && _subProductMasterForm.controls['name'].touched" class="mat-text-warn">Sub Product Name Required.</mat-error>
                     </mat-form-field>
                     
                 </div>
diff --git a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html
index c841bcd07..f2bd7bf94 100644
--- a/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html
@@ -34,7 +34,7 @@ fxLayoutAlign="center">
               <div class="ml-xs mr-xs"> 
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Title" required [formControl]="_titleForm.controls['name']">
-                          <mat-error *ngIf="!_titleForm.controls['name'].valid && _titleForm.controls['name'].touched" class="mat-text-warn">You must include a Title.</mat-error>
+                          <mat-error *ngIf="!_titleForm.controls['name'].valid && _titleForm.controls['name'].touched" class="mat-text-warn">Title Required.</mat-error>
                     </mat-form-field>
                
               </div>
diff --git a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html
index 548195fed..4a172f7d5 100644
--- a/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html
@@ -34,7 +34,7 @@ fxLayoutAlign="center">
               <div class="mb-1"> 
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="Activity Name" required [formControl]="_activityMasterForm.controls['name']">
-                          <mat-error *ngIf="!_activityMasterForm.controls['name'].valid && _activityMasterForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                          <mat-error *ngIf="!_activityMasterForm.controls['name'].valid && _activityMasterForm.controls['name'].touched" class="mat-text-warn">Activity Name Required.</mat-error>
                     </mat-form-field>
                   
               </div>
diff --git a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html
index 6e73ecfda..1c1c11b7e 100644
--- a/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html
+++ b/ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html
@@ -32,7 +32,7 @@ fxLayoutAlign="center">
               <div class="mb-1"> 
                     <mat-form-field style="width: 100%">
                           <input matInput type="text" placeholder="UOM Name" required [formControl]="_uomForm.controls['name']">
-                          <mat-error *ngIf="!_uomForm.controls['name'].valid && _uomForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</mat-error>
+                          <mat-error *ngIf="!_uomForm.controls['name'].valid && _uomForm.controls['name'].touched" class="mat-text-warn">UOM Name Required.</mat-error>
                     </mat-form-field>
                   
               </div>
diff --git a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts
index dda5a7c98..31f81afc4 100644
--- a/ng6-seed/src/app/settings/service/masters/pd-team.service.ts
+++ b/ng6-seed/src/app/settings/service/masters/pd-team.service.ts
@@ -23,8 +23,8 @@ export interface Master {
 export class PdTeamService {
   
   
-//private  apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
-private  apiUrl = "http://localhost/sparqapi/api/";
+private  apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
+//private  apiUrl = "http://localhost/sparqapi/api/";
   pk: { "primary_key": any; };
   
   
diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.html b/ng6-seed/src/app/settings/users/user-list/user-list.component.html
index 21a3e9a9d..b5a3a6fed 100644
--- a/ng6-seed/src/app/settings/users/user-list/user-list.component.html
+++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.html
@@ -41,7 +41,7 @@
         <mat-cell *matCellDef="let us"> {{us.role_name}} </mat-cell>
       </ng-container>
       <ng-container matColumnDef="Entity">
-          <mat-header-cell *matHeaderCellDef mat-sort-header> ENTITIES </mat-header-cell>
+          <mat-header-cell *matHeaderCellDef mat-sort-header>Entities </mat-header-cell>
           <mat-cell *matCellDef="let us"> {{us.entitytypename}} </mat-cell>
         </ng-container>
      <ng-container matColumnDef="IsActive">
@@ -70,7 +70,7 @@
      <ng-container matColumnDef="Actions">
        <mat-header-cell *matHeaderCellDef>   Actions </mat-header-cell>
        <mat-cell *matCellDef="let us"> 
-          <a mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editUserDetails(us.userid,us.aws_name)"><mat-icon>edit</mat-icon></a>
+          <a mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editUserDetails(us.userid,us.aws_name)"><mat-icon>edit</mat-icon></a>
           <!-- <a mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="deleteuser(us)"><mat-icon>delete_forever</mat-icon></a>             -->
           <!-- <a mat-icon-button class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="adminedituser(us)"><mat-icon>account_circle</mat-icon></a>                       -->
         </mat-cell>
@@ -83,6 +83,6 @@
 
    <!-- <div *ngIf="dataSource.length === 0">No records found</div> -->
  
-   <mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
+   <mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
  </div>
 </mat-card-content>
diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts
index c9fafe84b..29f23fae9 100644
--- a/ng6-seed/src/app/settings/users/user-list/user-list.component.ts
+++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.ts
@@ -5,6 +5,8 @@ import { MatPaginator, MatTableDataSource,MatSort } from '@angular/material';
 import { UserService } from '../../service/user.service';
 import { DataSource } from '@angular/cdk/table';
 import { CognitoService } from '../../../AwsService/cognito.service';
+ 
+
 @Component({
   selector: 'app-user-list',
   templateUrl: './user-list.component.html',
@@ -17,7 +19,9 @@ export class UserListComponent implements OnInit {
  
    @ViewChild(MatPaginator) paginator: MatPaginator;
    @ViewChild(MatSort) sort: MatSort;
-
+   color="primary";
+  // pagination variable details
+  pageSize = 10; 
   userdata: any = [];
   loader: boolean = false;
   
@@ -41,9 +45,6 @@ export class UserListComponent implements OnInit {
     
   }
 
-
-
-
   ngOnInit() {
     
     delete this.aws.localUserId;