diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
index cd0be98..a0af535 100644
--- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
+++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
@@ -111,6 +111,21 @@ addCustomMenu( "Manufacturer","Manufacturer",  "Transcations");
 addCustomMenu( "Deployment_type","Deployment_type",  "Transcations"); 
 
 
+addCustomMenu( "Customer_information","Customer_information",  "Transcations"); 
+
+
+addCustomMenu( "Types","Types",  "Transcations"); 
+
+
+addCustomMenu( "Product","Product",  "Transcations"); 
+
+
+addCustomMenu( "Manufacturer","Manufacturer",  "Transcations"); 
+
+
+addCustomMenu( "Deployment_type","Deployment_type",  "Transcations"); 
+
+
 addCustomMenu( "Customer_information","Customer_information",  "Transcations"); 
 
 
diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java
index 328f4e2..bf372f0 100644
--- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java
+++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java
@@ -80,7 +80,7 @@ private String deployment_typename;
 
   
  
-private Boolean ups_monitoring;
+private Boolean dg_monitoring__with_fule;
    
 
  
@@ -88,11 +88,15 @@ private Boolean active_energy;
    
 
  
-private Boolean dg_monitoring__with_fule;
+private Boolean dg_monitoring_without_fule;
    
 
  
-private Boolean dg_monitoring_without_fule;
+private Boolean ups_monitoring;
+   
+
+ 
+private Boolean water_management_stp_etp;
    
 
  
@@ -108,10 +112,6 @@ private Boolean lt_panel_monitoring;
    
 
  
-private Boolean water_management_stp_etp;
-   
-
- 
 private Boolean ht_panel_monitoring;
    
 
diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java
index 87ba169..a75e508 100644
--- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java
+++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java
@@ -213,10 +213,6 @@ old.setDeployment_type(data.getDeployment_type());
 
   
  
-old.setUps_monitoring(data.getUps_monitoring());
-   
-
- 
 old.setActive_energy(data.getActive_energy());
    
 
@@ -225,11 +221,11 @@ old.setDg_monitoring__with_fule(data.getDg_monitoring__with_fule());
    
 
  
-old.setWater_management_stp_etp(data.getWater_management_stp_etp());
+old.setDg_monitoring_without_fule(data.getDg_monitoring_without_fule());
    
 
  
-old.setDg_monitoring_without_fule(data.getDg_monitoring_without_fule());
+old.setUps_monitoring(data.getUps_monitoring());
    
 
  
@@ -260,6 +256,10 @@ old.setCompressed_air__lpg_n2_o2_co2(data.getCompressed_air__lpg_n2_o2_co2());
 old.setWater_management_water_monitoring(data.getWater_management_water_monitoring());
    
 
+ 
+old.setWater_management_stp_etp(data.getWater_management_stp_etp());
+   
+
 
   
 
diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html
index 284d317..8cb4ee9 100644
--- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html
+++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html
@@ -61,7 +61,7 @@
  
  
  
-<clr-dg-column [clrDgField]="' busbar_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> busbar monitoring
+<clr-dg-column [clrDgField]="' ups_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> ups monitoring
 						    </ng-container></clr-dg-column>
    
 
@@ -81,12 +81,12 @@
    
 
  
-<clr-dg-column [clrDgField]="' ups_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> ups monitoring
+<clr-dg-column [clrDgField]="' apfc_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> apfc panel monitoring
 						    </ng-container></clr-dg-column>
    
 
  
-<clr-dg-column [clrDgField]="' apfc_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> apfc panel monitoring
+<clr-dg-column [clrDgField]="' busbar_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> busbar monitoring
 						    </ng-container></clr-dg-column>
    
 
@@ -101,11 +101,6 @@
    
 
  
-<clr-dg-column [clrDgField]="' water_management_stp_etp'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water management stp/etp
-						    </ng-container></clr-dg-column>
-   
-
- 
 <clr-dg-column [clrDgField]="' compressed_air_gag_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> compressed air gag monitoring
 						    </ng-container></clr-dg-column>
    
