diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts
index fbbced965c..b19a588d8b 100644
--- a/ui-ngx/src/app/modules/common/modules-map.ts
+++ b/ui-ngx/src/app/modules/common/modules-map.ts
@@ -196,9 +196,14 @@ import * as CssUnitSelectComponent from '@home/components/widget/lib/settings/co
 import * as WidgetActionsPanelComponent from '@home/components/widget/config/basic/common/widget-actions-panel.component';
 import * as FontSettingsComponent from '@home/components/widget/lib/settings/common/font-settings.component';
 import * as ColorSettingsComponent from '@home/components/widget/lib/settings/common/color-settings.component';
-import * as AddEntityDialogComponent from '@home/components/entity/add-entity-dialog.component';
+import * as DisplayColumnsPanelComponent from '@home/components/widget/lib/display-columns-panel.component';
+import * as AlarmDetailsDialogComponent from '@home/components/alarm/alarm-details-dialog.component';
+import * as AlarmAssigneePanelComponent from '@home/components/alarm/alarm-assignee-panel.component';
+import * as AlarmCommentDialogComponent from '@home/components/alarm/alarm-comment-dialog.component';
+import * as AlarmFilterConfigComponent from '@home/components/alarm/alarm-filter-config.component';
 import * as DatasourceComponent from '@home/components/widget/config/datasources.component';
 import * as DataKeysPanelComponent from '@home/components/widget/config/basic/common/data-keys-panel.component';
+import * as AddEntityDialogComponent from '@home/components/entity/add-entity-dialog.component';
 import * as EntitiesTableComponent from '@home/components/entity/entities-table.component';
 import * as DetailsPanelComponent from '@home/components/details-panel.component';
 import * as EntityDetailsPanelComponent from '@home/components/entity/entity-details-panel.component';
@@ -323,11 +328,6 @@ import * as AssetProfileAutocompleteComponent from '@home/components/profile/ass
 import * as RuleChainSelectComponent from '@shared/components/rule-chain/rule-chain-select.component';
 
 import { IModulesMap } from '@modules/common/modules-map.models';
-import { DisplayColumnsPanelComponent } from '@home/components/widget/lib/display-columns-panel.component';
-import { AlarmDetailsDialogComponent } from '@home/components/alarm/alarm-details-dialog.component';
-import { AlarmAssigneePanelComponent } from '@home/components/alarm/alarm-assignee-panel.component';
-import { AlarmCommentDialogComponent } from '@home/components/alarm/alarm-comment-dialog.component';
-import { AlarmFilterConfigComponent } from '@home/components/alarm/alarm-filter-config.component';
 
 declare const System;
 
