diff --git a/src/app/tasks/import-supertasks/masks/masks.component.html b/src/app/tasks/import-supertasks/masks/masks.component.html
index 7dc737823..cde205c90 100644
--- a/src/app/tasks/import-supertasks/masks/masks.component.html
+++ b/src/app/tasks/import-supertasks/masks/masks.component.html
@@ -1,3 +1,8 @@
+<app-table>
+  <app-page-title
+    [title]="'Supertask Builder'"
+  ></app-page-title>
+
 <horizontalnav [menuItems]="menuItems"></horizontalnav>
 <!-- Body -->
 <grid-main>
@@ -29,3 +34,4 @@
 
   </form>
 </grid-main>
+</app-table>
diff --git a/src/app/tasks/import-supertasks/masks/masks.component.ts b/src/app/tasks/import-supertasks/masks/masks.component.ts
index 29ee00a91..8722152b5 100644
--- a/src/app/tasks/import-supertasks/masks/masks.component.ts
+++ b/src/app/tasks/import-supertasks/masks/masks.component.ts
@@ -14,10 +14,10 @@ import { Router } from '@angular/router';
 
 import { JPretask } from '@models/pretask.model';
 
-import { JCrackerBinaryType } from '../../../core/_models/cracker-binary.model';
-import { ResponseWrapper } from '../../../core/_models/response.model';
-import { SERV } from '../../../core/_services/main.config';
+import { SERV } from '@services/main.config';
 
+import { JCrackerBinaryType } from '@src/app/core/_models/cracker-binary.model';
+import { ResponseWrapper } from '@src/app/core/_models/response.model';
 import { JsonAPISerializer } from '@src/app/core/_services/api/serializer-service';
 
 /**
@@ -46,7 +46,7 @@ export class MasksComponent implements OnInit, OnDestroy {
 
   /** Select Options. */
   selectBenchmarktype = benchmarkType;
