diff --git a/@overflow/target/component/list/list.component.html b/@overflow/target/component/list/list.component.html
index b2f0256..a68af23 100644
--- a/@overflow/target/component/list/list.component.html
+++ b/@overflow/target/component/list/list.component.html
@@ -18,7 +18,7 @@
   </ng-template>
   <ng-template pTemplate="body" let-target let-rowIndex="rowIndex">
     <tr [pSelectableRow]="target">
-      <td>{{rowIndex + 1}}</td>
+      <td>{{(rowIndex + 1) + ((pageIdx - 1) * countPerPage)}}</td>
       <td></td>
       <td>{{target.infra.metaInfraType.name}}</td>
       <td>{{target.displayName}}</td>
@@ -30,7 +30,7 @@
     </tr>
   </ng-template>
 </p-table>
-<p-paginator #paginator [rows]="targetPage.size" [totalRecords]="targetPage.totalElements" [first]="pageIdx"
+<p-paginator #paginator [rows]="targetPage.size" [totalRecords]="targetPage.totalElements" [first]="pageIdx "
              (onPageChange)="onPaginate($event)"></p-paginator>
 
 </ng-template>
diff --git a/@overflow/target/component/list/list.component.ts b/@overflow/target/component/list/list.component.ts
index 939d7b5..7ab9580 100644
--- a/@overflow/target/component/list/list.component.ts
+++ b/@overflow/target/component/list/list.component.ts
@@ -45,16 +45,18 @@ export class ListComponent implements OnInit, OnChanges {
   pending$: Observable<boolean>;
   error$: Observable<any>;
 
+  countPerPage: number;
+
   constructor(
     private store: Store<any>,
     private targetService: TargetService,
     private location: PlatformLocation
   ) {
-
+    this.countPerPage = 2;
   }
 
   ngOnInit() {
-    this.getTargetList();
+    // this.getTargetList();
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -76,7 +78,7 @@ export class ListComponent implements OnInit, OnChanges {
 
     const pageParams: PageParams = {
       pageNo: p,
-      countPerPage: 2,
+      countPerPage: this.countPerPage,
       sortCol: 'id',
       sortDirection: 'descending',
     };