@@ -523,9 +523,13 @@ class ModulesMap implements IModulesMap {
     '@home/components/alarm/alarm-assignee-panel.component': AlarmAssigneePanelComponent,
     '@home/components/alarm/alarm-details-dialog.component': AlarmDetailsDialogComponent,
     '@home/components/widget/lib/display-columns-panel.component': DisplayColumnsPanelComponent,
-    '@home/components/entity/add-entity-dialog.component': AddEntityDialogComponent,
     '@home/components/widget/config/datasources.component': DatasourceComponent,
     '@home/components/widget/config/basic/common/data-keys-panel.component': DataKeysPanelComponent,
+    '@home/components/widget/lib/settings/common/color-settings.component': ColorSettingsComponent,
+    '@home/components/widget/lib/settings/common/font-settings.component': FontSettingsComponent,
+    '@home/components/widget/config/basic/common/widget-actions-panel.component': WidgetActionsPanelComponent,
+    '@home/components/widget/lib/settings/common/css-unit-select.component': CssUnitSelectComponent,
+    '@home/components/entity/add-entity-dialog.component': AddEntityDialogComponent,
     '@home/components/entity/entities-table.component': EntitiesTableComponent,
     '@home/components/details-panel.component': DetailsPanelComponent,
     '@home/components/entity/entity-details-panel.component': EntityDetailsPanelComponent,
@@ -644,11 +648,7 @@ class ModulesMap implements IModulesMap {
     '@home/components/dashboard-page/dashboard-image-dialog.component': DashboardImageDialogComponent,
     '@home/components/widget/widget-container.component': WidgetContainerComponent,
     '@home/components/profile/queue/tenant-profile-queues.component': TenantProfileQueuesComponent,
-    '@home/components/queue/queue-form.component': QueueFormComponent,
-    '@home/components/widget/lib/settings/common/color-settings.component': ColorSettingsComponent,
-    '@home/components/widget/lib/settings/common/font-settings.component': FontSettingsComponent,
-    '@home/components/widget/config/basic/common/widget-actions-panel.component': WidgetActionsPanelComponent,
-    '@home/components/widget/lib/settings/common/css-unit-select.component': CssUnitSelectComponent
+    '@home/components/queue/queue-form.component': QueueFormComponent
   };
 
   init() {
diff --git a/ui-ngx/src/app/modules/home/components/home-components.module.ts b/ui-ngx/src/app/modules/home/components/home-components.module.ts
index f9b50082eb..5d1b2d12f0 100644
--- a/ui-ngx/src/app/modules/home/components/home-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/home-components.module.ts
@@ -323,14 +323,14 @@ import { WidgetComponentsModule } from '@home/components/widget/widget-component
     SharedModule,
     SharedHomeComponentsModule,
     WidgetConfigComponentsModule,
-    BasicWidgetConfigModule,
     Lwm2mProfileComponentsModule,
     SnmpDeviceProfileTransportModule,
     StatesControllerModule,
     DeviceCredentialsModule,
     DeviceProfileCommonModule,
     WidgetSettingsCommonModule,
-    WidgetComponentsModule
+    WidgetComponentsModule,
+    BasicWidgetConfigModule
   ],
   exports: [
     WidgetComponentsModule,
@@ -456,7 +456,8 @@ import { WidgetComponentsModule } from '@home/components/widget/widget-component
     RateLimitsComponent,
     RateLimitsTextComponent,
     RateLimitsDetailsDialogComponent,
-    SendNotificationButtonComponent
+    SendNotificationButtonComponent,
+    BasicWidgetConfigModule
   ],
   providers: [
     WidgetComponentService,
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
index 1490d60d42..5e95d162cd 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts
@@ -22,9 +22,14 @@ import { WidgetConfigComponentsModule } from '@home/components/widget/config/wid
 import {
   SimpleCardBasicConfigComponent
 } from '@home/components/widget/config/basic/cards/simple-card-basic-config.component';
+import {
+  WidgetActionsPanelComponent
+} from '@home/components/widget/config/basic/common/widget-actions-panel.component';
 import {
   EntitiesTableBasicConfigComponent
 } from '@home/components/widget/config/basic/entity/entities-table-basic-config.component';
+import { DataKeysPanelComponent } from '@home/components/widget/config/basic/common/data-keys-panel.component';
+import { DataKeyRowComponent } from '@home/components/widget/config/basic/common/data-key-row.component';
 import {
   TimeseriesTableBasicConfigComponent
 } from '@home/components/widget/config/basic/cards/timeseries-table-basic-config.component';
@@ -86,6 +91,7 @@ import {
 
 @NgModule({
   declarations: [
+    WidgetActionsPanelComponent,
     SimpleCardBasicConfigComponent,
     EntitiesTableBasicConfigComponent,
     TimeseriesTableBasicConfigComponent,
@@ -95,6 +101,8 @@ import {
     AggregatedValueCardBasicConfigComponent,
     AggregatedDataKeyRowComponent,
     AggregatedDataKeysPanelComponent,
+    DataKeyRowComponent,
+    DataKeysPanelComponent,
     AlarmCountBasicConfigComponent,
     EntityCountBasicConfigComponent,
     BatteryLevelBasicConfigComponent,
@@ -115,6 +123,7 @@ import {
     WidgetConfigComponentsModule
   ],
   exports: [
+    WidgetActionsPanelComponent,
     SimpleCardBasicConfigComponent,
     EntitiesTableBasicConfigComponent,
     TimeseriesTableBasicConfigComponent,
@@ -124,6 +133,8 @@ import {
     AggregatedValueCardBasicConfigComponent,
     AggregatedDataKeyRowComponent,
     AggregatedDataKeysPanelComponent,
+    DataKeyRowComponent,
+    DataKeysPanelComponent,
     AlarmCountBasicConfigComponent,
     EntityCountBasicConfigComponent,
     BatteryLevelBasicConfigComponent,
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/widget-config-components.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/widget-config-components.module.ts
index 86b1a7457c..ea0d27dcf6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/widget-config-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/widget-config-components.module.ts
@@ -32,9 +32,6 @@ import { TimewindowConfigPanelComponent } from '@home/components/widget/config/t
 import { WidgetSettingsCommonModule } from '@home/components/widget/lib/settings/common/widget-settings-common.module';
 import { TimewindowStyleComponent } from '@home/components/widget/config/timewindow-style.component';
 import { TimewindowStylePanelComponent } from '@home/components/widget/config/timewindow-style-panel.component';
-import { DataKeysPanelComponent } from '@home/components/widget/config/basic/common/data-keys-panel.component';
-import { DataKeyRowComponent } from '@home/components/widget/config/basic/common/data-key-row.component';
-import { WidgetActionsPanelComponent } from '@home/components/widget/config/basic/common/widget-actions-panel.component';
 
 @NgModule({
   declarations:
@@ -51,10 +48,7 @@ import { WidgetActionsPanelComponent } from '@home/components/widget/config/basi
       TimewindowStyleComponent,
       TimewindowStylePanelComponent,
       TimewindowConfigPanelComponent,
-      DataKeysPanelComponent,
-      DataKeyRowComponent,
-      WidgetSettingsComponent,
-      WidgetActionsPanelComponent
+      WidgetSettingsComponent
     ],
   imports: [
     CommonModule,
@@ -67,8 +61,6 @@ import { WidgetActionsPanelComponent } from '@home/components/widget/config/basi
     AlarmFilterConfigComponent,
     DataKeysComponent,
     DataKeyConfigDialogComponent,
-    DataKeysPanelComponent,
-    DataKeyRowComponent,
     DataKeyConfigComponent,
     DatasourceComponent,
     DatasourcesComponent,
@@ -78,8 +70,7 @@ import { WidgetActionsPanelComponent } from '@home/components/widget/config/basi
     TimewindowStylePanelComponent,
     TimewindowConfigPanelComponent,
     WidgetSettingsComponent,
-    WidgetSettingsCommonModule,
-    WidgetActionsPanelComponent
+    WidgetSettingsCommonModule
   ]
 })
 export class WidgetConfigComponentsModule { }
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
index 640f1ba970..6679ed0cca 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
@@ -119,7 +119,6 @@ import { RangeChartWidgetComponent } from '@home/components/widget/lib/chart/ran
   ],
     exports: [
         EntitiesTableWidgetComponent,
-        SelectEntityDialogComponent,
         AlarmsTableWidgetComponent,
         TimeseriesTableWidgetComponent,
         EntitiesHierarchyWidgetComponent,