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 32b8be9c7..c6ce4f330 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
@@ -8,7 +8,40 @@
         <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>
+     <mat-card-content>
     <ng-container *ngIf="enityList.length > 0">
+        <mat-table [dataSource]="dataSource">
+ 
+            <ng-container matColumnDef="entity_name">
+                  <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;"> 
+                    <span *ngIf="product.entity_name" mat-line>{{ product.entity_name }}</span>
+                     </mat-cell>
+            </ng-container>
+            <ng-container matColumnDef="name">
+                <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;"> 
+                    <div> {{ product.full_name }} ({{product.short_name}})</div>
+                    <div> {{ product.branch_name }} </div>
+                    <div> {{product.city_name}}<span *ngIf="product.state_name">,</span> {{product.state_name}} </div>
+                   </mat-cell>
+          </ng-container>
+          <ng-container matColumnDef="contact">
+              <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;"> 
+                  <div> {{ product.phone_number }}</div>
+                  <div> {{ product.official_email }}</div></mat-cell>
+        </ng-container>
+        <ng-container matColumnDef="actions">
+              <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;"> 
+                  <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>
+           
+              </mat-cell>
+        </ng-container>
+           
+           <mat-row style="align-items: normal !important;" *matRowDef="let row; columns: displayedColumns;">
+            </mat-row>
+            </mat-table> 
+        </ng-container>
+      </mat-card-content>
+    <!----<ng-container *ngIf="enityList.length > 0">
       <div style="padding: 0 12px;">
         <mat-card class="product-card" *ngFor="let product of dataSource.connect() | async">
           <div fxLayout="row" fxLayoutAlign="start start">
@@ -38,13 +71,17 @@
           </div>
         </mat-card>
       </div>
-    </ng-container>
+    </ng-container>-->
     <mat-card *ngIf="noQuesMasterRecrdFound">
+      <mat-card-content>
       <div class="no-record-found">No Record Found ... </div>
+    </mat-card-content>
     </mat-card>
-    <mat-paginator #paginator class="mat-elevation-z1" [length]="enityList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
+    <div *ngIf="enityList.length > 0">
+    <mat-paginator  [length]="enityList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
       [pageSizeOptions]="[5, 10, 25, 50, 100]" (page)="pageEvent = $event; pageChange($event)" showFirstLastButtons>
     </mat-paginator>
+    </div>
   </mat-card>
 </div>
 
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 99295c4c7..fd7fe1a92 100644
--- a/ng6-seed/src/app/template/questions/list/list.component.html
+++ b/ng6-seed/src/app/template/questions/list/list.component.html
@@ -29,17 +29,17 @@
             <mat-table [dataSource]="dataSource">
      
                 <ng-container matColumnDef="category_name">
-                      <mat-cell  fxFlex="25%" class="cell"  *matCellDef="let product;" style="width:20% !important;"> 
+                      <mat-cell  fxFlex="20%" class="cell"  *matCellDef="let product;" > 
                         <span *ngIf="product.category_name" mat-line>{{ product.category_name }}</span>
                          </mat-cell>
                 </ng-container>
                 <ng-container matColumnDef="question">
-                  <mat-cell  fxFlex="65%"  class="cell" *matCellDef="let product;" style="width:70% !important;"> 
+                  <mat-cell  fxFlex="70%"  class="cell" *matCellDef="let product;" > 
                     <span *ngIf="product.question" mat-line>{{ product.question }}</span>
                      </mat-cell>
                </ng-container>
                 <ng-container matColumnDef="actions">
-                  <mat-cell fxFlex="10%"  class="cell" *matCellDef="let product;" style="width:10% !important;"> 
+                  <mat-cell fxFlex="10%"  class="cell" *matCellDef="let product;"> 
                     <button mat-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editQuestion(product)"><mat-icon>edit</mat-icon></button>
                     </mat-cell>
                </ng-container>