-  selectCrackertype: any;
+  selectCrackertype = undefined;
 
   /** Select Options Mapping */
   selectCrackertypeMap = {
@@ -78,7 +78,6 @@ export class MasksComponent implements OnInit, OnDestroy {
     private serializer: JsonAPISerializer
   ) {
     this.buildForm();
-    titleService.set(['Import SuperTask - Mask']);
   }
 
   /**
@@ -106,7 +105,7 @@ export class MasksComponent implements OnInit, OnDestroy {
       isSmall: new FormControl(false),
       isCpuTask: new FormControl(false),
       optFlag: new FormControl(false),
-      useNewBench: new FormControl(false),
+      useNewBench: new FormControl(true),
       crackerBinaryId: new FormControl(1),
       masks: new FormControl('')
     });
diff --git a/src/app/tasks/import-supertasks/wrbulk/wrbulk.component.html b/src/app/tasks/import-supertasks/wrbulk/wrbulk.component.html
index 026f17bb2..5598ad7e4 100644
--- a/src/app/tasks/import-supertasks/wrbulk/wrbulk.component.html
+++ b/src/app/tasks/import-supertasks/wrbulk/wrbulk.component.html
@@ -1,66 +1,71 @@
-<horizontalnav [menuItems]="menuItems"></horizontalnav>
-<!-- Body -->
-<div fxLayout="row" fxLayoutAlign="start stretch" fxLayout.lt-md="column">
-  <div fxFlex="70" fxFlex.lt-md="100">
-    <grid-main>
-      <app-page-subtitle [subtitle]="'Wordlist/Rule Bulk'"></app-page-subtitle>
-      <form [formGroup]="createForm" (ngSubmit)="onSubmit()">
-        <input-text title="Name" formControlName="name" [isRequired]="true"></input-text>
-        <div fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutGap="10px">
-          <input-number title="maxAgents" formControlName="maxAgents"></input-number>
-        </div>
-        <div fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutGap="10px">
-          <input-select title="Benchmark Type" formControlName="useNewBench"
-            [items]="selectBenchmarktype"></input-select>
-          <input-select title="Binary type to run task" formControlName="crackerBinaryId"
-            [items]="selectCrackertype"></input-select>
-        </div>
-        <div fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutGap="10px">
-          <input-check title="Small Tasks" formControlName="isSmall"></input-check>
-          <input-check title="CPU" formControlName="isCpuTask"></input-check>
-        </div>
-        <input-text-area title="Base Command" formControlName="attackCmd"></input-text-area>
-        <blacklist-attack [value]="createForm.get('attackCmd').value"></blacklist-attack>
-        <fixed-alert
-          message="IMPORTANT: You must include the 'FILE' placeholder in your Base Command. When you mark files as 'Iterate' in the panels on the right, the system will create a separate subtask for EACH selected file, replacing 'FILE' with the actual file path. This allows for sequential execution of different wordlists or rule files in your attack strategy."></fixed-alert>
-        <grid-buttons>
-          <button-submit name="Cancel" [disabled]="false" type="cancel"></button-submit>
-          <button-submit [name]="'Create'"></button-submit>
-          <div *ngIf="isLoading">
-            <mat-spinner diameter="24" color="accent"></mat-spinner>
+<app-table>
+  <app-page-title
+    [title]="'Supertask Builder'"
+  ></app-page-title>
+  <horizontalnav [menuItems]="menuItems"></horizontalnav>
+  <!-- Body -->
+  <div fxLayout="row" fxLayoutAlign="start stretch" fxLayout.lt-md="column">
+    <div fxFlex="70" fxFlex.lt-md="100">
+      <grid-main>
+        <app-page-subtitle [subtitle]="'Wordlist/Rule Bulk'"></app-page-subtitle>
+        <form [formGroup]="createForm" (ngSubmit)="onSubmit()">
+          <input-text title="Name" formControlName="name" [isRequired]="true"></input-text>
+          <div fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutGap="10px">
+            <input-number title="maxAgents" formControlName="maxAgents"></input-number>
           </div>
-        </grid-buttons>
-      </form>
-    </grid-main>
-  </div>
-  <div fxFlex="40" fxFlex.lt-md="100">
-    <mat-accordion multi>
-      <mat-expansion-panel>
-        <mat-expansion-panel-header>
-          <span><b>Wordlists</b></span>
-        </mat-expansion-panel-header>
-        <app-files-attack-table [fileType]="0" [bulkWordlistRule]="true" [formData]="getFormData()"
-          (updateFormEvent)="onUpdateForm($event)" [cmdPrepro]="true"
-          [customLabel]="customLabel"></app-files-attack-table>
-      </mat-expansion-panel>
+          <div fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutGap="10px">
+            <input-select title="Benchmark Type" formControlName="useNewBench"
+                          [items]="selectBenchmarktype"></input-select>
+            <input-select title="Binary type to run task" formControlName="crackerBinaryId"
+                          [items]="selectCrackertype"></input-select>
+          </div>
+          <div fxLayout="row wrap" fxLayoutAlign="start center" fxLayoutGap="10px">
+            <input-check title="Small Tasks" formControlName="isSmall"></input-check>
+            <input-check title="CPU" formControlName="isCpuTask"></input-check>
+          </div>
+          <input-text-area title="Base Command" formControlName="attackCmd"></input-text-area>
+          <blacklist-attack [value]="createForm.get('attackCmd').value"></blacklist-attack>
+          <fixed-alert
+            message="IMPORTANT: You must include the 'FILE' placeholder in your Base Command. When you mark files as 'Iterate' in the panels on the right, the system will create a separate subtask for EACH selected file, replacing 'FILE' with the actual file path. This allows for sequential execution of different wordlists or rule files in your attack strategy."></fixed-alert>
+          <grid-buttons>
+            <button-submit name="Cancel" [disabled]="false" type="cancel"></button-submit>
+            <button-submit [name]="'Create'"></button-submit>
+            <div *ngIf="isLoading">
+              <mat-spinner diameter="24" color="accent"></mat-spinner>
+            </div>
+          </grid-buttons>
+        </form>
+      </grid-main>
+    </div>
+    <div fxFlex="40" fxFlex.lt-md="100">
+      <mat-accordion multi>
+        <mat-expansion-panel>
+          <mat-expansion-panel-header>
+            <span><b>Wordlists</b></span>
+          </mat-expansion-panel-header>
+          <app-files-attack-table [fileType]="0" [bulkWordlistRule]="true" [formData]="getFormData()"
+                                  (updateFormEvent)="onUpdateForm($event)" [cmdPrepro]="true"
+                                  [customLabel]="customLabel"></app-files-attack-table>
+        </mat-expansion-panel>
 
-      <mat-expansion-panel>
-        <mat-expansion-panel-header>
-          <span><b>Rules</b></span>
-        </mat-expansion-panel-header>
-        <app-files-attack-table [fileType]="1" [bulkWordlistRule]="true" [formData]="getFormData()"
-          (updateFormEvent)="onUpdateForm($event)" [cmdPrepro]="true"
-          [customLabel]="customLabel"></app-files-attack-table>
-      </mat-expansion-panel>
+        <mat-expansion-panel>
+          <mat-expansion-panel-header>
+            <span><b>Rules</b></span>
+          </mat-expansion-panel-header>
+          <app-files-attack-table [fileType]="1" [bulkWordlistRule]="true" [formData]="getFormData()"
+                                  (updateFormEvent)="onUpdateForm($event)" [cmdPrepro]="true"
+                                  [customLabel]="customLabel"></app-files-attack-table>
+        </mat-expansion-panel>
 
-      <mat-expansion-panel>
-        <mat-expansion-panel-header>
-          <span><b>Other</b></span>
-        </mat-expansion-panel-header>
-        <app-files-attack-table [fileType]="2" [bulkWordlistRule]="true" [formData]="getFormData()"
-          (updateFormEvent)="onUpdateForm($event)" [cmdPrepro]="true"
-          [customLabel]="customLabel"></app-files-attack-table>
-      </mat-expansion-panel>
-    </mat-accordion>
+        <mat-expansion-panel>
+          <mat-expansion-panel-header>
+            <span><b>Other</b></span>
+          </mat-expansion-panel-header>
+          <app-files-attack-table [fileType]="2" [bulkWordlistRule]="true" [formData]="getFormData()"
+                                  (updateFormEvent)="onUpdateForm($event)" [cmdPrepro]="true"
+                                  [customLabel]="customLabel"></app-files-attack-table>
+        </mat-expansion-panel>
+      </mat-accordion>
+    </div>
   </div>
-</div>
\ No newline at end of file
+</app-table>
diff --git a/src/app/tasks/import-supertasks/wrbulk/wrbulk.component.ts b/src/app/tasks/import-supertasks/wrbulk/wrbulk.component.ts
index 2680a0ee5..f358fda01 100644
--- a/src/app/tasks/import-supertasks/wrbulk/wrbulk.component.ts
+++ b/src/app/tasks/import-supertasks/wrbulk/wrbulk.component.ts
@@ -20,7 +20,6 @@ import { UnsubscribeService } from '@services/unsubscribe.service';
 
 import { CRACKER_TYPE_FIELD_MAPPING } from '@src/app/core/_constants/select.config';
 import { benchmarkType } from '@src/app/core/_constants/tasks.config';
-import { PageTitle } from '@src/app/core/_decorators/autotitle';
 import { transformSelectOptions } from '@src/app/shared/utils/forms';
 
 @Component({
@@ -28,7 +27,6 @@ import { transformSelectOptions } from '@src/app/shared/utils/forms';
   templateUrl: './wrbulk.component.html',
   standalone: false
 })
-@PageTitle(['Import SuperTask - Wordlist/Rules Bulk'])
 export class WrbulkComponent implements OnInit, OnDestroy {
   /**
    * Horizontal menu and redirection links.
@@ -46,7 +44,7 @@ export class WrbulkComponent implements OnInit, OnDestroy {
 
   /** Select Options. */
   selectBenchmarktype = benchmarkType;
-  selectCrackertype: any;
+  selectCrackertype = undefined;
 
   /** Select Options Mapping */
   selectCrackertypeMap = {
@@ -95,7 +93,7 @@ export class WrbulkComponent implements OnInit, OnDestroy {
       maxAgents: new FormControl(0),
       isSmall: new FormControl(false),
       isCpuTask: new FormControl(false),
-      useNewBench: new FormControl(false),
+      useNewBench: new FormControl(true),
       crackerBinaryId: new FormControl(1),
       attackCmd: new FormControl(this.uiService.getUIsettings('hashlistAlias').value, [Validators.required]),
       baseFiles: new FormControl([]),
@@ -192,8 +190,7 @@ export class WrbulkComponent implements OnInit, OnDestroy {
     if (this.createForm.valid) {
       const formValue = this.createForm.value;
       const attackCmd: string = formValue.attackCmd;
-      const crackerBinaryId: any = formValue.crackerBinaryId;
-      const baseFiles: [] = formValue.baseFiles;
+      const crackerBinaryId: number = formValue.crackerBinaryId;
       const iterFiles: [] = formValue.iterFiles;
 
       const attackAlias = this.uiService.getUIsettings('hashlistAlias').value;
@@ -221,13 +218,6 @@ export class WrbulkComponent implements OnInit, OnDestroy {
           hasError = true; // Set error flag
         }
 
-        // Check if at least one base file is selected
-        if (!baseFiles || baseFiles.length === 0) {
-          const warning = 'You need to select at least one base file!';
-          this.alert.showErrorMessage(warning);
-          hasError = true; // Set error flag
-        }
-
         // Check if at least one iter file is selected
         if (!iterFiles || iterFiles.length === 0) {
           const warning = 'You need to select at least one iteration file!';
@@ -286,7 +276,7 @@ export class WrbulkComponent implements OnInit, OnDestroy {
    * Updates the form based on the provided event data.
    * @param event - The event data containing attack command and files.
    */
-  onUpdateForm(event: any): void {
+  onUpdateForm(event): void {
     if (event.type === 'CMD') {
       this.createForm.patchValue({
         attackCmd: event.attackCmd,