diff --git a/angular.json b/angular.json
index 8393565..b291503 100644
--- a/angular.json
+++ b/angular.json
@@ -81,7 +81,9 @@
           "options": {
             "allowedHosts": [
               "localhost",
-              "sp.alphaomegainfosys.com"
+              "sp.alphaomegainfosys.com",
+              "sp-1.alphaomegainfosys.com",
+              "sp-2.alphaomegainfosys.com"
             ]
           },
           "configurations": {
diff --git a/src/app/common/footer/footer.component.html b/src/app/common/footer/footer.component.html
index 18c48a7..4cedebc 100644
--- a/src/app/common/footer/footer.component.html
+++ b/src/app/common/footer/footer.component.html
@@ -7,7 +7,7 @@
         </div>
 
         <div class="copyright">
-            &copy; {{ currentYear }} alpha Omega Infosys. All rights reserved.
+            &copy; {{ currentYear }} Alpha Omega Infosys. All rights reserved.
         </div>
     </div>
 </footer>
\ No newline at end of file
diff --git a/src/app/core/services/service-provider/basic-fee.service.ts b/src/app/core/services/service-provider/basic-fee.service.ts
index c13207f..01c5ac2 100644
--- a/src/app/core/services/service-provider/basic-fee.service.ts
+++ b/src/app/core/services/service-provider/basic-fee.service.ts
@@ -38,8 +38,8 @@ export class BasicFeeService {
   createBasicFee(spid: number, fee: BasicFee): Observable<any> {
     const payload = {
       P_SPID: spid,
-      P_STARTCARNETVALUE: fee.startCarnetValue,
-      P_ENDCARNETVALUE: fee.endCarnetValue,
+      P_STARTNUMBER: fee.startCarnetValue,
+      P_ENDNUMBER: fee.endCarnetValue,
       P_FEES: fee.fees,
       P_EFFDATE: this.commonService.formatUSDate(fee.effectiveDate),
       P_USERID: this.userService.getUser()
@@ -50,8 +50,6 @@ export class BasicFeeService {
   updateBasicFee(feeId: number, fee: BasicFee): Observable<any> {
     const payload = {
       P_BASICFEESETUPID: feeId,
-      P_STARTCARNETVALUE: fee.startCarnetValue,
-      P_ENDCARNETVALUE: fee.endCarnetValue,
       P_FEES: fee.fees,
       P_EFFDATE: this.commonService.formatUSDate(fee.effectiveDate),
       P_USERID: this.userService.getUser()
diff --git a/src/app/core/services/service-provider/contact.service.ts b/src/app/core/services/service-provider/contact.service.ts
index a410bd0..2dc1331 100644
--- a/src/app/core/services/service-provider/contact.service.ts
+++ b/src/app/core/services/service-provider/contact.service.ts
@@ -51,7 +51,7 @@ export class ContactService {
       p_defcontactflag: data.defaultContact ? 'Y' : 'N',
       p_firstname: data.firstName,
       p_lastname: data.lastName,
-      P_MIDDLEINITIAL: data.middleInitial,
+      P_MIDDLEINITIAL: data.middleInitial ?? '',
       p_title: data.title,
       p_phoneno: data.phone,
       p_mobileno: data.mobile,
@@ -69,7 +69,7 @@ export class ContactService {
       p_spcontactid: spContactId,
       p_firstname: data.firstName,
       p_lastname: data.lastName,
-      P_MIDDLEINITIAL: data.middleInitial,
+      P_MIDDLEINITIAL: data.middleInitial ?? '',
       p_title: data.title,
       p_phoneno: data.phone,
       p_mobileno: data.mobile,
diff --git a/src/app/param/table/param-table.component.html b/src/app/param/table/param-table.component.html
index 573fb45..8ffec6a 100644
--- a/src/app/param/table/param-table.component.html
+++ b/src/app/param/table/param-table.component.html
@@ -27,49 +27,49 @@
         <table mat-table [dataSource]="dataSource" matSort>
 
             <!-- PARAMTYPE Column -->
-            <ng-container matColumnDef="ParamType">
+            <ng-container matColumnDef="paramType">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>Type</th>
                 <td mat-cell *matCellDef="let client">{{ client.paramType }}</td>
             </ng-container>
 
             <!-- PARAMDESC Column -->
-            <ng-container matColumnDef="ParamDesc">
+            <ng-container matColumnDef="paramDesc">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>Description</th>
                 <td mat-cell *matCellDef="let client">{{ client.paramDesc || '--'}}</td>
             </ng-container>
 
             <!-- PARAMVALUE Column -->
-            <ng-container matColumnDef="paramvalue">
+            <ng-container matColumnDef="paramValue">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>Value</th>
                 <td mat-cell *matCellDef="let client">{{ client.paramValue }}</td>
             </ng-container>
 
             <!-- ADDLPARAMVALUE1 Column -->
-            <ng-container matColumnDef="addlparamvalue1">
+            <ng-container matColumnDef="addlParamValue1">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>Additional Value 1</th>
                 <td mat-cell *matCellDef="let client">{{ client.addlParamValue1 || '--' }}</td>
             </ng-container>
 
             <!-- ADDLPARAMVALUE2 Column -->
-            <ng-container matColumnDef="addlparamvalue2">
+            <ng-container matColumnDef="addlParamValue2">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>Additional Value 2</th>
                 <td mat-cell *matCellDef="let client">{{ client.addlParamValue2 || '--'}}</td>
             </ng-container>
 
             <!-- ADDLPARAMVALUE3 Column -->
-            <ng-container matColumnDef="addlparamvalue3">
+            <ng-container matColumnDef="addlParamValue3">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>Additional Value 3</th>
                 <td mat-cell *matCellDef="let client">{{ client.addlParamValue3 || '--' }}</td>
             </ng-container>
 
             <!-- ADDLPARAMVALUE4 Column -->
-            <ng-container matColumnDef="addlparamvalue4">
+            <ng-container matColumnDef="addlParamValue4">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>Additional Value 4</th>
                 <td mat-cell *matCellDef="let client">{{ client.addlParamValue4 || '--' }}</td>
             </ng-container>
 
             <!-- ADDLPARAMVALUE5 Column -->
-            <ng-container matColumnDef="addlparamvalue5">
+            <ng-container matColumnDef="addlParamValue5">
                 <th mat-header-cell *matHeaderCellDef mat-sort-header>Additional Value 5</th>
                 <td mat-cell *matCellDef="let client">{{ client.addlParamValue5 || '--'}}</td>
             </ng-container>
diff --git a/src/app/param/table/param-table.component.ts b/src/app/param/table/param-table.component.ts
index 7f31f25..5771dc0 100644
--- a/src/app/param/table/param-table.component.ts
+++ b/src/app/param/table/param-table.component.ts
@@ -25,8 +25,8 @@ import { finalize } from 'rxjs';
   styleUrl: './param-table.component.scss'
 })
 export class ParamTableComponent {
-  @ViewChild(MatPaginator) paginator!: MatPaginator;
-  @ViewChild(MatSort) sort!: MatSort;
+  //@ViewChild(MatPaginator) paginator!: MatPaginator;
+  //@ViewChild(MatSort) sort!: MatSort;
 
   @Input() table_mode: TABLE_MODE = 'TABLE-RECORD';
   @Input() paramHeading: string = 'Table Records';
@@ -54,6 +54,17 @@ export class ParamTableComponent {
   private notificationService = inject(NotificationService);
 
   dataSource = new MatTableDataSource<any>([]);
+  
+  @ViewChild(MatPaginator, { static: false })
+  set paginator(value: MatPaginator) {
+    this.dataSource.paginator = value;
+  }
+
+  @ViewChild(MatSort, { static: false })
+  set sort(value: MatSort) {
+    this.dataSource.sort = value;
+  }
+
   paramForm: FormGroup;
 
   ngAfterViewInit() {
@@ -62,8 +73,8 @@ export class ParamTableComponent {
     this.dataSource.data = this.paramData;
   }
 
-  displayedColumns: string[] = ['ParamType', 'ParamDesc', 'paramvalue', 'addlparamvalue1', 'addlparamvalue2', 'addlparamvalue3',
-    'addlparamvalue4', 'addlparamvalue5', 'actions'];
+  displayedColumns: string[] = ['paramType', 'paramDesc', 'paramValue', 'addlParamValue1', 'addlParamValue2', 'addlParamValue3',
+    'addlParamValue4', 'addlParamValue5', 'actions'];
 
   formControls: any = {};
 
diff --git a/src/app/service-provider/add/add-service-provider.component.html b/src/app/service-provider/add/add-service-provider.component.html
index 6e5d229..726a4b5 100644
--- a/src/app/service-provider/add/add-service-provider.component.html
+++ b/src/app/service-provider/add/add-service-provider.component.html
@@ -1,5 +1,5 @@
 <div class="service-provider-container">
-    <mat-stepper orientation="vertical" [linear]="true" (selectionChange)="onStepChange($event)"
+    <mat-stepper orientation="vertical" [linear]="isLinear" (selectionChange)="onStepChange($event)"
         [selectedIndex]="currentStep">
 
         <!-- Basic Details Step -->
@@ -20,7 +20,7 @@
         </mat-step>
 
         <!-- Carnet Sequence Step -->
-        <mat-step [editable]="!!serviceProviderId && contactsCompleted" [completed]="carnetSequenceCompleted">
+        <mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="carnetSequenceCompleted">
             <ng-template matStepLabel>Carnet Sequence</ng-template>
 
             <app-carnet-sequence *ngIf="serviceProviderId" [spid]="serviceProviderId"
@@ -29,7 +29,7 @@
         </mat-step>
 
         <!-- Fees & Commission Step -->
-        <mat-step [editable]="!!serviceProviderId && carnetSequenceCompleted"
+        <mat-step [editable]="!!serviceProviderId && basicDetailsCompleted"
             [completed]="feeCommissionCompleted && carnetSequenceCompleted">
             <ng-template matStepLabel>Carnet Fee & Commission Setup</ng-template>
 
@@ -38,7 +38,7 @@
         </mat-step>
 
         <!-- Basic Fee Step -->
-        <mat-step [editable]="!!serviceProviderId && feeCommissionCompleted"
+        <mat-step [editable]="!!serviceProviderId && basicDetailsCompleted"
             [completed]="basicFeeCompleted && feeCommissionCompleted">
             <ng-template matStepLabel>Basic Fee Setup</ng-template>
 
@@ -47,7 +47,7 @@
         </mat-step>
 
         <!-- Counterfoil Fee Step -->
-        <mat-step [editable]="!!serviceProviderId && basicFeeCompleted" [completed]="counterfoilFeeCompleted">
+        <mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="counterfoilFeeCompleted">
             <ng-template matStepLabel>Counterfoil Setup</ng-template>
 
             <app-counterfoil-fee *ngIf="serviceProviderId" [spid]="serviceProviderId"
@@ -56,7 +56,7 @@
         </mat-step>
 
         <!-- Continuation Sheet Fee Step -->
-        <mat-step [editable]="!!serviceProviderId && counterfoilFeeCompleted"
+        <mat-step [editable]="!!serviceProviderId && basicDetailsCompleted"
             [completed]="continuationSheetFeeCompleted">
             <ng-template matStepLabel>Continuation Sheet Fee Setup</ng-template>
 
@@ -66,7 +66,7 @@
         </mat-step>
 
         <!-- Expedited Fee Step -->
-        <mat-step [editable]="!!serviceProviderId && continuationSheetFeeCompleted" [completed]="expeditedFeeCompleted">
+        <mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="expeditedFeeCompleted">
             <ng-template matStepLabel>Expedited Fee Setup</ng-template>
 
             <app-expedited-fee *ngIf="serviceProviderId" [spid]="serviceProviderId"
@@ -75,7 +75,7 @@
         </mat-step>
 
         <!-- Security Deposit Step -->
-        <mat-step [editable]="!!serviceProviderId && expeditedFeeCompleted" [completed]="securityDepositCompleted">
+        <mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="securityDepositCompleted">
             <ng-template matStepLabel>Security Deposit</ng-template>
 
             <app-security-deposit *ngIf="serviceProviderId" [spid]="serviceProviderId"
@@ -84,7 +84,7 @@
         </mat-step>
 
         <!-- Cargo Rate Step -->
-        <mat-step [editable]="!!serviceProviderId && securityDepositCompleted" [completed]="cargoRateCompleted">
+        <mat-step [editable]="!!serviceProviderId && basicDetailsCompleted" [completed]="cargoRateCompleted">
             <ng-template matStepLabel>Cargo Rate Setup</ng-template>
 
             <app-cargo-rate *ngIf="serviceProviderId" [spid]="serviceProviderId"
diff --git a/src/app/service-provider/add/add-service-provider.component.ts b/src/app/service-provider/add/add-service-provider.component.ts
index e366662..b401034 100644
--- a/src/app/service-provider/add/add-service-provider.component.ts
+++ b/src/app/service-provider/add/add-service-provider.component.ts
@@ -24,6 +24,7 @@ import { CargoRateComponent } from '../cargo-rate/cargo-rate.component';
 })
 export class AddServiceProviderComponent {
   isEditMode = false;
+  isLinear = true;
   serviceProviderId: number | null = null;
   currentStep: number = 0;
   isLoading: boolean = false;
@@ -47,6 +48,7 @@ export class AddServiceProviderComponent {
   onBasicDetailsSaved(event: string): void {
     this.serviceProviderId = +event;
     this.basicDetailsCompleted = true;
+    this.isLinear = false; // Disable linear mode after basic detail is created
   }
 
   onContactsSaved(event: boolean): void {
diff --git a/src/app/service-provider/basic-details/basic-details.component.html b/src/app/service-provider/basic-details/basic-details.component.html
index 2dd09f0..658c4f4 100644
--- a/src/app/service-provider/basic-details/basic-details.component.html
+++ b/src/app/service-provider/basic-details/basic-details.component.html
@@ -139,38 +139,29 @@
                 <div class="form-row">
                     <mat-form-field appearance="outline" class="cargo-surety">
                         <mat-label>Cargo Surety</mat-label>
-                        <mat-select formControlName="cargoSurety" required>
+                        <mat-select formControlName="cargoSurety">
                             <mat-option *ngFor="let cargoSurety of cargoSuretys" [value]="cargoSurety.value">
                                 {{ cargoSurety.name }}
                             </mat-option>
                         </mat-select>
-                        <mat-error *ngIf="f['cargoSurety'].errors?.['required']">
-                            Cargo Surety is required
-                        </mat-error>
                     </mat-form-field>
 
                     <mat-form-field appearance="outline" class="cargo-policy">
                         <mat-label>Cargo Policy</mat-label>
-                        <mat-select formControlName="cargoPolicyNo" required>
+                        <mat-select formControlName="cargoPolicyNo">
                             <mat-option *ngFor="let cargoPolicy of cargoPolicies" [value]="cargoPolicy.value">
                                 {{ cargoPolicy.name }}
                             </mat-option>
                         </mat-select>
-                        <mat-error *ngIf="f['cargoPolicyNo'].errors?.['required']">
-                            Cargo Policy is required
-                        </mat-error>
                     </mat-form-field>
 
                     <mat-form-field appearance="outline" class="bond-surety">
                         <mat-label>Bond Surety</mat-label>
-                        <mat-select formControlName="bondSurety" required>
+                        <mat-select formControlName="bondSurety">
                             <mat-option *ngFor="let bondSurety of bondSuretys" [value]="bondSurety.value">
                                 {{ bondSurety.name }}
                             </mat-option>
                         </mat-select>
-                        <mat-error *ngIf="f['bondSurety'].errors?.['required']">
-                            Bond Surety is required
-                        </mat-error>
                     </mat-form-field>
 
                 </div>
diff --git a/src/app/service-provider/basic-details/basic-details.component.ts b/src/app/service-provider/basic-details/basic-details.component.ts
index 84e87ee..722f41c 100644
--- a/src/app/service-provider/basic-details/basic-details.component.ts
+++ b/src/app/service-provider/basic-details/basic-details.component.ts
@@ -96,9 +96,9 @@ export class BasicDetailsComponent implements OnInit, OnDestroy {
       zip: ['', [Validators.required, ZipCodeValidator('country')]],
       issuingRegion: ['', Validators.required],
       replacementRegion: ['', Validators.required],
-      cargoSurety: ['', Validators.required],
-      cargoPolicyNo: ['', Validators.required],
-      bondSurety: ['', Validators.required]
+      cargoSurety: [''],
+      cargoPolicyNo: [''],
+      bondSurety: ['']
     });
   }
 
diff --git a/src/app/service-provider/basic-fee/basic-fee.component.ts b/src/app/service-provider/basic-fee/basic-fee.component.ts
index 82e7cfe..91de9f1 100644
--- a/src/app/service-provider/basic-fee/basic-fee.component.ts
+++ b/src/app/service-provider/basic-fee/basic-fee.component.ts
@@ -111,7 +111,7 @@ export class BasicFeeComponent {
       { basicFeeId: 0, startCarnetValue: 50000, endCarnetValue: 149999, fees: 365, effectiveDate: new Date() },
       { basicFeeId: 0, startCarnetValue: 150000, endCarnetValue: 399999, fees: 425, effectiveDate: new Date() },
       { basicFeeId: 0, startCarnetValue: 400000, endCarnetValue: 999999, fees: 480, effectiveDate: new Date() },
-      { basicFeeId: 0, startCarnetValue: 1000000, endCarnetValue: null, fees: 545, effectiveDate: new Date() }
+      { basicFeeId: 0, startCarnetValue: 1000000, endCarnetValue: 99999999, fees: 545, effectiveDate: new Date() }
     ];
 
     // Create an array of observables for each fee creation
@@ -130,8 +130,6 @@ export class BasicFeeComponent {
       },
       error: (error) => {
         console.error('Error initializing default fees:', error);
-        // Even if some failed, try to load what was created
-        this.loadBasicFees();
       }
     });
   }
diff --git a/src/app/service-provider/contacts/contacts.component.ts b/src/app/service-provider/contacts/contacts.component.ts
index 5b1d90b..028fff0 100644
--- a/src/app/service-provider/contacts/contacts.component.ts
+++ b/src/app/service-provider/contacts/contacts.component.ts
@@ -64,7 +64,7 @@ export class ContactsComponent implements OnInit {
       title: ['', [Validators.required, Validators.maxLength(100)]],
       phone: ['', [Validators.required, Validators.pattern(/^[0-9\-\(\)]{10,15}$/)]],
       mobile: ['', [Validators.required, Validators.pattern(/^[0-9\-\(\)]{10,15}$/)]],
-      fax: ['', [Validators.required, Validators.pattern(/^[0-9\-\(\)]{10,15}$/)]],
+      fax: ['', [Validators.pattern(/^[0-9\-\(\)]{10,15}$/)]],
       email: ['', [Validators.required, Validators.email, Validators.maxLength(100)]],
       defaultContact: [false]
     });