@@ -116,6 +111,11 @@
    
 
  
+<clr-dg-column [clrDgField]="' water_management_stp_etp'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water management stp/etp
+						    </ng-container></clr-dg-column>
+   
+
+ 
 <clr-dg-column [clrDgField]="' water_management_water_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water management water monitoring
 						    </ng-container></clr-dg-column>
    
@@ -177,7 +177,7 @@
 
 
  
-<clr-dg-cell>{{user.ups_monitoring}}</clr-dg-cell>
+<clr-dg-cell>{{user.ht_panel_monitoring}}</clr-dg-cell>
    
 
  
@@ -193,6 +193,10 @@
    
 
  
+<clr-dg-cell>{{user.ups_monitoring}}</clr-dg-cell>
+   
+
+ 
 <clr-dg-cell>{{user.apfc_panel_monitoring}}</clr-dg-cell>
    
 
@@ -205,10 +209,6 @@
    
 
  
-<clr-dg-cell>{{user.ht_panel_monitoring}}</clr-dg-cell>
-   
-
- 
 <clr-dg-cell>{{user.compressed_air_gag_monitoring}}</clr-dg-cell>
    
 
@@ -557,8 +557,8 @@
       
  
 
-      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="ht_panel_monitoring" name="ht_panel_monitoring" [(ngModel)]="rowSelected.ht_panel_monitoring" class="clr-checkbox" /> 
-<label for="ht_panel_monitoring" class="clr-control-label"> ht panel monitoring</label> </div>
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring_without_fule" name="dg_monitoring_without_fule" [(ngModel)]="rowSelected.dg_monitoring_without_fule" class="clr-checkbox" /> 
+<label for="dg_monitoring_without_fule" class="clr-control-label"> dg monitoring without fule</label> </div>
 
        
 
@@ -578,13 +578,6 @@
 
  
 
-      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring_without_fule" name="dg_monitoring_without_fule" [(ngModel)]="rowSelected.dg_monitoring_without_fule" class="clr-checkbox" /> 
-<label for="dg_monitoring_without_fule" class="clr-control-label"> dg monitoring without fule</label> </div>
-
-       
-
- 
-
       <div class="clr-checkbox-wrapper"> <input type="checkbox" id="ups_monitoring" name="ups_monitoring" [(ngModel)]="rowSelected.ups_monitoring" class="clr-checkbox" /> 
 <label for="ups_monitoring" class="clr-control-label"> ups monitoring</label> </div>
 
@@ -613,15 +606,22 @@
 
  
 
-      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="compressed_air_gag_monitoring" name="compressed_air_gag_monitoring" [(ngModel)]="rowSelected.compressed_air_gag_monitoring" class="clr-checkbox" /> 
-<label for="compressed_air_gag_monitoring" class="clr-control-label"> compressed air gag monitoring</label> </div>
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="water_management_stp_etp" name="water_management_stp_etp" [(ngModel)]="rowSelected.water_management_stp_etp" class="clr-checkbox" /> 
+<label for="water_management_stp_etp" class="clr-control-label"> water management stp/etp</label> </div>
 
        
 
  
 
-      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="water_management_stp_etp" name="water_management_stp_etp" [(ngModel)]="rowSelected.water_management_stp_etp" class="clr-checkbox" /> 
-<label for="water_management_stp_etp" class="clr-control-label"> water management stp/etp</label> </div>
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="ht_panel_monitoring" name="ht_panel_monitoring" [(ngModel)]="rowSelected.ht_panel_monitoring" class="clr-checkbox" /> 
+<label for="ht_panel_monitoring" class="clr-control-label"> ht panel monitoring</label> </div>
+
+       
+
+ 
+
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="compressed_air_gag_monitoring" name="compressed_air_gag_monitoring" [(ngModel)]="rowSelected.compressed_air_gag_monitoring" class="clr-checkbox" /> 
+<label for="compressed_air_gag_monitoring" class="clr-control-label"> compressed air gag monitoring</label> </div>
 
        
 
