diff --git a/src/lib/listing/page-header/page-header.component.html b/src/lib/listing/page-header/page-header.component.html
index ff5a019..c339395 100644
--- a/src/lib/listing/page-header/page-header.component.html
+++ b/src/lib/listing/page-header/page-header.component.html
@@ -72,6 +72,7 @@
             <ng-content select="[slot=right]"></ng-content>
 
             <iqser-circle-button
+                [buttonId]="closeButtonId"
                 (action)="closeAction.emit()"
                 *ngIf="showCloseButton"
                 [class.ml-6]="actionConfigs"
diff --git a/src/lib/listing/page-header/page-header.component.ts b/src/lib/listing/page-header/page-header.component.ts
index bd2023e..408e2b7 100644
--- a/src/lib/listing/page-header/page-header.component.ts
+++ b/src/lib/listing/page-header/page-header.component.ts
@@ -35,6 +35,10 @@ export class PageHeaderComponent<T extends IListable> {
 
     constructor(@Optional() readonly filterService: FilterService, @Optional() readonly searchService: SearchService<T>) {}
 
+    get closeButtonId() {
+        return this.pageLabel?.toLowerCase()?.replace(/ /g, '-') + '-close-view-btn';
+    }
+
     get filterHelpModeKey() {
         return this.helpModeKey ? `filter_${this.helpModeKey}_list` : '';
     }
diff --git a/src/lib/listing/table-header/table-header.component.html b/src/lib/listing/table-header/table-header.component.html
index 18117f9..627d236 100644
--- a/src/lib/listing/table-header/table-header.component.html
+++ b/src/lib/listing/table-header/table-header.component.html
@@ -1,6 +1,7 @@
 <div [class.selection-enabled]="selectionEnabled" class="header-item">
     <div [iqserHelpMode]="helpModeKey" class="header-title">
         <iqser-round-checkbox
+            [id]="selectAllId"
             (click)="listingService.selectAll()"
             *ngIf="selectionEnabled"
             [active]="listingService.areAllSelected$ | async"
@@ -8,7 +9,7 @@
         ></iqser-round-checkbox>
 
         <span class="all-caps-label">
-            {{ tableHeaderLabel | translate : { length: totalSize || (listingService.displayedLength$ | async) } }}
+            {{ tableHeaderLabel | translate : {length: totalSize || (listingService.displayedLength$ | async)} }}
         </span>
     </div>
 
diff --git a/src/lib/listing/table-header/table-header.component.ts b/src/lib/listing/table-header/table-header.component.ts
index 7c0212b..a678f86 100644
--- a/src/lib/listing/table-header/table-header.component.ts
+++ b/src/lib/listing/table-header/table-header.component.ts
@@ -28,4 +28,8 @@ export class TableHeaderComponent<T extends IListable<PrimaryKey>, PrimaryKey ex
         readonly listingService: ListingService<T>,
         readonly filterService: FilterService,
     ) {}
+
+    get selectAllId() {
+        return this.tableHeaderLabel.split('.')[0].replace(/ /g, '-') + '-select-all-check';
+    }
 }