diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts
index 420ec1e..bbcbac4 100644
--- a/src/app/monitor/monitor.module.ts
+++ b/src/app/monitor/monitor.module.ts
@@ -15,15 +15,15 @@ import {MonitorRoutingModule} from "./monitor-routing.module";
 import {MonitorComponent} from "./monitor.component";
 import {StatisticsService} from "../utils/services/statistics.service";
 import {SideBarModule} from "../library/sharedComponents/sidebar/sideBar.module";
-import {ModalModule} from "../openaireLibrary/utils/modal/modal.module";
 import {InputModule} from "../library/sharedComponents/input/input.module";
 import {UserMiniModule} from "../openaireLibrary/login/userMiniModule.module";
+import {ClickModule} from "../openaireLibrary/utils/click/click.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule, ErrorMessagesModule,
-    HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, ModalModule, InputModule,
-    UserMiniModule
+    HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, InputModule,
+    UserMiniModule, ClickModule
   ],
   declarations: [
     MonitorComponent
diff --git a/src/app/stakeholder/stakeholder.module.ts b/src/app/stakeholder/stakeholder.module.ts
index 0cde1e8..b0403de 100644
--- a/src/app/stakeholder/stakeholder.module.ts
+++ b/src/app/stakeholder/stakeholder.module.ts
@@ -5,17 +5,17 @@ import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
 import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
 
 import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-import {ModalModule} from "../openaireLibrary/utils/modal/modal.module";
 import {RouterModule} from "@angular/router";
 import {FormsModule, ReactiveFormsModule} from "@angular/forms";
 import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
 import {StakeholderComponent} from "./stakeholder.component";
 import {StakeholderRoutingModule} from "./stakeholder-routing.module";
 import {InputModule} from "../library/sharedComponents/input/input.module";
+import {ClickModule} from "../openaireLibrary/utils/click/click.module";
 
 @NgModule({
   imports: [
-    CommonModule, StakeholderRoutingModule, ModalModule, RouterModule, FormsModule, AlertModalModule, ReactiveFormsModule, InputModule
+    CommonModule, StakeholderRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule, ReactiveFormsModule, InputModule
   ],
   declarations: [
     StakeholderComponent
diff --git a/src/app/topic/topic.module.ts b/src/app/topic/topic.module.ts
index 2636199..a7b9393 100644
--- a/src/app/topic/topic.module.ts
+++ b/src/app/topic/topic.module.ts
@@ -7,17 +7,17 @@ import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRout
 import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
 import {TopicComponent} from "./topic.component";
 import {TopicRoutingModule} from "./topic-routing.module";
-import {ModalModule} from "../openaireLibrary/utils/modal/modal.module";
 import {RouterModule} from "@angular/router";
 import {FormsModule, ReactiveFormsModule} from "@angular/forms";
 import {IndicatorsComponent} from "./indicators.component";
 import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
 import {InputModule} from "../library/sharedComponents/input/input.module";
 import {DragDropModule} from "@angular/cdk/drag-drop";
+import {ClickModule} from "../openaireLibrary/utils/click/click.module";
 
 @NgModule({
   imports: [
-    CommonModule, TopicRoutingModule, ModalModule, RouterModule, FormsModule, AlertModalModule,
+    CommonModule, TopicRoutingModule, ClickModule, RouterModule, FormsModule, AlertModalModule,
     ReactiveFormsModule, InputModule, DragDropModule
   ],
   declarations: [