diff --git a/admin/src/main/scala/com/neu/api/group/GroupApi.scala b/admin/src/main/scala/com/neu/api/group/GroupApi.scala
index 79ecc9a4d..a5ee6c47a 100644
--- a/admin/src/main/scala/com/neu/api/group/GroupApi.scala
+++ b/admin/src/main/scala/com/neu/api/group/GroupApi.scala
@@ -212,9 +212,9 @@ class GroupApi(resourceService: GroupService) extends BaseApi {
                 }
               } ~
               get {
-                parameter(Symbol("name").?) { name =>
+                parameter(Symbol("name").?, Symbol("scope").?) { (name, scope) =>
                   Utils.respondWithWebServerHeaders() {
-                    resourceService.getDlpSensor(tokenId, name)
+                    resourceService.getDlpSensor(tokenId, name, scope)
                   }
                 }
               } ~
@@ -285,9 +285,9 @@ class GroupApi(resourceService: GroupService) extends BaseApi {
                 }
               } ~
               get {
-                parameter(Symbol("name").?) { name =>
+                parameter(Symbol("name").?, Symbol("scope").?) { (name, scope) =>
                   Utils.respondWithWebServerHeaders() {
-                    resourceService.getWafSensor(tokenId, name)
+                    resourceService.getWafSensor(tokenId, name, scope)
                   }
                 }
               } ~
diff --git a/admin/src/main/scala/com/neu/model/DlpJsonProtocol.scala b/admin/src/main/scala/com/neu/model/DlpJsonProtocol.scala
index b1eb9ba3e..d4df70cb6 100644
--- a/admin/src/main/scala/com/neu/model/DlpJsonProtocol.scala
+++ b/admin/src/main/scala/com/neu/model/DlpJsonProtocol.scala
@@ -21,7 +21,7 @@ object DlpJsonProtocol extends DefaultJsonProtocol {
   given dlpSensorFmt: RootJsonFormat[DlpSensor]                         = jsonFormat4(DlpSensor.apply)
   given dlpSensorDataFmt: RootJsonFormat[DlpSensorData]                 = jsonFormat1(DlpSensorData.apply)
   given dlpSensorsDataFmt: RootJsonFormat[DlpSensorsData]               = jsonFormat1(DlpSensorsData.apply)
-  given dlpSensorConfigFmt: RootJsonFormat[DlpSensorConfig]             = jsonFormat7(DlpSensorConfig.apply)
+  given dlpSensorConfigFmt: RootJsonFormat[DlpSensorConfig]             = jsonFormat8(DlpSensorConfig.apply)
   given dlpSensorConfigDataFmt: RootJsonFormat[DlpSensorConfigData]     = jsonFormat1(
     DlpSensorConfigData.apply
   )
diff --git a/admin/src/main/scala/com/neu/model/DlpRule.scala b/admin/src/main/scala/com/neu/model/DlpRule.scala
index 3d60c4f59..fb3c6482a 100644
--- a/admin/src/main/scala/com/neu/model/DlpRule.scala
+++ b/admin/src/main/scala/com/neu/model/DlpRule.scala
@@ -47,6 +47,7 @@ case class DlpSensorsData(sensors: Seq[DlpSensor])
 case class DlpSensorConfig(
   name: String,
   comment: Option[String],
+  cfg_type: Option[String],
   change: Option[Seq[DlpRule]],
   delete: Option[Seq[DlpRule]],
   rules: Option[Seq[DlpRule]],
diff --git a/admin/src/main/scala/com/neu/model/Group.scala b/admin/src/main/scala/com/neu/model/Group.scala
index eeed260c0..4f9a5f195 100644
--- a/admin/src/main/scala/com/neu/model/Group.scala
+++ b/admin/src/main/scala/com/neu/model/Group.scala
@@ -142,6 +142,7 @@ case class Groups4Export(
   groups: Array[String],
   policy_mode: Option[String],
   profile_mode: Option[String],
+  use_name_referral: Boolean,
   remote_export_options: Option[RemoteExportOptions] = None
 )
 
diff --git a/admin/src/main/scala/com/neu/model/GroupJsonProtocol.scala b/admin/src/main/scala/com/neu/model/GroupJsonProtocol.scala
index c56935231..76fb61e56 100644
--- a/admin/src/main/scala/com/neu/model/GroupJsonProtocol.scala
+++ b/admin/src/main/scala/com/neu/model/GroupJsonProtocol.scala
@@ -45,7 +45,7 @@ object GroupJsonProtocol extends DefaultJsonProtocol {
   given remoteExportOptionsFormat: RootJsonFormat[RemoteExportOptions]         = jsonFormat3(
     RemoteExportOptions.apply
   )
-  given groups4ExportFormat: RootJsonFormat[Groups4Export]                     = jsonFormat4(Groups4Export.apply)
+  given groups4ExportFormat: RootJsonFormat[Groups4Export]                     = jsonFormat5(Groups4Export.apply)
 
   given criteriaItemFormat: RootJsonFormat[CriteriaItem]               = jsonFormat1(CriteriaItem.apply)
   given groupConfigDTOFormat: RootJsonFormat[GroupConfigDTO]           = jsonFormat8(GroupConfigDTO.apply)
diff --git a/admin/src/main/scala/com/neu/model/WafJsonProtocol.scala b/admin/src/main/scala/com/neu/model/WafJsonProtocol.scala
index a161d05cd..892d30c6f 100644
--- a/admin/src/main/scala/com/neu/model/WafJsonProtocol.scala
+++ b/admin/src/main/scala/com/neu/model/WafJsonProtocol.scala
@@ -20,7 +20,7 @@ object WafJsonProtocol extends DefaultJsonProtocol {
   given wafSensorFmt: RootJsonFormat[WafSensor]                         = jsonFormat4(WafSensor.apply)
   given wafSensorDataFmt: RootJsonFormat[WafSensorData]                 = jsonFormat1(WafSensorData.apply)
   given wafSensorsDataFmt: RootJsonFormat[WafSensorsData]               = jsonFormat1(WafSensorsData.apply)
-  given wafSensorConfigFmt: RootJsonFormat[WafSensorConfig]             = jsonFormat5(WafSensorConfig.apply)
+  given wafSensorConfigFmt: RootJsonFormat[WafSensorConfig]             = jsonFormat6(WafSensorConfig.apply)
   given wafSensorConfigDataFmt: RootJsonFormat[WafSensorConfigData]     = jsonFormat1(
     WafSensorConfigData.apply
   )
diff --git a/admin/src/main/scala/com/neu/model/WafRule.scala b/admin/src/main/scala/com/neu/model/WafRule.scala
index b795b2e7a..9d64bdfd8 100644
--- a/admin/src/main/scala/com/neu/model/WafRule.scala
+++ b/admin/src/main/scala/com/neu/model/WafRule.scala
@@ -35,6 +35,7 @@ case class WafSensorsData(sensors: Seq[WafSensor])
 case class WafSensorConfig(
   name: String,
   comment: Option[String],
+  cfg_type: Option[String],
   change: Option[Seq[WafRule]],
   delete: Option[Seq[WafRule]],
   rules: Option[Seq[WafRule]]
diff --git a/admin/src/main/scala/com/neu/service/group/GroupService.scala b/admin/src/main/scala/com/neu/service/group/GroupService.scala
index 3a6cb3881..5cb083dfa 100644
--- a/admin/src/main/scala/com/neu/service/group/GroupService.scala
+++ b/admin/src/main/scala/com/neu/service/group/GroupService.scala
@@ -73,7 +73,7 @@ class GroupService extends BaseService with DefaultJsonFormats with LazyLogging
     logger.info("Exporting groups: {}", payload)
     RestClient.httpRequestWithHeaderDecode(
       s"${baseClusterUri(tokenId)}/file/group",
-      GET,
+      POST,
       payload,
       tokenId
     )
@@ -551,11 +551,11 @@ class GroupService extends BaseService with DefaultJsonFormats with LazyLogging
     }
   }
 
-  def getDlpSensor(tokenId: String, name: Option[String]): Route = complete {
+  def getDlpSensor(tokenId: String, name: Option[String], scope: Option[String]): Route = complete {
     if (name.isEmpty) {
       logger.info("Getting sensors")
       RestClient.httpRequestWithHeader(
-        s"${baseClusterUri(tokenId)}/dlp/sensor",
+        s"${baseClusterUri(tokenId)}/dlp/sensor${if (scope.nonEmpty) s"?scope=${scope.get}" else ""}",
         GET,
         "",
         tokenId
@@ -691,11 +691,11 @@ class GroupService extends BaseService with DefaultJsonFormats with LazyLogging
     )
   }
 
-  def getWafSensor(tokenId: String, name: Option[String]): Route = complete {
+  def getWafSensor(tokenId: String, name: Option[String], scope: Option[String]): Route = complete {
     if (name.isEmpty) {
       logger.info("Getting sensors")
       RestClient.httpRequestWithHeader(
-        s"${baseClusterUri(tokenId)}/waf/sensor",
+        s"${baseClusterUri(tokenId)}/waf/sensor${if (scope.nonEmpty) s"?scope=${scope.get}" else ""}",
         GET,
         "",
         tokenId
diff --git a/admin/webapp/websrc/app/common/api/policy-http.service.ts b/admin/webapp/websrc/app/common/api/policy-http.service.ts
index 993b5fd20..de0eb95e3 100644
--- a/admin/webapp/websrc/app/common/api/policy-http.service.ts
+++ b/admin/webapp/websrc/app/common/api/policy-http.service.ts
@@ -3,6 +3,7 @@ import { PathConstant } from '@common/constants/path.constant';
 import { Group, NetworkRule, ResponseRule, Service } from '@common/types';
 import { GlobalVariable } from '@common/variables/global.variable';
 import { Observable } from 'rxjs';
+import { GlobalConstant } from '@common/constants/global.constant';
 import { pluck } from 'rxjs/operators';
 
 @Injectable()
@@ -124,9 +125,23 @@ export class PolicyHttpService {
     return GlobalVariable.http.patch(PathConstant.DLP_GROUPS_URL, payload);
   }
 
-  getDLPSensors() {
+  getDLPSensors(source) {
+    const options: any = [];
+    if (source === GlobalConstant.NAV_SOURCE.FED_POLICY) {
+      options.push({
+        params: {
+          scope: 'fed',
+        },
+      });
+    } else {
+      options.push({
+        params: {
+          scope: 'local',
+        },
+      });
+    }
     return GlobalVariable.http
-      .get(PathConstant.DLP_SENSORS_URL)
+      .get(PathConstant.DLP_SENSORS_URL, ...options)
       .pipe(pluck('sensors'));
   }
 
@@ -140,9 +155,23 @@ export class PolicyHttpService {
     return GlobalVariable.http.patch(PathConstant.WAF_GROUPS_URL, payload);
   }
 
-  getWAFSensors() {
+  getWAFSensors(source) {
+    const options: any = [];
+    if (source === GlobalConstant.NAV_SOURCE.FED_POLICY) {
+      options.push({
+        params: {
+          scope: 'fed',
+        },
+      });
+    } else {
+      options.push({
+        params: {
+          scope: 'local',
+        },
+      });
+    }
     return GlobalVariable.http
-      .get(PathConstant.WAF_SENSORS_URL)
+      .get(PathConstant.WAF_SENSORS_URL, ...options)
       .pipe(pluck('sensors'));
   }
 }
diff --git a/admin/webapp/websrc/app/common/services/dlp-sensors.service.ts b/admin/webapp/websrc/app/common/services/dlp-sensors.service.ts
index 80ef9893f..211088dd0 100644
--- a/admin/webapp/websrc/app/common/services/dlp-sensors.service.ts
+++ b/admin/webapp/websrc/app/common/services/dlp-sensors.service.ts
@@ -8,9 +8,9 @@ import { TranslateService } from '@ngx-translate/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { UtilsService } from '@common/utils/app.utils';
 import { pluck } from 'rxjs/operators';
-import { SensorActionButtonsComponent } from '@routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component';
-import { RuleActionButtonsComponent } from '@routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component';
-import { PatternActionButtonsComponent } from '@routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component';
+import { SensorActionButtonsComponent } from '@components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component';
+import { RuleActionButtonsComponent } from '@components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component';
+import { PatternActionButtonsComponent } from '@components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component';
 
 @Injectable({
   providedIn: 'root',
@@ -26,21 +26,25 @@ export class DlpSensorsService {
     this.$win = $(GlobalVariable.window);
   }
 
-  configGrids = (isWriteDLPSensorAuthorized: boolean) => {
+  configGrids = (isWriteDLPSensorAuthorized: boolean, source: string = '') => {
     const columnDefs4Sensor = [
       {
         headerName: this.translate.instant('dlp.gridHeader.SENSOR_NAME'),
         field: 'name',
-        headerCheckboxSelection: true,
-        headerCheckboxSelectionFilteredOnly: true,
-        checkboxSelection: params => {
-          if (params.data) return !params.data.predefine;
-          return false;
-        },
+        headerCheckboxSelection: params =>
+          params.context.componentParent.source !==
+          GlobalConstant.NAV_SOURCE.FED_POLICY,
+        headerCheckboxSelectionFilteredOnly: params =>
+          params.context.componentParent.source !==
+          GlobalConstant.NAV_SOURCE.FED_POLICY,
         cellRenderer: params => {
           if (params.value)
             return `<span class="${
-              params.data.predefine ? 'left-margin-32' : ''
+              params.data.predefine &&
+              params.context.componentParent.source !==
+                GlobalConstant.NAV_SOURCE.FED_POLICY
+                ? 'left-margin-32'
+                : ''
             }">
                       ${params.value}
                     </span>`;
@@ -100,6 +104,19 @@ export class DlpSensorsService {
       },
     ];
 
+    if (source !== GlobalConstant.NAV_SOURCE.FED_POLICY) {
+      columnDefs4Sensor[0]['checkboxSelection'] = params => {
+        if (params.data)
+          return (
+            !params.data.predefine &&
+            params.context.componentParent.source !==
+              GlobalConstant.NAV_SOURCE.FED_POLICY &&
+            params.data.cfg_type !== GlobalConstant.CFG_TYPE.FED
+          );
+        return false;
+      };
+    }
+
     const columnDefs4Rules = [
       {
         headerName: this.translate.instant('dlp.gridHeader.PATTERN_NAME'),
@@ -186,7 +203,8 @@ export class DlpSensorsService {
       ),
     };
 
-    grids.gridOptions.rowSelection = 'multiple';
+    grids.gridOptions.rowSelection =
+      source !== GlobalConstant.NAV_SOURCE.FED_POLICY ? 'multiple' : 'single';
 
     grids.gridOptions.rowClassRules = {
       'disabled-row': params => {
@@ -204,9 +222,17 @@ export class DlpSensorsService {
     return grids;
   };
 
-  getDlpSensorsData = () => {
+  getDlpSensorsData = source => {
+    const options: any = [];
+    if (source === GlobalConstant.NAV_SOURCE.FED_POLICY) {
+      options.push({
+        params: {
+          scope: 'fed',
+        },
+      });
+    }
     return GlobalVariable.http
-      .get(PathConstant.DLP_SENSORS_URL)
+      .get(PathConstant.DLP_SENSORS_URL, ...options)
       .pipe(pluck('sensors'));
   };
 
diff --git a/admin/webapp/websrc/app/common/services/federated-configuration.service.ts b/admin/webapp/websrc/app/common/services/federated-configuration.service.ts
index 8badf58b9..cdb564b5f 100644
--- a/admin/webapp/websrc/app/common/services/federated-configuration.service.ts
+++ b/admin/webapp/websrc/app/common/services/federated-configuration.service.ts
@@ -6,6 +6,7 @@ import { Webhook } from '@common/types';
 
 @Injectable()
 export class FederatedConfigurationService {
+  public activeTabIndex4Group: number = 0;
   constructor(private configHttpService: ConfigHttpService) {}
 
   getFederatedConfig() {
diff --git a/admin/webapp/websrc/app/common/services/groups.service.ts b/admin/webapp/websrc/app/common/services/groups.service.ts
index 78f0d2acc..902d919b9 100644
--- a/admin/webapp/websrc/app/common/services/groups.service.ts
+++ b/admin/webapp/websrc/app/common/services/groups.service.ts
@@ -843,8 +843,8 @@ export class GroupsService {
     return this.policyHttpService.getDLPGroups(groupName);
   };
 
-  getDlpSensorData = () => {
-    return this.policyHttpService.getDLPSensors();
+  getDlpSensorData = source => {
+    return this.policyHttpService.getDLPSensors(source);
   };
 
   updateGroupDlpSensorData = payload => {
@@ -855,8 +855,8 @@ export class GroupsService {
     return this.policyHttpService.getWAFGroups(groupName);
   };
 
-  getWafSensorData = () => {
-    return this.policyHttpService.getWAFSensors();
+  getWafSensorData = getWAFSensors => {
+    return this.policyHttpService.getWAFSensors(getWAFSensors);
   };
 
   updateGroupWafSensorData = payload => {
diff --git a/admin/webapp/websrc/app/common/services/waf-sensors.service.ts b/admin/webapp/websrc/app/common/services/waf-sensors.service.ts
index d7c6b5461..67eda9573 100644
--- a/admin/webapp/websrc/app/common/services/waf-sensors.service.ts
+++ b/admin/webapp/websrc/app/common/services/waf-sensors.service.ts
@@ -8,9 +8,9 @@ import { TranslateService } from '@ngx-translate/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { UtilsService } from '@common/utils/app.utils';
 import { pluck } from 'rxjs/operators';
-import { SensorActionButtonsComponent } from '@routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component';
-import { RuleActionButtonsComponent } from '@routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component';
-import { PatternActionButtonsComponent } from '@routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component';
+import { SensorActionButtonsComponent } from '@components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component';
+import { RuleActionButtonsComponent } from '@components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component';
+import { PatternActionButtonsComponent } from '@components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component';
 
 @Injectable({
   providedIn: 'root',
@@ -26,21 +26,25 @@ export class WafSensorsService {
     this.$win = $(GlobalVariable.window);
   }
 
-  configGrids = (isWriteWAFSensorAuthorized: boolean) => {
+  configGrids = (isWriteWAFSensorAuthorized: boolean, source: string = '') => {
     const columnDefs4Sensor = [
       {
         headerName: this.translate.instant('waf.gridHeader.SENSOR_NAME'),
         field: 'name',
-        headerCheckboxSelection: true,
-        headerCheckboxSelectionFilteredOnly: true,
-        checkboxSelection: params => {
-          if (params.data) return !params.data.predefine;
-          return false;
-        },
+        headerCheckboxSelection: params =>
+          params.context.componentParent.source !==
+          GlobalConstant.NAV_SOURCE.FED_POLICY,
+        headerCheckboxSelectionFilteredOnly: params =>
+          params.context.componentParent.source !==
+          GlobalConstant.NAV_SOURCE.FED_POLICY,
         cellRenderer: params => {
           if (params.value)
             return `<span class="${
-              params.data.predefine ? 'left-margin-32' : ''
+              params.data.predefine &&
+              params.context.componentParent.source !==
+                GlobalConstant.NAV_SOURCE.FED_POLICY
+                ? 'left-margin-32'
+                : ''
             }">
                       ${params.value}
                     </span>`;
@@ -100,6 +104,19 @@ export class WafSensorsService {
       },
     ];
 
+    if (source !== GlobalConstant.NAV_SOURCE.FED_POLICY) {
+      columnDefs4Sensor[0]['checkboxSelection'] = params => {
+        if (params.data)
+          return (
+            !params.data.predefine &&
+            params.context.componentParent.source !==
+              GlobalConstant.NAV_SOURCE.FED_POLICY &&
+            params.data.cfg_type !== GlobalConstant.CFG_TYPE.FED
+          );
+        return false;
+      };
+    }
+
     const columnDefs4Rules = [
       {
         headerName: this.translate.instant('waf.gridHeader.PATTERN_NAME'),
@@ -186,7 +203,8 @@ export class WafSensorsService {
       ),
     };
 
-    grids.gridOptions.rowSelection = 'multiple';
+    grids.gridOptions.rowSelection =
+      source !== GlobalConstant.NAV_SOURCE.FED_POLICY ? 'multiple' : 'single';
 
     grids.gridOptions.rowClassRules = {
       'disabled-row': params => {
@@ -204,9 +222,17 @@ export class WafSensorsService {
     return grids;
   };
 
-  getWafSensorsData = () => {
+  getWafSensorsData = source => {
+    const options: any = [];
+    if (source === GlobalConstant.NAV_SOURCE.FED_POLICY) {
+      options.push({
+        params: {
+          scope: 'fed',
+        },
+      });
+    }
     return GlobalVariable.http
-      .get(PathConstant.WAF_SENSORS_URL)
+      .get(PathConstant.WAF_SENSORS_URL, ...options)
       .pipe(pluck('sensors'));
   };
 
diff --git a/admin/webapp/websrc/app/common/types/settings/remote-repository.ts b/admin/webapp/websrc/app/common/types/settings/remote-repository.ts
index 30bfb0353..9a05461d7 100644
--- a/admin/webapp/websrc/app/common/types/settings/remote-repository.ts
+++ b/admin/webapp/websrc/app/common/types/settings/remote-repository.ts
@@ -32,6 +32,7 @@ export interface RemoteExportOptionsWrapper {
 export interface RemoteExportOptionsConfig {
   policy_mode: string;
   profile_mode: string;
+  use_name_referral: boolean;
   remote_repository_nickname: string;
   export_mode: string;
   file_path?: string;
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.html b/admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.html
similarity index 89%
rename from admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.html
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.html
index f8fe02d81..d5aafd3a9 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.html
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.html
@@ -1,5 +1,7 @@
 <div class="screen-area">
-  <div class="d-flex justify-content-between align-items-center">
+  <div
+    *ngIf="source !== navSource['FED_POLICY']"
+    class="d-flex justify-content-between align-items-center">
     <h1 class="font-weight-light" id="dlpSensors-title">
       {{ 'sidebar.nav.DLP_SENSORS' | translate }}
     </h1>
@@ -35,7 +37,10 @@ <h1 class="font-weight-light" id="dlpSensors-title">
     </div>
   </div>
   <ng-container>
-    <app-adjustable-div [minHeightOne]="163" [minHeightTwo]="140">
+    <app-adjustable-div
+      [source]="source"
+      [minHeightOne]="163"
+      [minHeightTwo]="140">
       <ng-container *appContainerOne="let height">
         <mat-card [ngStyle]="{ height: height + 'px' }" class="pt-0">
           <div class="d-flex justify-content-between align-items-center">
@@ -95,7 +100,14 @@ <h1 class="font-weight-light" id="dlpSensors-title">
           <div class="row margin-top-m">
             <div class="col-sm-3" style="position: relative">
               <button
-                *ngIf="!isPredefine && isWriteDLPSensorAuthorized"
+                *ngIf="
+                  !isPredefine &&
+                  isWriteDLPSensorAuthorized &&
+                  ((source !== navSource.FED_POLICY &&
+                    selectedSensor.cfg_type !== CFG_TYPE.FED) ||
+                    (source === navSource.FED_POLICY &&
+                      selectedSensor.cfg_type === CFG_TYPE.FED))
+                "
                 style="position: absolute; z-index: 10; right: 17px; top: 4px"
                 (click)="openAddDlpRuleModal()">
                 <em
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.scss b/admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.scss
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.scss
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.spec.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.ts
similarity index 95%
rename from admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.ts
index 8380e0efc..cdd859d46 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.component.ts
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, Input } from '@angular/core';
 import { AuthUtilsService } from '@common/utils/auth.utils';
 import {
   DlpSensor,
@@ -18,8 +18,8 @@ import { GlobalConstant } from '@common/constants/global.constant';
 import { PathConstant } from '@common/constants/path.constant';
 import { MapConstant } from '@common/constants/map.constant';
 import { GlobalVariable } from '@common/variables/global.variable';
-import { AddEditSensorModalComponent } from '@routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component';
-import { AddEditRuleModalComponent } from '@routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component';
+import { AddEditSensorModalComponent } from '@components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component';
+import { AddEditRuleModalComponent } from '@components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component';
 import { UtilsService } from '@common/utils/app.utils';
 import { saveAs } from 'file-saver';
 import { ImportFileModalComponent } from '@components/ui/import-file-modal/import-file-modal.component';
@@ -38,6 +38,9 @@ import * as $ from 'jquery';
   styleUrls: ['./dlp-sensors.component.scss'],
 })
 export class DlpSensorsComponent implements OnInit, OnDestroy {
+  @Input() source: string;
+  navSource = GlobalConstant.NAV_SOURCE;
+  CFG_TYPE = GlobalConstant.CFG_TYPE;
   refreshing$ = new Subject();
   dlpSensors: Array<DlpSensor> = [];
   isWriteDLPSensorAuthorized!: boolean;
@@ -79,7 +82,8 @@ export class DlpSensorsComponent implements OnInit, OnDestroy {
       this.authUtilsService.getDisplayFlag('write_dlp_rule') &&
       !this.authUtilsService.userPermission.isNamespaceUser;
     this.gridOptions = this.dlpSensorsService.configGrids(
-      this.isWriteDLPSensorAuthorized
+      this.isWriteDLPSensorAuthorized,
+      this.source
     );
     this.gridOptions4Sensors = this.gridOptions.gridOptions;
     this.gridOptions4Sensors.onGridReady = params => {
@@ -170,6 +174,7 @@ export class DlpSensorsComponent implements OnInit, OnDestroy {
         opType: GlobalConstant.MODAL_OP.ADD,
         dlpSensors: this.dlpSensors,
         gridApi: this.gridApi4Sensors!,
+        source: this.source,
       },
     });
   };
@@ -296,7 +301,7 @@ export class DlpSensorsComponent implements OnInit, OnDestroy {
 
   private getDlpSensors = (index: number) => {
     this.dlpSensorsService
-      .getDlpSensorsData()
+      .getDlpSensorsData(this.source)
       .pipe(finalize(() => this.refreshing$.next(false)))
       .subscribe(
         response => {
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.module.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.module.ts
similarity index 84%
rename from admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.module.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.module.ts
index ae7a83f86..56c95aefd 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/dlp-sensors.module.ts
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/dlp-sensors.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { Routes, RouterModule } from '@angular/router';
 import { NvCommonModule } from '@common/nvCommon.module';
 import { AdjustableDivModule } from '@components/ui/adjustable-div/adjustable-div.module';
 import { AgGridModule } from 'ag-grid-angular';
@@ -16,11 +15,6 @@ import { PatternActionButtonsComponent } from './partial/pattern-action-buttons/
 import { ImportFileModalModule } from '@components/ui/import-file-modal/import-file-modal.module';
 import { ExportOptionsModalModule } from '@components/export-options-modal/export-options-modal.module';
 
-const routes: Routes = [
-  { path: '', component: DlpSensorsComponent },
-  { path: '*', redirectTo: '' },
-];
-
 @NgModule({
   declarations: [
     DlpSensorsComponent,
@@ -38,13 +32,9 @@ const routes: Routes = [
     PipeModule,
     LoadingButtonModule,
     ImportFileModalModule,
-    RouterModule.forChild(routes),
     AgGridModule,
-    // AgGridModule.withComponents([
-    //   SensorActionButtonsComponent,
-    //   RuleActionButtonsComponent,
-    // ]),
     ExportOptionsModalModule,
   ],
+  exports: [DlpSensorsComponent],
 })
 export class DlpSensorsModule {}
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.html b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.html
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.html
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.html
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.scss b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.scss
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.scss
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.spec.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.ts
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
similarity index 92%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
index a6d219b19..553867ca5 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
@@ -32,6 +32,10 @@ <h4 mat-dialog-title class="mb-2">
             *ngIf="addEditSensorForm.controls.name.hasError('required')">
             {{ 'dlp.msg.SENSOR_NAME_REQUIRED' | translate }}
           </mat-error>
+          <mat-error
+            *ngIf="addEditSensorForm.controls.name.hasError('fedName')">
+            {{ 'dlp.msg.NAME_VALID' | translate }} "fed."
+          </mat-error>
         </mat-form-field>
         <mat-form-field class="col-sm-9" appearance="standard">
           <mat-label>{{ 'dlp.sensorModal.COMMENT' | translate }}</mat-label>
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.scss b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.scss
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.scss
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.spec.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
similarity index 68%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
index 007923578..1d59dd7db 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
@@ -1,7 +1,14 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { GlobalConstant } from '@common/constants/global.constant';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import {
+  FormControl,
+  FormGroup,
+  Validators,
+  ValidatorFn,
+  AbstractControl,
+  ValidationErrors,
+} from '@angular/forms';
 import { DlpSensorsService } from '@services/dlp-sensors.service';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationService } from '@services/notification.service';
@@ -32,9 +39,13 @@ export class AddEditSensorModalComponent implements OnInit {
     this.addEditSensorForm = new FormGroup({
       name: new FormControl(
         this.data.opType === GlobalConstant.MODAL_OP.ADD
-          ? ''
+          ? this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+            ? 'fed.'
+            : ''
           : this.data.sensor.name,
-        Validators.required
+        this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+          ? [Validators.required, this.fedNameValidator()]
+          : Validators.required
       ),
       comment: new FormControl(
         this.data.opType === GlobalConstant.MODAL_OP.ADD
@@ -44,6 +55,13 @@ export class AddEditSensorModalComponent implements OnInit {
     });
   }
 
+  fedNameValidator = (): ValidatorFn => {
+    return (control: AbstractControl): ValidationErrors | null => {
+      const isValid = control.value.startsWith('fed.');
+      return isValid ? null : { fedName: { value: control.value } };
+    };
+  };
+
   onCancel = () => {
     this.dialogRef.close(false);
   };
@@ -52,6 +70,10 @@ export class AddEditSensorModalComponent implements OnInit {
     let payload = {
       config: this.addEditSensorForm.value,
     };
+    payload.config.cfg_type =
+      this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+        ? GlobalConstant.CFG_TYPE.FED
+        : GlobalConstant.CFG_TYPE.CUSTOMER;
     this.dlpSensorsService
       .updateDlpSensorData(payload, this.data.opType)
       .subscribe(
@@ -67,14 +89,26 @@ export class AddEditSensorModalComponent implements OnInit {
             [
               this.data.opType === GlobalConstant.MODAL_OP.ADD
                 ? {
-                    cfg_type: GlobalConstant.CFG_TYPE.CUSTOMER,
+                    cfg_type:
+                      this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+                        ? GlobalConstant.CFG_TYPE.FED
+                        : GlobalConstant.CFG_TYPE.CUSTOMER,
                     comment: this.addEditSensorForm.value.comment,
                     groups: [],
                     name: this.addEditSensorForm.value.name,
                     predefine: false,
                     rules: [],
                   }
-                : this.addEditSensorForm.value,
+                : {
+                    ...this.addEditSensorForm.value,
+                    groups: [],
+                    predefine: false,
+                    rules: [],
+                    cfg_type:
+                      this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+                        ? GlobalConstant.CFG_TYPE.FED
+                        : GlobalConstant.CFG_TYPE.CUSTOMER,
+                  },
             ],
             this.data.gridApi,
             'name',
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.html b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.html
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.html
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.html
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.scss b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.scss
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.scss
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.spec.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.ts
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.html b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
similarity index 68%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
index b0dfbbd84..ae194fcd9 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
@@ -1,4 +1,11 @@
-<div *ngIf="!isPredefine">
+<div
+  *ngIf="
+    !isPredefine &&
+    ((params.context.componentParent.source !== navSource.FED_POLICY &&
+      params.data.cfg_type !== CFG_TYPE.FED) ||
+      (params.context.componentParent.source === navSource.FED_POLICY &&
+        params.data.cfg_type === CFG_TYPE.FED))
+  ">
   <div class="rule-actions-expand fade-in-right">
     <em
       class="eos-icons icon-18 hand text-action"
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.scss b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.scss
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.scss
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.spec.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
similarity index 95%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
index 8ddb28e51..bc7c4a8da 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ICellRendererAngularComp } from 'ag-grid-angular';
 import { ICellRendererParams } from 'ag-grid-community';
-import { AddEditRuleModalComponent } from '@routes/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component';
+import { AddEditRuleModalComponent } from '@components/dlp-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component';
 import { MatDialog } from '@angular/material/dialog';
 import { GlobalConstant } from '@common/constants/global.constant';
 import { ConfirmDialogComponent } from '@components/ui/confirm-dialog/confirm-dialog.component';
@@ -20,6 +20,8 @@ import { UtilsService } from '@common/utils/app.utils';
 export class RuleActionButtonsComponent implements ICellRendererAngularComp {
   params!: ICellRendererParams;
   isPredefine!: boolean;
+  navSource = GlobalConstant.NAV_SOURCE;
+  CFG_TYPE = GlobalConstant.CFG_TYPE;
 
   constructor(
     private dialog: MatDialog,
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
similarity index 67%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
index b888d23aa..bb067eca5 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
@@ -1,4 +1,12 @@
-<div *ngIf="params && !params.data.predefine">
+<div
+  *ngIf="
+    params &&
+    !params.data.predefine &&
+    ((params.context.componentParent.source !== navSource.FED_POLICY &&
+      params.data.cfg_type !== CFG_TYPE.FED) ||
+      (params.context.componentParent.source === navSource.FED_POLICY &&
+        params.data.cfg_type === CFG_TYPE.FED))
+  ">
   <div class="rule-actions-expand fade-in-right">
     <em
       class="eos-icons icon-18 hand text-action"
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.scss b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.scss
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.scss
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.spec.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
similarity index 92%
rename from admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
rename to admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
index 471030fa5..7a57ca0de 100644
--- a/admin/webapp/websrc/app/routes/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
+++ b/admin/webapp/websrc/app/routes/components/dlp-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ICellRendererAngularComp } from 'ag-grid-angular';
 import { ICellRendererParams } from 'ag-grid-community';
-import { AddEditSensorModalComponent } from '@routes/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component';
+import { AddEditSensorModalComponent } from '@components/dlp-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component';
 import { MatDialog } from '@angular/material/dialog';
 import { GlobalConstant } from '@common/constants/global.constant';
 import { ConfirmDialogComponent } from '@components/ui/confirm-dialog/confirm-dialog.component';
@@ -20,6 +20,8 @@ import { updateGridData } from '@common/utils/common.utils';
 })
 export class SensorActionButtonsComponent implements ICellRendererAngularComp {
   params!: ICellRendererParams;
+  navSource = GlobalConstant.NAV_SOURCE;
+  CFG_TYPE = GlobalConstant.CFG_TYPE;
 
   constructor(
     private dialog: MatDialog,
@@ -47,6 +49,7 @@ export class SensorActionButtonsComponent implements ICellRendererAngularComp {
         index: this.params.rowIndex,
         dlpSensors: this.params.context.componentParent.dlpSensors,
         gridApi: this.params.context.componentParent.gridApi4Sensors!,
+        source: this.params.context.componentParent.source,
       },
     });
   };
diff --git a/admin/webapp/websrc/app/routes/components/export-options/export-options.component.html b/admin/webapp/websrc/app/routes/components/export-options/export-options.component.html
index 7e5b645a9..1acac6d40 100644
--- a/admin/webapp/websrc/app/routes/components/export-options/export-options.component.html
+++ b/admin/webapp/websrc/app/routes/components/export-options/export-options.component.html
@@ -36,8 +36,15 @@
       }}</mat-radio-button>
     </mat-radio-group>
   </div>
-  <hr *ngIf="source === 'group'" />
+  <hr class="my-2" *ngIf="source === 'group'" />
+  <mat-checkbox
+    [checked]="useNameRef"
+    (change)="toggleNameRef($event)"
+    class="mr-3 my-2">
+    {{ 'group.NAME_REFERRAL' | translate }}
+  </mat-checkbox>
   <mat-radio-group formControlName="export_mode" class="d-flex flex-column">
+    <label class="text-border">{{ 'group.DOWNLOAD_LOCATION' | translate }}</label>
     <mat-radio-button value="local"
       >{{ 'setting.remote_repository.options.destination_local' | translate }}
     </mat-radio-button>
diff --git a/admin/webapp/websrc/app/routes/components/export-options/export-options.component.ts b/admin/webapp/websrc/app/routes/components/export-options/export-options.component.ts
index 81eddd1ec..f28806a44 100644
--- a/admin/webapp/websrc/app/routes/components/export-options/export-options.component.ts
+++ b/admin/webapp/websrc/app/routes/components/export-options/export-options.component.ts
@@ -16,6 +16,7 @@ export class ExportOptionsComponent implements OnInit {
 
   exportOptionsForm!: FormGroup;
   remoteRepoEnabled = false;
+  useNameRef = false;
 
   constructor(
     private fb: FormBuilder,
@@ -27,6 +28,7 @@ export class ExportOptionsComponent implements OnInit {
       policy_mode: '',
       profile_mode: '',
       export_mode: ['local'],
+      use_name_referral: this.useNameRef,
       remote_repository_nickname: ['default'],
       file_path: [this.exportFileName],
       comment: [''],
@@ -48,4 +50,9 @@ export class ExportOptionsComponent implements OnInit {
         }
       });
   }
+
+  toggleNameRef(event): void {
+    this.useNameRef = !this.useNameRef;
+    this.exportOptionsForm.controls.use_name_referral.setValue(this.useNameRef);
+  }
 }
diff --git a/admin/webapp/websrc/app/routes/components/group-details/group-details.component.html b/admin/webapp/websrc/app/routes/components/group-details/group-details.component.html
index 67f92f671..c48c5c7e1 100644
--- a/admin/webapp/websrc/app/routes/components/group-details/group-details.component.html
+++ b/admin/webapp/websrc/app/routes/components/group-details/group-details.component.html
@@ -166,6 +166,7 @@
   </ng-container>
   <ng-container *ngSwitchCase="'DLP'">
     <div
+      *ngIf="isWriteGroupAuthorized && cfgType !== CFG_TYPE.FED"
       style="position: absolute; right: 20px; top: 5px"
       class="d-flex align-items-center justify-content-end">
       <button
@@ -196,6 +197,7 @@
   </ng-container>
   <ng-container *ngSwitchCase="'WAF'">
     <div
+      *ngIf="isWriteGroupAuthorized && cfgType !== CFG_TYPE.FED"
       style="position: absolute; right: 20px; top: 5px"
       class="d-flex align-items-center justify-content-end">
       <button
@@ -318,15 +320,9 @@
   </mat-tab>
   <mat-tab
     label="{{ 'group.dlp.TITLE' | translate }}"
-    [labelClass]="
-      kind === 'container' && cfgType !== CFG_TYPE.FED ? '' : 'hide'
-    ">
+    [labelClass]="kind === 'container' ? '' : 'hide'">
     <app-group-dlp
-      *ngIf="
-        groupsService.activeTabIndex === 6 &&
-        kind === 'container' &&
-        cfgType !== CFG_TYPE.FED
-      "
+      *ngIf="groupsService.activeTabIndex === 6 && kind === 'container'"
       (getEditGroupSensorModal)="getEditGroupSensorModal($event)"
       (getToggleDLPConfigEnablement)="getToggleDLPConfigEnablement($event)"
       (getStatus)="getStatus($event)"
@@ -339,15 +335,9 @@
   </mat-tab>
   <mat-tab
     label="{{ 'group.waf.TITLE' | translate }}"
-    [labelClass]="
-      kind === 'container' && cfgType !== CFG_TYPE.FED ? '' : 'hide'
-    ">
+    [labelClass]="kind === 'container' ? '' : 'hide'">
     <app-group-waf
-      *ngIf="
-        groupsService.activeTabIndex === 7 &&
-        kind === 'container' &&
-        cfgType !== CFG_TYPE.FED
-      "
+      *ngIf="groupsService.activeTabIndex === 7 && kind === 'container'"
       (getEditGroupSensorModal)="getEditGroupSensorModal($event)"
       (getToggleWAFConfigEnablement)="getToggleWAFConfigEnablement($event)"
       (getStatus)="getStatus($event)"
diff --git a/admin/webapp/websrc/app/routes/components/group-details/group-details.component.ts b/admin/webapp/websrc/app/routes/components/group-details/group-details.component.ts
index 1b13c610c..9cb0e5d5f 100644
--- a/admin/webapp/websrc/app/routes/components/group-details/group-details.component.ts
+++ b/admin/webapp/websrc/app/routes/components/group-details/group-details.component.ts
@@ -6,16 +6,16 @@ import { QuickFilterService } from '@components/quick-filter/quick-filter.servic
 import { tap } from 'rxjs/operators';
 import { AuthUtilsService } from '@common/utils/auth.utils';
 
-export const groupDetailsTabs = {
-  0: 'member',
-  1: 'custom check',
-  2: 'process profile rules',
-  3: 'file access rules',
-  4: 'network rules',
-  5: 'response rules',
-  6: 'DLP',
-  7: 'WAF',
-};
+export const groupDetailsTabs = [
+  'member',
+  'custom check',
+  'process profile rules',
+  'file access rules',
+  'network rules',
+  'response rules',
+  'DLP',
+  'WAF',
+];
 
 @Component({
   selector: 'app-group-details',
diff --git a/admin/webapp/websrc/app/routes/components/group-details/group-details.module.ts b/admin/webapp/websrc/app/routes/components/group-details/group-details.module.ts
index f02f4f27f..54b555e73 100644
--- a/admin/webapp/websrc/app/routes/components/group-details/group-details.module.ts
+++ b/admin/webapp/websrc/app/routes/components/group-details/group-details.module.ts
@@ -51,6 +51,11 @@ import { NodesGridModule } from '@components/nodes-grid/nodes-grid.module';
     //   GroupDlpConfigActionButtonComponent
     // ]),
   ],
-  exports: [MembersComponent, GroupDetailsComponent],
+  exports: [
+    MembersComponent,
+    GroupDetailsComponent,
+    GroupDlpComponent,
+    GroupWafComponent,
+  ],
 })
 export class GroupDetailsModule {}
diff --git a/admin/webapp/websrc/app/routes/components/group-details/partial/group-dlp-config-modal/group-dlp-config-modal.component.ts b/admin/webapp/websrc/app/routes/components/group-details/partial/group-dlp-config-modal/group-dlp-config-modal.component.ts
index 7c3155e5c..a3b83b0b9 100644
--- a/admin/webapp/websrc/app/routes/components/group-details/partial/group-dlp-config-modal/group-dlp-config-modal.component.ts
+++ b/admin/webapp/websrc/app/routes/components/group-details/partial/group-dlp-config-modal/group-dlp-config-modal.component.ts
@@ -66,7 +66,7 @@ export class GroupDlpConfigModalComponent implements OnInit {
   };
 
   refresh = () => {
-    this.groupsService.getDlpSensorData().subscribe(
+    this.groupsService.getDlpSensorData(this.data.source).subscribe(
       (response: any) => {
         this.dlpSensorOption = response;
         this.dlpSensorOption = this.dlpSensorOption.map(sensor => {
diff --git a/admin/webapp/websrc/app/routes/components/group-details/partial/group-dlp/group-dlp.component.ts b/admin/webapp/websrc/app/routes/components/group-details/partial/group-dlp/group-dlp.component.ts
index d2923ebf1..dae83f455 100644
--- a/admin/webapp/websrc/app/routes/components/group-details/partial/group-dlp/group-dlp.component.ts
+++ b/admin/webapp/websrc/app/routes/components/group-details/partial/group-dlp/group-dlp.component.ts
@@ -137,6 +137,7 @@ export class GroupDlpComponent implements OnInit, OnChanges {
           status: this.enabled,
           warning: warning,
           refresh: this.refresh,
+          source: this.source,
         },
       });
     }, 200);
diff --git a/admin/webapp/websrc/app/routes/components/group-details/partial/group-waf-config-modal/group-waf-config-modal.component.ts b/admin/webapp/websrc/app/routes/components/group-details/partial/group-waf-config-modal/group-waf-config-modal.component.ts
index 4b4bf92c6..0b632c836 100644
--- a/admin/webapp/websrc/app/routes/components/group-details/partial/group-waf-config-modal/group-waf-config-modal.component.ts
+++ b/admin/webapp/websrc/app/routes/components/group-details/partial/group-waf-config-modal/group-waf-config-modal.component.ts
@@ -66,7 +66,7 @@ export class GroupWafConfigModalComponent implements OnInit {
   };
 
   refresh = () => {
-    this.groupsService.getWafSensorData().subscribe(
+    this.groupsService.getWafSensorData(this.data.source).subscribe(
       (response: any) => {
         this.wafSensorOption = response;
         this.wafSensorOption = this.wafSensorOption.map(sensor => {
diff --git a/admin/webapp/websrc/app/routes/components/group-details/partial/group-waf/group-waf.component.ts b/admin/webapp/websrc/app/routes/components/group-details/partial/group-waf/group-waf.component.ts
index ff50a9b27..d63be29df 100644
--- a/admin/webapp/websrc/app/routes/components/group-details/partial/group-waf/group-waf.component.ts
+++ b/admin/webapp/websrc/app/routes/components/group-details/partial/group-waf/group-waf.component.ts
@@ -137,6 +137,7 @@ export class GroupWafComponent implements OnInit, OnChanges {
           status: this.enabled,
           warning: warning,
           refresh: this.refresh,
+          source: this.source,
         },
       });
     }, 200);
diff --git a/admin/webapp/websrc/app/routes/components/groups/groups.component.ts b/admin/webapp/websrc/app/routes/components/groups/groups.component.ts
index 5ceed8646..33f9d1110 100644
--- a/admin/webapp/websrc/app/routes/components/groups/groups.component.ts
+++ b/admin/webapp/websrc/app/routes/components/groups/groups.component.ts
@@ -38,6 +38,7 @@ import { ExportOptionsModalComponent } from '@components/export-options-modal/ex
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { TitleCasePipe } from '@angular/common';
 import { GlobalVariable } from '@common/variables/global.variable';
+import { FederatedConfigurationService } from '@services/federated-configuration.service';
 import * as $ from 'jquery';
 
 @Component({
@@ -95,7 +96,8 @@ export class GroupsComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private ruleDetailModalService: RuleDetailModalService,
     private domSanitizer: DomSanitizer,
-    private titleCasePipe: TitleCasePipe
+    private titleCasePipe: TitleCasePipe,
+    public federatedConfigurationService: FederatedConfigurationService
   ) {}
 
   ngOnInit(): void {
@@ -165,8 +167,13 @@ export class GroupsComponent implements OnInit, OnDestroy {
         )}: ${nonScorableGroups}`;
         let counts = this.getModeCounts();
         this.baselineProfile = this.getDefaultBaseline(counts.baselineCount);
-        this.groupsService.activeTabIndex =
-          this.groupsService.activeTabIndex || 0;
+        if (this.source === GlobalConstant.NAV_SOURCE.FED_POLICY) {
+          this.federatedConfigurationService.activeTabIndex4Group =
+            this.federatedConfigurationService.activeTabIndex4Group || 0;
+        } else {
+          this.groupsService.activeTabIndex =
+            this.groupsService.activeTabIndex || 0;
+        }
       }, 0);
     };
     if (this.isScoreImprovement) {
@@ -403,9 +410,9 @@ export class GroupsComponent implements OnInit, OnDestroy {
 
     dialogRef.afterClosed().subscribe((result: RemoteExportOptionsWrapper) => {
       if (result) {
-        const { policy_mode, profile_mode, export_mode, ...exportOptions } =
+        const { policy_mode, profile_mode, export_mode, use_name_referral, ...exportOptions } =
           result.export_options;
-        this.exportUtil(export_mode, exportOptions, policy_mode, profile_mode);
+        this.exportUtil(export_mode, exportOptions, policy_mode, profile_mode, use_name_referral);
       }
     });
   };
@@ -414,13 +421,15 @@ export class GroupsComponent implements OnInit, OnDestroy {
     mode: string,
     option: RemoteExportOptions,
     policyMode: string,
-    profileMode: string
+    profileMode: string,
+    useNameRef: boolean,
   ) {
     if (mode === 'local') {
       let payload = {
         groups: this.selectedGroups.map(group => group.name),
         policy_mode: this.titleCasePipe.transform(policyMode),
         profile_mode: this.titleCasePipe.transform(profileMode),
+        use_name_referral: useNameRef,
       };
       this.groupsService.exportGroupsConfigData(payload).subscribe(
         response => {
@@ -444,6 +453,7 @@ export class GroupsComponent implements OnInit, OnDestroy {
         policy_mode: this.titleCasePipe.transform(policyMode),
         profile_mode: this.titleCasePipe.transform(profileMode),
         remote_export_options: option,
+        use_name_referral: useNameRef,
       };
       this.groupsService.exportGroupsConfigData(payload).subscribe(
         response => {
diff --git a/admin/webapp/websrc/app/routes/components/groups/groups.module.ts b/admin/webapp/websrc/app/routes/components/groups/groups.module.ts
index 90ec6fcfb..056faafee 100644
--- a/admin/webapp/websrc/app/routes/components/groups/groups.module.ts
+++ b/admin/webapp/websrc/app/routes/components/groups/groups.module.ts
@@ -18,6 +18,7 @@ import { RuleDetailModalComponent } from './partial/rule-detail-modal/rule-detai
 import { RuleDetailModalService } from '@components/groups/partial/rule-detail-modal/rule-detail-modal.service';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { ExportOptionsModalModule } from '@components/export-options-modal/export-options-modal.module';
+import { FederatedConfigurationService } from '@services/federated-configuration.service';
 
 @NgModule({
   declarations: [
@@ -42,7 +43,11 @@ import { ExportOptionsModalModule } from '@components/export-options-modal/expor
     // AgGridModule.withComponents([ActionButtonsComponent]),
     ExportOptionsModalModule,
   ],
-  providers: [ServiceModeService, RuleDetailModalService],
+  providers: [
+    ServiceModeService,
+    RuleDetailModalService,
+    FederatedConfigurationService,
+  ],
   exports: [GroupsComponent],
 })
 export class GroupsModule {}
diff --git a/admin/webapp/websrc/app/routes/components/ui/adjustable-div/adjustable-div.component.ts b/admin/webapp/websrc/app/routes/components/ui/adjustable-div/adjustable-div.component.ts
index df7da7798..4b6d72de8 100644
--- a/admin/webapp/websrc/app/routes/components/ui/adjustable-div/adjustable-div.component.ts
+++ b/admin/webapp/websrc/app/routes/components/ui/adjustable-div/adjustable-div.component.ts
@@ -4,9 +4,11 @@ import {
   Directive,
   Input,
   OnDestroy,
+  OnInit,
   Renderer2,
   TemplateRef,
 } from '@angular/core';
+import { GlobalConstant } from '@common/constants/global.constant';
 
 interface ContainerOneHeightContext {
   $implicit: number;
@@ -35,24 +37,33 @@ export class ContainerTwoDirective {
   templateUrl: './adjustable-div.component.html',
   styleUrls: ['./adjustable-div.component.scss'],
 })
-export class AdjustableDivComponent implements OnDestroy {
+export class AdjustableDivComponent implements OnInit, OnDestroy {
   @ContentChild(ContainerOneDirective, { static: true })
   containerOneDir!: ContainerOneDirective;
   @ContentChild(ContainerTwoDirective, { static: true })
   containerTwoDir!: ContainerTwoDirective;
 
+  @Input() source: string = '';
   @Input() minHeightOne;
   @Input() minHeightTwo;
   @Input() roof = 157.4 - 40;
-  unknownScale = 75.6;
-  gridHeight = window.innerHeight - this.roof - this.unknownScale;
-  heightOne = this.gridHeight / 2;
-  heightTwo = this.gridHeight / 2;
+  unknownScale = 0;
+  gridHeight = 0;
+  heightOne = 0;
+  heightTwo = 0;
   mousemoveListener;
   mouseupListener;
 
   constructor(private renderer2: Renderer2) {}
 
+  ngOnInit(): void {
+    this.unknownScale =
+      this.source === GlobalConstant.NAV_SOURCE.FED_POLICY ? 110 : 75.6;
+    this.gridHeight = window.innerHeight - this.roof - this.unknownScale;
+    this.heightOne = this.gridHeight / 2;
+    this.heightTwo = this.gridHeight / 2;
+  }
+
   get containerOneTpl(): TemplateRef<ContainerOneHeightContext> {
     return this.containerOneDir.tpl;
   }
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.html b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.html
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.html
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.html
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.scss b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.scss
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.scss
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.spec.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component.ts
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
similarity index 92%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
index 22c1ea87e..e760ec65b 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.html
@@ -32,6 +32,10 @@ <h4 mat-dialog-title class="mb-2">
             *ngIf="addEditSensorForm.controls.name.hasError('required')">
             {{ 'waf.msg.SENSOR_NAME_REQUIRED' | translate }}
           </mat-error>
+          <mat-error
+            *ngIf="addEditSensorForm.controls.name.hasError('fedName')">
+            {{ 'dlp.msg.NAME_VALID' | translate }} "fed."
+          </mat-error>
         </mat-form-field>
         <mat-form-field class="col-sm-9" appearance="standard">
           <mat-label>{{ 'waf.sensorModal.COMMENT' | translate }}</mat-label>
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.scss b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.scss
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.scss
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.spec.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
similarity index 71%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
index ac98da083..ad5c585c9 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component.ts
@@ -1,7 +1,14 @@
 import { Component, OnInit, Inject } from '@angular/core';
 import { GlobalConstant } from '@common/constants/global.constant';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { FormControl, FormGroup, Validators } from '@angular/forms';
+import {
+  FormControl,
+  FormGroup,
+  Validators,
+  ValidatorFn,
+  AbstractControl,
+  ValidationErrors,
+} from '@angular/forms';
 import { WafSensorsService } from '@services/waf-sensors.service';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationService } from '@services/notification.service';
@@ -32,9 +39,13 @@ export class AddEditSensorModalComponent implements OnInit {
     this.addEditSensorForm = new FormGroup({
       name: new FormControl(
         this.data.opType === GlobalConstant.MODAL_OP.ADD
-          ? ''
+          ? this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+            ? 'fed.'
+            : ''
           : this.data.sensor.name,
-        Validators.required
+        this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+          ? [Validators.required, this.fedNameValidator()]
+          : Validators.required
       ),
       comment: new FormControl(
         this.data.opType === GlobalConstant.MODAL_OP.ADD
@@ -44,6 +55,13 @@ export class AddEditSensorModalComponent implements OnInit {
     });
   }
 
+  fedNameValidator = (): ValidatorFn => {
+    return (control: AbstractControl): ValidationErrors | null => {
+      const isValid = control.value.startsWith('fed.');
+      return isValid ? null : { fedName: { value: control.value } };
+    };
+  };
+
   onCancel = () => {
     this.dialogRef.close(false);
   };
@@ -67,14 +85,26 @@ export class AddEditSensorModalComponent implements OnInit {
             [
               this.data.opType === GlobalConstant.MODAL_OP.ADD
                 ? {
-                    cfg_type: GlobalConstant.CFG_TYPE.CUSTOMER,
+                    cfg_type:
+                      this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+                        ? GlobalConstant.CFG_TYPE.FED
+                        : GlobalConstant.CFG_TYPE.CUSTOMER,
                     comment: this.addEditSensorForm.value.comment,
                     groups: [],
                     name: this.addEditSensorForm.value.name,
                     predefine: false,
                     rules: [],
                   }
-                : this.addEditSensorForm.value,
+                : {
+                    ...this.addEditSensorForm.value,
+                    groups: [],
+                    predefine: false,
+                    rules: [],
+                    cfg_type:
+                      this.data.source === GlobalConstant.NAV_SOURCE.FED_POLICY
+                        ? GlobalConstant.CFG_TYPE.FED
+                        : GlobalConstant.CFG_TYPE.CUSTOMER,
+                  },
             ],
             this.data.gridApi,
             'name',
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.html b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.html
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.html
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.html
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.scss b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.scss
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.scss
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.spec.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/pattern-action-buttons/pattern-action-buttons.component.ts
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.html b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
similarity index 68%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
index 2ba2901b0..44352e5e0 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.html
@@ -1,4 +1,11 @@
-<div *ngIf="!isPredefine">
+<div
+  *ngIf="
+    !isPredefine &&
+    ((params.context.componentParent.source !== navSource.FED_POLICY &&
+      params.data.cfg_type !== CFG_TYPE.FED) ||
+      (params.context.componentParent.source === navSource.FED_POLICY &&
+        params.data.cfg_type === CFG_TYPE.FED))
+  ">
   <div class="rule-actions-expand fade-in-right">
     <em
       class="eos-icons icon-18 hand text-action"
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.scss b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.scss
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.scss
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.spec.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
similarity index 95%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
index bdd8a8720..c4445342b 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/rule-action-buttons/rule-action-buttons.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ICellRendererAngularComp } from 'ag-grid-angular';
 import { ICellRendererParams } from 'ag-grid-community';
-import { AddEditRuleModalComponent } from '@routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component';
+import { AddEditRuleModalComponent } from '@components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component';
 import { MatDialog } from '@angular/material/dialog';
 import { GlobalConstant } from '@common/constants/global.constant';
 import { ConfirmDialogComponent } from '@components/ui/confirm-dialog/confirm-dialog.component';
@@ -20,6 +20,8 @@ import { UtilsService } from '@common/utils/app.utils';
 export class RuleActionButtonsComponent implements ICellRendererAngularComp {
   params!: ICellRendererParams;
   isPredefine!: boolean;
+  navSource = GlobalConstant.NAV_SOURCE;
+  CFG_TYPE = GlobalConstant.CFG_TYPE;
 
   constructor(
     private translate: TranslateService,
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
similarity index 67%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
index e93ba983e..c1e9baeef 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.html
@@ -1,4 +1,12 @@
-<div *ngIf="params && !params.data.predefine">
+<div
+  *ngIf="
+    params &&
+    !params.data.predefine &&
+    ((params.context.componentParent.source !== navSource.FED_POLICY &&
+      params.data.cfg_type !== CFG_TYPE.FED) ||
+      (params.context.componentParent.source === navSource.FED_POLICY &&
+        params.data.cfg_type === CFG_TYPE.FED))
+  ">
   <div class="rule-actions-expand fade-in-right">
     <em
       class="eos-icons icon-18 hand text-action"
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.scss b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.scss
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.scss
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.spec.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
similarity index 92%
rename from admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
index 99b752fd1..284fe2ab2 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/partial/sensor-action-buttons/sensor-action-buttons.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ICellRendererAngularComp } from 'ag-grid-angular';
 import { ICellRendererParams } from 'ag-grid-community';
-import { AddEditSensorModalComponent } from '@routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component';
+import { AddEditSensorModalComponent } from '@components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component';
 import { MatDialog } from '@angular/material/dialog';
 import { GlobalConstant } from '@common/constants/global.constant';
 import { ConfirmDialogComponent } from '@components/ui/confirm-dialog/confirm-dialog.component';
@@ -20,6 +20,8 @@ import { updateGridData } from '@common/utils/common.utils';
 })
 export class SensorActionButtonsComponent implements ICellRendererAngularComp {
   params!: ICellRendererParams;
+  navSource = GlobalConstant.NAV_SOURCE;
+  CFG_TYPE = GlobalConstant.CFG_TYPE;
 
   constructor(
     private dialog: MatDialog,
@@ -47,6 +49,7 @@ export class SensorActionButtonsComponent implements ICellRendererAngularComp {
         index: this.params.rowIndex,
         wafSensors: this.params.context.componentParent.wafSensors,
         gridApi: this.params.context.componentParent.gridApi4Sensors!,
+        source: this.params.context.componentParent.source,
       },
     });
   };
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.html b/admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.html
similarity index 88%
rename from admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.html
rename to admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.html
index 8266daf65..272454840 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.html
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.html
@@ -1,5 +1,7 @@
 <div class="screen-area">
-  <div class="d-flex justify-content-between align-items-center">
+  <div
+    *ngIf="source !== navSource['FED_POLICY']"
+    class="d-flex justify-content-between align-items-center">
     <h1 class="font-weight-light">
       {{ 'sidebar.nav.WAF_SENSORS' | translate }}
     </h1>
@@ -35,7 +37,10 @@ <h1 class="font-weight-light">
     </div>
   </div>
   <ng-container>
-    <app-adjustable-div [minHeightOne]="163" [minHeightTwo]="140">
+    <app-adjustable-div
+      [source]="source"
+      [minHeightOne]="163"
+      [minHeightTwo]="140">
       <ng-container *appContainerOne="let height">
         <mat-card [ngStyle]="{ height: height + 'px' }" class="pt-0">
           <div class="d-flex justify-content-between align-items-center">
@@ -93,7 +98,14 @@ <h1 class="font-weight-light">
           <div class="row margin-top-m">
             <div class="col-sm-3" style="position: relative">
               <button
-                *ngIf="!isPredefine && isWriteWAFSensorAuthorized"
+                *ngIf="
+                  !isPredefine &&
+                  isWriteWAFSensorAuthorized &&
+                  ((source !== navSource.FED_POLICY &&
+                    selectedSensor.cfg_type !== CFG_TYPE.FED) ||
+                    (source === navSource.FED_POLICY &&
+                      selectedSensor.cfg_type === CFG_TYPE.FED))
+                "
                 style="position: absolute; z-index: 10; right: 17px; top: 4px"
                 (click)="openAddWafRuleModal()">
                 <em
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.scss b/admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.scss
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.scss
rename to admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.scss
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.spec.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.spec.ts
similarity index 100%
rename from admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.spec.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.spec.ts
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.ts
similarity index 94%
rename from admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.ts
index e73909775..ea15ff63b 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.component.ts
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Input, ElementRef } from '@angular/core';
 import { AuthUtilsService } from '@common/utils/auth.utils';
 import {
   WafSensor,
@@ -13,8 +13,8 @@ import { GlobalConstant } from '@common/constants/global.constant';
 import { PathConstant } from '@common/constants/path.constant';
 import { MapConstant } from '@common/constants/map.constant';
 import { GlobalVariable } from '@common/variables/global.variable';
-import { AddEditSensorModalComponent } from '@routes/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component';
-import { AddEditRuleModalComponent } from '@routes/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component';
+import { AddEditSensorModalComponent } from '@components/waf-sensors/partial/add-edit-sensor-modal/add-edit-sensor-modal.component';
+import { AddEditRuleModalComponent } from '@components/waf-sensors/partial/add-edit-rule-modal/add-edit-rule-modal.component';
 import { UtilsService } from '@common/utils/app.utils';
 import { saveAs } from 'file-saver';
 import { ImportFileModalComponent } from '@components/ui/import-file-modal/import-file-modal.component';
@@ -31,6 +31,9 @@ import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
   styleUrls: ['./waf-sensors.component.scss'],
 })
 export class WafSensorsComponent implements OnInit {
+  @Input() source: string;
+  navSource = GlobalConstant.NAV_SOURCE;
+  CFG_TYPE = GlobalConstant.CFG_TYPE;
   wafSensors: Array<WafSensor> = [];
   refreshing$ = new Subject();
   isWriteWAFSensorAuthorized: boolean = false;
@@ -59,6 +62,7 @@ export class WafSensorsComponent implements OnInit {
   }
 
   constructor(
+    private el: ElementRef,
     private wafSensorsService: WafSensorsService,
     private dialog: MatDialog,
     private authUtilsService: AuthUtilsService,
@@ -75,7 +79,8 @@ export class WafSensorsComponent implements OnInit {
       this.authUtilsService.getDisplayFlag('write_waf_rule') &&
       !this.authUtilsService.userPermission.isNamespaceUser;
     this.gridOptions = this.wafSensorsService.configGrids(
-      this.isWriteWAFSensorAuthorized
+      this.isWriteWAFSensorAuthorized,
+      this.source
     );
     this.gridOptions4Sensors = this.gridOptions.gridOptions;
     this.gridOptions4Sensors.onGridReady = params => {
@@ -150,6 +155,7 @@ export class WafSensorsComponent implements OnInit {
     const addEditDialogRef = this.dialog.open(AddEditSensorModalComponent, {
       width: '80%',
       data: {
+        source: this.source,
         opType: GlobalConstant.MODAL_OP.ADD,
         wafSensors: this.wafSensors,
         gridApi: this.gridApi4Sensors!,
@@ -274,7 +280,7 @@ export class WafSensorsComponent implements OnInit {
 
   private getWafSensors = (index: number) => {
     this.wafSensorsService
-      .getWafSensorsData()
+      .getWafSensorsData(this.source)
       .pipe(finalize(() => this.refreshing$.next(false)))
       .subscribe(
         response => {
diff --git a/admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.module.ts b/admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.module.ts
similarity index 84%
rename from admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.module.ts
rename to admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.module.ts
index bffd4beab..663827557 100644
--- a/admin/webapp/websrc/app/routes/waf-sensors/waf-sensors.module.ts
+++ b/admin/webapp/websrc/app/routes/components/waf-sensors/waf-sensors.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { Routes, RouterModule } from '@angular/router';
 import { NvCommonModule } from '@common/nvCommon.module';
 import { AdjustableDivModule } from '@components/ui/adjustable-div/adjustable-div.module';
 import { AgGridModule } from 'ag-grid-angular';
@@ -16,11 +15,6 @@ import { PatternActionButtonsComponent } from './partial/pattern-action-buttons/
 import { ImportFileModalModule } from '@components/ui/import-file-modal/import-file-modal.module';
 import { ExportOptionsModalModule } from '@components/export-options-modal/export-options-modal.module';
 
-const routes: Routes = [
-  { path: '', component: WafSensorsComponent },
-  { path: '*', redirectTo: '' },
-];
-
 @NgModule({
   declarations: [
     WafSensorsComponent,
@@ -38,13 +32,9 @@ const routes: Routes = [
     PipeModule,
     LoadingButtonModule,
     ImportFileModalModule,
-    RouterModule.forChild(routes),
     AgGridModule,
-    // AgGridModule.withComponents([
-    //   SensorActionButtonsComponent,
-    //   RuleActionButtonsComponent,
-    // ]),
     ExportOptionsModalModule,
   ],
+  exports: [WafSensorsComponent],
 })
 export class WafSensorsModule {}
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.html b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.html
new file mode 100644
index 000000000..c2bbf64e3
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.html
@@ -0,0 +1 @@
+<app-dlp-sensors></app-dlp-sensors>
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.scss b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.spec.ts b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.spec.ts
new file mode 100644
index 000000000..7c526f46c
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DlpSensorsPageComponent } from './dlp-sensors-page.component';
+
+describe('DlpSensorsPageComponent', () => {
+  let component: DlpSensorsPageComponent;
+  let fixture: ComponentFixture<DlpSensorsPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [DlpSensorsPageComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DlpSensorsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.ts b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.ts
new file mode 100644
index 000000000..580b4a03d
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.component.ts
@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { GlobalConstant } from '@common/constants/global.constant';
+
+@Component({
+  selector: 'app-dlp-sensors-page',
+  templateUrl: './dlp-sensors-page.component.html',
+  styleUrls: ['./dlp-sensors-page.component.scss'],
+})
+export class DlpSensorsPageComponent implements OnInit {
+  public navSource: string;
+  constructor() {}
+
+  ngOnInit(): void {
+    this.navSource = GlobalConstant.NAV_SOURCE.SELF;
+  }
+}
diff --git a/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.module.ts b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.module.ts
new file mode 100644
index 000000000..09ad309f9
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/dlp-sensors-page/dlp-sensors-page.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { Routes, RouterModule } from '@angular/router';
+import { DlpSensorsPageComponent } from './dlp-sensors-page.component';
+import { DlpSensorsModule } from '@components/dlp-sensors/dlp-sensors.module';
+
+const routes: Routes = [
+  { path: '', component: DlpSensorsPageComponent },
+  { path: '*', redirectTo: '' },
+];
+
+@NgModule({
+  declarations: [DlpSensorsPageComponent],
+  imports: [CommonModule, DlpSensorsModule, RouterModule.forChild(routes)],
+})
+export class DlpSensorsPageModule {}
diff --git a/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.html b/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.html
new file mode 100644
index 000000000..6a3b447a6
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.html
@@ -0,0 +1,312 @@
+<div style="position: relative">
+  <ng-container [ngSwitch]="activeTab">
+    <ng-container *ngSwitchCase="'member'">
+      <div class="filter" style="position: absolute; right: 20px; top: -10px">
+        <mat-form-field appearance="standard">
+          <mat-label>{{ 'enum.FILTER' | translate }}</mat-label>
+          <input [formControl]="filter" matInput />
+        </mat-form-field>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'process profile rules'">
+      <div
+        style="position: absolute; right: 20px; top: -10px; z-index: 100"
+        class="d-flex align-items-center justify-content-end">
+        <button
+          *ngIf="isWriteGroupAuthorized"
+          mat-button
+          class="mr-2 mt-1"
+          [matMenuTriggerFor]="menu"
+          aria-label="Action menu">
+          <mat-icon>more_vert</mat-icon>
+          {{ 'policy.ACTIONS' | translate }}
+        </button>
+        <mat-menu #menu="matMenu">
+          <div>
+            <button
+              mat-button
+              *ngIf="
+                selectedProcessProfileRules &&
+                selectedProcessProfileRules.length >= 1 &&
+                isWriteGroupAuthorized &&
+                !isIncludingGroundRule()
+              "
+              (click)="removeProfile(selectedProcessProfileRules)">
+              <em class="eos-icons">delete</em>
+              {{ 'service.DELETE_RULE' | translate }}
+            </button>
+          </div>
+          <div>
+            <button
+              mat-button
+              *ngIf="
+                selectedProcessProfileRules &&
+                selectedProcessProfileRules.length === 1 &&
+                isWriteGroupAuthorized &&
+                !isIncludingGroundRule()
+              "
+              (click)="editProfile(selectedProcessProfileRules)">
+              <em class="eos-icons">edit</em>
+              {{ 'service.EDIT_RULE' | translate }}
+            </button>
+          </div>
+          <div>
+            <button
+              mat-button
+              *ngIf="isWriteGroupAuthorized"
+              (click)="addProfile()">
+              <em class="eos-icons">add</em>
+              {{ 'service.ADD_RULE' | translate }}
+            </button>
+          </div>
+        </mat-menu>
+        <div class="filter">
+          <mat-form-field appearance="standard">
+            <mat-label>{{ 'enum.FILTER' | translate }}</mat-label>
+            <input [formControl]="filter" matInput />
+          </mat-form-field>
+        </div>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'file access rules'">
+      <div
+        style="position: absolute; right: 20px; top: -10px; z-index: 100"
+        class="d-flex align-items-center justify-content-end">
+        <button
+          *ngIf="isWriteGroupAuthorized"
+          mat-button
+          class="mr-2 mt-1"
+          [matMenuTriggerFor]="menu"
+          aria-label="Action menu">
+          <mat-icon>more_vert</mat-icon>
+          {{ 'policy.ACTIONS' | translate }}
+        </button>
+        <mat-menu #menu="matMenu">
+          <div>
+            <button
+              mat-button
+              *ngIf="selectedFileAccessRules && isWriteGroupAuthorized"
+              (click)="removeProfile(selectedFileAccessRules)">
+              <em class="eos-icons">delete</em>
+              {{ 'service.DELETE_RULE' | translate }}
+            </button>
+          </div>
+          <div>
+            <button
+              mat-button
+              *ngIf="selectedFileAccessRules && isWriteGroupAuthorized"
+              (click)="editProfile(selectedFileAccessRules)">
+              <em class="eos-icons">edit</em>
+              {{ 'service.EDIT_RULE' | translate }}
+            </button>
+          </div>
+          <div>
+            <button
+              mat-button
+              *ngIf="isWriteGroupAuthorized"
+              (click)="addProfile()">
+              <em class="eos-icons">add</em>
+              {{ 'service.ADD_RULE' | translate }}
+            </button>
+          </div>
+          <div>
+            <button mat-button (click)="showPredefinedRules()">
+              <em class="eos-icons">info</em>
+              <span class="text-plain">{{
+                'service.PREDEFINED_FILTERS' | translate
+              }}</span>
+            </button>
+          </div>
+        </mat-menu>
+        <div class="filter">
+          <mat-form-field appearance="standard">
+            <mat-label>{{ 'enum.FILTER' | translate }}</mat-label>
+            <input [formControl]="filter" matInput />
+          </mat-form-field>
+        </div>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'network rules'">
+      <div class="filter" style="position: absolute; right: 20px; top: -10px">
+        <mat-form-field appearance="standard">
+          <mat-label>{{ 'enum.FILTER' | translate }}</mat-label>
+          <input [formControl]="filter" matInput />
+        </mat-form-field>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'response rules'">
+      <div class="filter" style="position: absolute; right: 20px; top: -10px">
+        <mat-form-field appearance="standard">
+          <mat-label>{{ 'enum.FILTER' | translate }}</mat-label>
+          <input [formControl]="filter" matInput />
+        </mat-form-field>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'DLP'">
+      <div
+        style="position: absolute; right: 20px; top: -10px; z-index: 100"
+        class="d-flex align-items-center justify-content-end">
+        <button
+          mat-button
+          class="mr-2 mt-1"
+          [matMenuTriggerFor]="menu"
+          aria-label="Action menu">
+          <mat-icon>more_vert</mat-icon>
+          {{ 'policy.ACTIONS' | translate }}
+        </button>
+        <mat-menu #menu="matMenu">
+          <button
+            mat-button
+            *ngIf="isWriteDlpAuthorized"
+            class="hand"
+            (click)="editGroupSensorModal()">
+            <em class="eos-icons">edit</em>
+            {{ 'group.CONFIG' | translate }}
+          </button>
+        </mat-menu>
+        <div class="filter">
+          <mat-form-field appearance="standard">
+            <mat-label>{{ 'enum.FILTER' | translate }}</mat-label>
+            <input [formControl]="filter" matInput />
+          </mat-form-field>
+        </div>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'WAF'">
+      <div
+        style="position: absolute; right: 20px; top: -10px; z-index: 100"
+        class="d-flex align-items-center justify-content-end">
+        <button
+          mat-button
+          class="mr-2 mt-1"
+          [matMenuTriggerFor]="menu"
+          aria-label="Action menu">
+          <mat-icon>more_vert</mat-icon>
+          {{ 'policy.ACTIONS' | translate }}
+        </button>
+        <mat-menu #menu="matMenu">
+          <button
+            mat-button
+            *ngIf="isWriteWafAuthorized"
+            class="hand"
+            (click)="editGroupSensorModal()">
+            <em class="eos-icons">edit</em>
+            {{ 'group.CONFIG' | translate }}
+          </button>
+        </mat-menu>
+        <div class="filter">
+          <mat-form-field appearance="standard">
+            <mat-label>{{ 'enum.FILTER' | translate }}</mat-label>
+            <input [formControl]="filter" matInput />
+          </mat-form-field>
+        </div>
+      </div>
+    </ng-container>
+  </ng-container>
+</div>
+<mat-tab-group
+  id="group-details"
+  *ngIf="groupName"
+  [selectedIndex]="federatedConfigurationService.activeTabIndex4Group"
+  (selectedTabChange)="activateTab4Group($event)"
+  animationDuration="0ms">
+  <mat-tab label="{{ 'group.gridHeader.MEMBERS' | translate }}">
+    <app-members
+      *ngIf="federatedConfigurationService.activeTabIndex4Group === 0"
+      [source]="navSource4Group"
+      [members]="members"
+      [kind]="kind"
+      [resizableHeight]="height"
+      [useQuickFilterService]="true">
+    </app-members>
+  </mat-tab>
+  <mat-tab
+    label="{{ 'service.PROCESS_PROFILE' | translate }}"
+    [labelClass]="kind === 'container' || kind === 'node' ? '' : 'hide'">
+    <app-process-profile-rules
+      *ngIf="
+        federatedConfigurationService.activeTabIndex4Group === 1 &&
+        (kind === 'container' || kind === 'node')
+      "
+      [source]="navSource4Group"
+      [groupName]="groupName"
+      [resizableHeight]="height"
+      [useQuickFilterService]="true"
+      (getSelectedFileAccessRules)="getSelectedFileAccessRules($event)"
+      (getRemoveProfile)="getRemoveProfile($event)"
+      (getEditProfile)="getEditProfile($event)"
+      (getAddProfile)="getAddProfile($event)"
+      (getShowPredefinedRules)="getShowPredefinedRules($event)"
+      [cfgType]="CFG_TYPE.FED"></app-process-profile-rules>
+  </mat-tab>
+  <mat-tab
+    label="{{ 'service.FILE_PROFILE' | translate }}"
+    [labelClass]="kind === 'container' ? '' : 'hide'">
+    <app-file-access-rules
+      *ngIf="
+        federatedConfigurationService.activeTabIndex4Group === 2 &&
+        kind === 'container'
+      "
+      [source]="navSource4Group"
+      [groupName]="groupName"
+      [resizableHeight]="height"
+      [useQuickFilterService]="true"
+      (getSelectedProcessProfileRules)="getSelectedProcessProfileRules($event)"
+      (getRemoveProfile)="getRemoveProfile($event)"
+      (getEditProfile)="getEditProfile($event)"
+      (getAddProfile)="getAddProfile($event)"
+      [cfgType]="CFG_TYPE.FED"></app-file-access-rules>
+  </mat-tab>
+  <mat-tab label="{{ 'service.POLICY_RULES' | translate }}">
+    <app-network-rules
+      *ngIf="federatedConfigurationService.activeTabIndex4Group === 3"
+      [source]="navSource4Group"
+      [groupName]="groupName"
+      [useQuickFilterService]="true"
+      [resizableHeight]="height">
+    </app-network-rules>
+  </mat-tab>
+  <mat-tab label="{{ 'group.RESPONSE_RULES' | translate }}">
+    <app-response-rules
+      *ngIf="federatedConfigurationService.activeTabIndex4Group === 4"
+      [source]="navSource4Group"
+      [groupName]="groupName"
+      [useQuickFilterService]="true"
+      [resizableHeight]="height">
+    </app-response-rules>
+  </mat-tab>
+  <mat-tab
+    label="{{ 'group.dlp.TITLE' | translate }}"
+    [labelClass]="kind === 'container' ? '' : 'hide'">
+    <app-group-dlp
+      *ngIf="
+        federatedConfigurationService.activeTabIndex4Group === 5 &&
+        kind === 'container'
+      "
+      (getEditGroupSensorModal)="getEditGroupSensorModal($event)"
+      (getToggleDLPConfigEnablement)="getToggleDLPConfigEnablement($event)"
+      (getStatus)="getStatus($event)"
+      [source]="navSource4Group"
+      [groupName]="groupName"
+      [useQuickFilterService]="true"
+      [resizableHeight]="height">
+    </app-group-dlp>
+  </mat-tab>
+  <mat-tab
+    label="{{ 'group.waf.TITLE' | translate }}"
+    [labelClass]="kind === 'container' ? '' : 'hide'">
+    <app-group-waf
+      *ngIf="
+        federatedConfigurationService.activeTabIndex4Group === 6 &&
+        kind === 'container'
+      "
+      (getEditGroupSensorModal)="getEditGroupSensorModal($event)"
+      (getToggleWAFConfigEnablement)="getToggleWAFConfigEnablement($event)"
+      (getStatus)="getStatus($event)"
+      [source]="navSource4Group"
+      [groupName]="groupName"
+      [useQuickFilterService]="true"
+      [resizableHeight]="height">
+    </app-group-waf>
+  </mat-tab>
+</mat-tab-group>
diff --git a/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.scss b/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.spec.ts b/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.spec.ts
new file mode 100644
index 000000000..48b95f405
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FedGroupDetailsComponent } from './fed-group-details.component';
+
+describe('FedGroupDetailsComponent', () => {
+  let component: FedGroupDetailsComponent;
+  let fixture: ComponentFixture<FedGroupDetailsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [FedGroupDetailsComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(FedGroupDetailsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.ts b/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.ts
new file mode 100644
index 000000000..7ba1c336c
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/federated-policy/fed-group-details/fed-group-details.component.ts
@@ -0,0 +1,152 @@
+import {
+  Component,
+  OnInit,
+  HostListener,
+  ViewChild,
+  AfterViewInit,
+  SimpleChanges,
+  OnChanges,
+  Input,
+} from '@angular/core';
+import { GlobalConstant } from '@common/constants/global.constant';
+import { GlobalVariable } from '@common/variables/global.variable';
+import { GroupsComponent } from '@components/groups/groups.component';
+import { FederatedConfigurationService } from '@services/federated-configuration.service';
+import { FormControl } from '@angular/forms';
+import { AuthUtilsService } from '@common/utils/auth.utils';
+
+export const fedGroupDetailsTabs = [
+  'member',
+  'process profile rules',
+  'file access rules',
+  'network rules',
+  'response rules',
+  'DLP',
+  'WAF',
+];
+
+@Component({
+  selector: 'app-fed-group-details',
+  templateUrl: './fed-group-details.component.html',
+  styleUrls: ['./fed-group-details.component.scss'],
+})
+export class FedGroupDetailsComponent implements OnInit {
+  @Input() kind: string;
+  @Input() groupName: string;
+  @Input() members: any;
+  @Input() height: number;
+  public CFG_TYPE: any = GlobalConstant.CFG_TYPE;
+  public navSource4Group: string = '';
+  public showPredefinedRules: any;
+  public enabled: boolean;
+  public editGroupSensorModal: any;
+  public toggleWAFConfigEnablement: any;
+  public toggleDLPConfigEnablement: any;
+  public removeProfile: any;
+  public editProfile: any;
+  public addProfile: any;
+  public selectedFileAccessRules: any;
+  public selectedProcessProfileRules: any;
+  public isWriteWafAuthorized: boolean;
+  public isWriteDlpAuthorized: boolean;
+  public isWriteGroupAuthorized: boolean;
+  public isWriteFileAccessRuleAuthorized: boolean;
+  public isWriteProcessProfileRuleAuthorized: boolean;
+  public filter = new FormControl('');
+  get activeTab(): string {
+    return fedGroupDetailsTabs[
+      this.federatedConfigurationService.activeTabIndex4Group
+    ];
+  }
+
+  constructor(
+    public federatedConfigurationService: FederatedConfigurationService,
+    private authUtilsService: AuthUtilsService
+  ) {}
+
+  ngOnInit(): void {
+    this.isWriteGroupAuthorized =
+      this.authUtilsService.getDisplayFlag('write_group') &&
+      this.authUtilsService.getDisplayFlag('multi_cluster_w');
+    this.isWriteWafAuthorized =
+      this.authUtilsService.getDisplayFlag('write_waf_rule') &&
+      this.authUtilsService.getDisplayFlag('multi_cluster_w');
+    this.isWriteDlpAuthorized =
+      this.authUtilsService.getDisplayFlag('write_dlp_rule') &&
+      this.authUtilsService.getDisplayFlag('multi_cluster_w');
+    this.navSource4Group = GlobalConstant.NAV_SOURCE.GROUP;
+  }
+
+  ngAfterViewInit() {
+    const TAB_VISIBLE_MATRIX = [
+      true,
+      this.kind === 'container' || this.kind === 'node',
+      this.kind === 'container',
+      true,
+      true,
+      this.kind === 'container',
+      this.kind === 'container',
+    ];
+    if (
+      !TAB_VISIBLE_MATRIX[
+        this.federatedConfigurationService.activeTabIndex4Group
+      ]
+    )
+      this.federatedConfigurationService.activeTabIndex4Group = 0;
+  }
+
+  private setHeight = (innerHeight: number) => {
+    return (innerHeight - 210) / 2;
+  };
+
+  getStatus = enabled => {
+    this.enabled = enabled;
+  };
+
+  activateTab4Group = event => {
+    this.federatedConfigurationService.activeTabIndex4Group = event.index;
+  };
+
+  getEditGroupSensorModal = editGroupSensorModal => {
+    this.editGroupSensorModal = editGroupSensorModal;
+  };
+
+  getToggleWAFConfigEnablement = toggleWAFConfigEnablement => {
+    this.toggleWAFConfigEnablement = toggleWAFConfigEnablement;
+  };
+
+  getToggleDLPConfigEnablement = toggleDLPConfigEnablement => {
+    this.toggleDLPConfigEnablement = toggleDLPConfigEnablement;
+  };
+
+  getSelectedFileAccessRules = selectedFileAccessRules => {
+    this.selectedFileAccessRules = selectedFileAccessRules;
+  };
+
+  getSelectedProcessProfileRules = selectedProcessProfileRules => {
+    this.selectedProcessProfileRules = selectedProcessProfileRules;
+  };
+
+  getRemoveProfile = removeProfile => {
+    this.removeProfile = removeProfile;
+  };
+
+  getEditProfile = editProfile => {
+    this.editProfile = editProfile;
+  };
+
+  getAddProfile = addProfile => {
+    this.addProfile = addProfile;
+  };
+
+  getShowPredefinedRules = showPredefinedRules => {
+    this.showPredefinedRules = showPredefinedRules;
+  };
+
+  isIncludingGroundRule = () => {
+    let index = this.selectedProcessProfileRules.findIndex(
+      rule => rule.cfg_type === GlobalConstant.CFG_TYPE.GROUND
+    );
+    return index > -1;
+  };
+}
diff --git a/admin/webapp/websrc/app/routes/federated-policy/federated-policy.component.html b/admin/webapp/websrc/app/routes/federated-policy/federated-policy.component.html
index cb20f6165..c06c83624 100644
--- a/admin/webapp/websrc/app/routes/federated-policy/federated-policy.component.html
+++ b/admin/webapp/websrc/app/routes/federated-policy/federated-policy.component.html
@@ -10,12 +10,45 @@ <h1 class="font-weight-light" id="nodes-title">
         animationDuration="0ms"
         (selectedTabChange)="activateTab($event)">
         <mat-tab label="{{ 'sidebar.nav.GROUP' | translate }}">
-          <app-groups
-            *ngIf="activeTabIndex === 0"
+          <app-adjustable-div
             [source]="navSource"
-            [isScoreImprovement]="false"
-            [height]="height">
-          </app-groups>
+            [minHeightOne]="163"
+            [minHeightTwo]="140">
+            <ng-container *appContainerOne="let height">
+              <app-groups
+                *ngIf="activeTabIndex === 0"
+                [source]="navSource"
+                [isScoreImprovement]="false"
+                [height]="height">
+              </app-groups>
+            </ng-container>
+            <ng-container *appContainerTwo="let height">
+              <div *ngIf="groupsView && groupsView.selectedGroups.length > 0">
+                <app-fed-group-details
+                  [height]="height"
+                  [groupName]="groupsView.selectedGroups[0].name"
+                  [kind]="groupsView.selectedGroups[0].kind"
+                  [members]="groupsView.selectedGroups[0].members">
+                </app-fed-group-details>
+              </div>
+              <div
+                [ngStyle]="{ height: height + 'px' }"
+                *ngIf="groupsView && groupsView.selectedGroups.length === 0">
+                <mat-card-content>
+                  <div class="hint-info">
+                    <em
+                      class="eos-icons hint-info-signal mr-2"
+                      aria-hidden="true"
+                      >info</em
+                    >
+                    <div class="hint-info-text">
+                      {{ 'group.SELECT_GROUP_HINT' | translate }}
+                    </div>
+                  </div>
+                </mat-card-content>
+              </div>
+            </ng-container>
+          </app-adjustable-div>
         </mat-tab>
         <mat-tab label="{{ 'sidebar.nav.ADMISSION_CONTROL' | translate }}">
           <app-admission-rules
@@ -26,17 +59,15 @@ <h1 class="font-weight-light" id="nodes-title">
           <app-network-rules *ngIf="activeTabIndex === 2" [source]="navSource">
           </app-network-rules>
         </mat-tab>
-        <mat-tab label="{{ 'service.PROCESS_PROFILE' | translate }}">
-          <app-process-profile-rules
+        <mat-tab label="{{ 'sidebar.nav.DLP_SENSORS' | translate }}">
+          <app-dlp-sensors
             *ngIf="activeTabIndex === 3"
-            [source]="navSource"
-            [cfgType]="CFG_TYPE.FED"></app-process-profile-rules>
+            [source]="navSource"></app-dlp-sensors>
         </mat-tab>
-        <mat-tab label="{{ 'service.FILE_PROFILE' | translate }}">
-          <app-file-access-rules
+        <mat-tab label="{{ 'sidebar.nav.WAF_SENSORS' | translate }}">
+          <app-waf-sensors
             *ngIf="activeTabIndex === 4"
-            [source]="navSource"
-            [cfgType]="CFG_TYPE.FED"></app-file-access-rules>
+            [source]="navSource"></app-waf-sensors>
         </mat-tab>
         <mat-tab label="{{ 'sidebar.nav.RESPONSE_POLICY' | translate }}">
           <app-response-rules
diff --git a/admin/webapp/websrc/app/routes/federated-policy/federated-policy.component.ts b/admin/webapp/websrc/app/routes/federated-policy/federated-policy.component.ts
index 45a451e2d..5d0e7a20b 100644
--- a/admin/webapp/websrc/app/routes/federated-policy/federated-policy.component.ts
+++ b/admin/webapp/websrc/app/routes/federated-policy/federated-policy.component.ts
@@ -1,6 +1,16 @@
-import { Component, OnInit, HostListener } from '@angular/core';
+import { Component, OnInit, HostListener, ViewChild } from '@angular/core';
 import { GlobalConstant } from '@common/constants/global.constant';
 import { GlobalVariable } from '@common/variables/global.variable';
+import { GroupsComponent } from '@components/groups/groups.component';
+import { FederatedConfigurationService } from '@services/federated-configuration.service';
+import { FormControl } from '@angular/forms';
+
+export const fedGroupDetailsTabs = [
+  'process profile rules',
+  'file access rules',
+  'DLP',
+  'WAF',
+];
 
 @Component({
   selector: 'app-federated-policy',
@@ -10,10 +20,19 @@ import { GlobalVariable } from '@common/variables/global.variable';
 export class FederatedPolicyComponent implements OnInit {
   public activeTabIndex: number = 0;
   public navSource: string = '';
-  public CFG_TYPE: any = GlobalConstant.CFG_TYPE;
   public height: number = 0;
+  public CFG_TYPE: any = GlobalConstant.CFG_TYPE;
   private readonly win: any;
-  constructor() {
+  get activeTab(): string {
+    return fedGroupDetailsTabs[
+      this.federatedConfigurationService.activeTabIndex4Group
+    ];
+  }
+  @ViewChild(GroupsComponent) groupsView!: GroupsComponent;
+
+  constructor(
+    public federatedConfigurationService: FederatedConfigurationService
+  ) {
     this.win = GlobalVariable.window;
   }
 
@@ -28,11 +47,11 @@ export class FederatedPolicyComponent implements OnInit {
     this.navSource = GlobalConstant.NAV_SOURCE.FED_POLICY;
   }
 
-  activateTab(event) {
+  activateTab = event => {
     this.activeTabIndex = event.index;
-  }
+  };
 
   private setHeight = (innerHeight: number) => {
-    return innerHeight - 210;
+    return (innerHeight - 210) / 2;
   };
 }
diff --git a/admin/webapp/websrc/app/routes/federated-policy/federated-policy.module.ts b/admin/webapp/websrc/app/routes/federated-policy/federated-policy.module.ts
index 148d1546c..b023ed805 100644
--- a/admin/webapp/websrc/app/routes/federated-policy/federated-policy.module.ts
+++ b/admin/webapp/websrc/app/routes/federated-policy/federated-policy.module.ts
@@ -5,11 +5,16 @@ import { FederatedPolicyComponent } from './federated-policy.component';
 import { NvCommonModule } from '@common/nvCommon.module';
 import { ProcessProfileRulesModule } from '@components/process-profile-rules/process-profile-rules.module';
 import { FileAccessRulesModule } from '@components/file-access-rules/file-access-rules.module';
+import { GroupDetailsModule } from '@components/group-details/group-details.module';
 import { FederatedPolicyConfigurationModule } from '@components/federated-policy-configuration/federated-policy-configuration.module';
 import { ResponseRulesModule } from '@components/response-rules/response-rules.module';
 import { AdmissionRulesModule } from '@components/admission-rules/admission-rules.module';
 import { NetworkRulesModule } from '@components/network-rules/network-rules.module';
 import { GroupsModule } from '@components/groups/groups.module';
+import { AdjustableDivModule } from '@components/ui/adjustable-div/adjustable-div.module';
+import { DlpSensorsModule } from '@components/dlp-sensors/dlp-sensors.module';
+import { WafSensorsModule } from '@components/waf-sensors/waf-sensors.module';
+import { FedGroupDetailsComponent } from './fed-group-details/fed-group-details.component';
 
 const routes: Routes = [
   { path: '', component: FederatedPolicyComponent },
@@ -17,17 +22,21 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  declarations: [FederatedPolicyComponent],
+  declarations: [FederatedPolicyComponent, FedGroupDetailsComponent],
   imports: [
     CommonModule,
     NvCommonModule,
     ProcessProfileRulesModule,
     FileAccessRulesModule,
+    GroupDetailsModule,
     FederatedPolicyConfigurationModule,
     ResponseRulesModule,
     AdmissionRulesModule,
     NetworkRulesModule,
     GroupsModule,
+    AdjustableDivModule,
+    DlpSensorsModule,
+    WafSensorsModule,
     RouterModule.forChild(routes),
   ],
 })
diff --git a/admin/webapp/websrc/app/routes/routes.ts b/admin/webapp/websrc/app/routes/routes.ts
index c05917e4a..60b091380 100644
--- a/admin/webapp/websrc/app/routes/routes.ts
+++ b/admin/webapp/websrc/app/routes/routes.ts
@@ -113,15 +113,15 @@ export const routes: Routes = [
       {
         path: 'dlp-sensors',
         loadChildren: () =>
-          import('./dlp-sensors/dlp-sensors.module').then(
-            m => m.DlpSensorsModule
+          import('./dlp-sensors-page/dlp-sensors-page.module').then(
+            m => m.DlpSensorsPageModule
           ),
       },
       {
         path: 'waf-sensors',
         loadChildren: () =>
-          import('./waf-sensors/waf-sensors.module').then(
-            m => m.WafSensorsModule
+          import('./waf-sensors-page/waf-sensors-page.module').then(
+            m => m.WafSensorsPageModule
           ),
       },
       {
diff --git a/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.html b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.html
new file mode 100644
index 000000000..760ee5694
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.html
@@ -0,0 +1 @@
+<app-waf-sensors></app-waf-sensors>
diff --git a/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.scss b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.spec.ts b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.spec.ts
new file mode 100644
index 000000000..761279d27
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.spec.ts
@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { WafSensorsPageComponent } from './waf-sensors-page.component';
+
+describe('WafSensorsPageComponent', () => {
+  let component: WafSensorsPageComponent;
+  let fixture: ComponentFixture<WafSensorsPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [WafSensorsPageComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(WafSensorsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.ts b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.ts
new file mode 100644
index 000000000..ed4ef77dc
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.component.ts
@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { GlobalConstant } from '@common/constants/global.constant';
+
+@Component({
+  selector: 'app-waf-sensors-page',
+  templateUrl: './waf-sensors-page.component.html',
+  styleUrls: ['./waf-sensors-page.component.scss'],
+})
+export class WafSensorsPageComponent implements OnInit {
+  public navSource: string;
+  constructor() {}
+
+  ngOnInit(): void {
+    this.navSource = GlobalConstant.NAV_SOURCE.SELF;
+  }
+}
diff --git a/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.module.ts b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.module.ts
new file mode 100644
index 000000000..71de0ab1b
--- /dev/null
+++ b/admin/webapp/websrc/app/routes/waf-sensors-page/waf-sensors-page.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { Routes, RouterModule } from '@angular/router';
+import { WafSensorsPageComponent } from './waf-sensors-page.component';
+import { WafSensorsModule } from '@components/waf-sensors/waf-sensors.module';
+
+const routes: Routes = [
+  { path: '', component: WafSensorsPageComponent },
+  { path: '*', redirectTo: '' },
+];
+
+@NgModule({
+  declarations: [WafSensorsPageComponent],
+  imports: [CommonModule, WafSensorsModule, RouterModule.forChild(routes)],
+})
+export class WafSensorsPageModule {}
diff --git a/admin/webapp/websrc/assets/i18n/en-common.json b/admin/webapp/websrc/assets/i18n/en-common.json
index d967fcf1c..b4602fce9 100644
--- a/admin/webapp/websrc/assets/i18n/en-common.json
+++ b/admin/webapp/websrc/assets/i18n/en-common.json
@@ -2128,6 +2128,8 @@
     "POLICY_MODE": "Network Policy Mode",
     "PROFILE_MODE": "Process Profile Mode",
     "ZERODRIFT_SETTING": "Baseline Profile Setting",
+    "DOWNLOAD_LOCATION": "Download location",
+    "NAME_REFERRAL": "Use Name Referral",
     "TIP": {
       "EDIT": "Edit Group",
       "DELETE": "Remove Group",
@@ -2339,7 +2341,8 @@
       "ADD_PATTERN_NG": "Maximum amount of patterns is 16",
       "EXISTING_PATTERN_NG": "This pattern is existing!",
       "RECIPROCAL_PATTERN_NG": "There is reciprocal pattern against added pattern in the same context.",
-      "SENSOR_NAME_REQUIRED": "Sensor name is required!"
+      "SENSOR_NAME_REQUIRED": "Sensor name is required!",
+      "NAME_VALID": "Sensor name must start with: "
     },
     "TIP": {
       "EDIT_SENSOR": "Edit Sensor",
diff --git a/admin/webapp/websrc/assets/i18n/zh_cn-common.json b/admin/webapp/websrc/assets/i18n/zh_cn-common.json
index eb11d7575..db7bfb626 100644
--- a/admin/webapp/websrc/assets/i18n/zh_cn-common.json
+++ b/admin/webapp/websrc/assets/i18n/zh_cn-common.json
@@ -2128,6 +2128,8 @@
     "POLICY_MODE": "网络策略模式",
     "PROFILE_MODE": "进程配置模式",
     "ZERODRIFT_SETTING": "基线配置设置",
+    "DOWNLOAD_LOCATION": "下载到",
+    "NAME_REFERRAL": "使用组名参照",
     "TIP": {
       "EDIT": "编辑组",
       "DELETE": "删除组",
@@ -2339,7 +2341,8 @@
       "ADD_PATTERN_NG": "正则形式的最大数量为16",
       "EXISTING_PATTERN_NG": "此正则形式已存在",
       "RECIPROCAL_PATTERN_NG": "在同一语境下有与添加的正则形式互逆的表达式",
-      "SENSOR_NAME_REQUIRED": "需填写检测器名称"
+      "SENSOR_NAME_REQUIRED": "需填写检测器名称",
+      "NAME_VALID": "检测器名前缀必须是: "
     },
     "TIP": {
       "EDIT_SENSOR": "编辑检测器",