@@ -877,8 +877,8 @@
                        
  
 			<div class="clr-checkbox-wrapper">           
-				<input type="checkbox" id="busbar_monitoring" formControlName="busbar_monitoring"  class="clr-checkbox" />       
-				    <label for="busbar_monitoring" class="clr-control-label">busbar monitoring</label>  </div>
+				<input type="checkbox" id="dg_monitoring__with_fule" formControlName="dg_monitoring__with_fule"  class="clr-checkbox" />       
+				    <label for="dg_monitoring__with_fule" class="clr-control-label">dg monitoring  with fule</label>  </div>
 	                            
 
  
@@ -888,12 +888,6 @@
 	                            
 
  
-			<div class="clr-checkbox-wrapper">           
-				<input type="checkbox" id="dg_monitoring__with_fule" formControlName="dg_monitoring__with_fule"  class="clr-checkbox" />       
-				    <label for="dg_monitoring__with_fule" class="clr-control-label">dg monitoring  with fule</label>  </div>
-	                            
-
- 
 			<div class="clr-checkbox-wrapper">           
 				<input type="checkbox" id="dg_monitoring_without_fule" formControlName="dg_monitoring_without_fule"  class="clr-checkbox" />       
 				    <label for="dg_monitoring_without_fule" class="clr-control-label">dg monitoring without fule</label>  </div>
@@ -912,6 +906,12 @@
 	                            
 
  
+			<div class="clr-checkbox-wrapper">           
+				<input type="checkbox" id="busbar_monitoring" formControlName="busbar_monitoring"  class="clr-checkbox" />       
+				    <label for="busbar_monitoring" class="clr-control-label">busbar monitoring</label>  </div>
+	                            
+
+ 
 			<div class="clr-checkbox-wrapper">           
 				<input type="checkbox" id="lt_panel_monitoring" formControlName="lt_panel_monitoring"  class="clr-checkbox" />       
 				    <label for="lt_panel_monitoring" class="clr-control-label">lt panel monitoring</label>  </div>
diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts
index d99d33f..a21f5c7 100644
--- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts
+++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts
@@ -86,7 +86,7 @@ deployment_type : [null],
 
   
  
-dg_monitoring_without_fule:[false],
+dg_monitoring__with_fule:[false],
    
 
  
@@ -94,7 +94,7 @@ active_energy:[false],
    
 
  
-dg_monitoring__with_fule:[false],
+dg_monitoring_without_fule:[false],
    
 
  
@@ -102,11 +102,11 @@ ups_monitoring:[false],
    
 
  
-water_management_stp_etp:[false],
+apfc_panel_monitoring:[false],
    
 
  
-apfc_panel_monitoring:[false],
+water_management_stp_etp:[false],
    
 
  
diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
index f07014c..e78fb7c 100644
--- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
+++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
@@ -8,6 +8,11 @@
 
 
 
+
+
+
+
+
 import { TypesComponent } from './BuilderComponents/basicp1/Types/Types.component';
 import { ProductComponent } from './BuilderComponents/basicp1/Product/Product.component';
 import { ManufacturerComponent } from './BuilderComponents/basicp1/Manufacturer/Manufacturer.component';
@@ -281,6 +286,16 @@ const routes: Routes = [
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
index 57f4e83..06fd098 100644
--- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
+++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
@@ -8,6 +8,11 @@
 
 
 
+
+
+
+
+
 import { TypesComponent } from './BuilderComponents/basicp1/Types/Types.component';
 import { ProductComponent } from './BuilderComponents/basicp1/Product/Product.component';
 import { ManufacturerComponent } from './BuilderComponents/basicp1/Manufacturer/Manufacturer.component';
@@ -154,6 +159,16 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
 
 
 
+
+
+
+
+
+
+
+
+
+