diff --git a/ng6-seed/src/app/template/questions/list/list.component.html b/ng6-seed/src/app/template/questions/list/list.component.html
index fd7fe1a92..ac0ed4c45 100644
--- a/ng6-seed/src/app/template/questions/list/list.component.html
+++ b/ng6-seed/src/app/template/questions/list/list.component.html
@@ -47,11 +47,10 @@
                 </mat-row>
                 </mat-table>
             </ng-container>
-                <div *ngIf="productList.length > 0">
-                <mat-paginator  [length]="productList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
+                
+                <mat-paginator #paginator [length]="productList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
                 [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
-              </mat-paginator>
-              </div>
+              </mat-paginator> 
    
   
      <!---- <ng-container *ngIf="productList.length > 0">
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 a78befcb0..5b9454794 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
@@ -21,9 +21,9 @@
                         <!--<button mat-stroked-button color="primary" (click)="addNewQuestion()">Add Questions</button>-->
                     </div>
                 </div> 
-            <ng-container *ngIf="templateList.length > 0">
-                <div style="padding: 0 12px;">
-                        <mat-table [dataSource]="dataSource" >
+            <mat-card-content>
+                <ng-container  >
+                        <mat-table [dataSource]="dataSource" *ngIf="templateList.length > 0" >
     
                                 <ng-container matColumnDef="template_name">
                                       <mat-cell  fxFlex="25%" *matCellDef="let template;"> 
@@ -33,7 +33,7 @@
                                 <ng-container matColumnDef="lender_details">
                                   <mat-cell  fxFlex="65%" *matCellDef="let template;"> 
                                         <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">,<br></i></span>
+                                                <span *ngFor="let lender of template.lender_details ; let last = last" > {{lender.full_name}} - {{lender.product_name}} - {{lender.customer_segment_name}} <span *ngIf="!last">,<br><br></span></span>
                                             </div>
                                      </mat-cell>
                                </ng-container>
@@ -45,38 +45,18 @@
                                <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">
                                 </mat-row>
                                 </mat-table>
-                                 
-                    <!----<mat-card class="product-card" *ngFor="let template of dataSource.connect() | async">
-                        <div fxLayout="row" fxLayoutAlign="start start" style="padding: 6px 2px;">
+                       </ng-container>  
 
-                            <div fxFlex="90%" style="padding: 12px 8px;">
-
-                                <div fxLayout="row" fxLayoutWrap fxLayoutAlign="start center">
-                                    <div class="ml-xs" fxFlex="20%">
-                                       <span> {{ template.template_name }}</span> 
-                                    </div>
-                                    <div class="ml-xs" fxFlex="80%">
-                                        <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>
-                            </div>
-                            <div fxFlex="10%">
-                                <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="goToEdit(template.template_id)"><mat-icon>edit</mat-icon></button>
-                            </div>
-                        </div>
-                    </mat-card>-->
-                </div>
-            </ng-container>
-            <mat-card *ngIf="noQuesMasterRecrdFound">
+                        <mat-paginator    [length]="templateList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
+                        [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
+                    </mat-paginator>
+        
+            <mat-card *ngIf="noTemplMasterRecrdFound">
+                <mat-card-content>
                 <div class="no-record-found">No Record Found ... </div>
-            </mat-card>
-            <div *ngIf="templateList.length > 0">
-            <mat-paginator #paginator class="mat-elevation-z1" [length]="templateList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
-                [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
-            </mat-paginator>
-            </div>
+                 </mat-card-content>
+            </mat-card> 
+        </mat-card-content>
         </mat-card>
     </div>
 
diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss
index a0999becd..00579aa03 100644
--- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss
+++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.scss
@@ -25,8 +25,8 @@
    overflow: hidden;
   //  white-space: nowrap;
    display: -webkit-box;
-   line-height: 16px;     /* fallback */
-   max-height: 32px;      /* fallback */
+   line-height: 15px;     /* fallback */
+   max-height: 44px;      /* fallback */
    -webkit-line-clamp: 2; /* number of lines to show */
    -webkit-box-orient: vertical;
    
diff --git a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts
index c72aaf2e2..34122c711 100644
--- a/ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts
+++ b/ng6-seed/src/app/template/templates/templates-list/templates.list.component.ts
@@ -20,12 +20,13 @@ import { TemplatesAddComponent } from './templates-add/templates-add.component';
 })
 export class TemplateListComponent implements OnInit, OnDestroy {
 
-  public templateList = [];
+  public templateList: any[] = [];
   public listView: boolean;
   public names: string;
   public noTemplMasterRecrdFound: boolean = false;
   public search_cid : any;
 
+
   // pagination variable details
   length = 50;
   pageIndex = 0;
@@ -55,6 +56,10 @@ export class TemplateListComponent implements OnInit, OnDestroy {
     this.getTemplateMastersListDetails();
   }
  
+  ngAfterViewInit() {
+    this.dataSource.paginator = this.paginator;
+    this.dataSource.sort = this.sort;
+  }
 
  // get question master list details
   getTemplateMastersListDetails() {
@@ -123,7 +128,10 @@ export class TemplateListComponent implements OnInit, OnDestroy {
     //Called once, before the instance is destroyed.
     //Add 'implements OnDestroy' to the class.
   }
-
+  // padination page event call
+  pageChange(e) {
+    console.log(e);
+  }
 
   public m_templateList = {    
     "dataStatus": true,