diff --git a/src/shared/Components/ModulesPicker/ModulesPicker.cpp b/src/shared/Components/ModulesPicker/ModulesPicker.cpp
index a6235d130a06f885c12c0a7d34ca713c310a09d1..535caa98f2861601d8f69218fc6863f94bc124b4 100644
--- a/src/shared/Components/ModulesPicker/ModulesPicker.cpp
+++ b/src/shared/Components/ModulesPicker/ModulesPicker.cpp
@@ -31,38 +31,39 @@ ModulesPicker::ModulesPicker()
 
 void ModulesPicker::setupUi()
 {
-    mainLayout = new QGridLayout;
-    setLayout(mainLayout);
+    mainLayout = std::make_unique<QGridLayout>();
+    setLayout(mainLayout.get());
 
-    dataVisualizationGroupBox = new QGroupBox("Data Visualization");
-    mainLayout->addWidget(dataVisualizationGroupBox, 0, 0);
-    dataVisualizationList = new QVBoxLayout();
+    dataVisualizationGroupBox =
+        std::make_unique<QGroupBox>("Data Visualization");
+    mainLayout->addWidget(dataVisualizationGroupBox.get(), 0, 0);
+    dataVisualizationList = std::make_unique<QVBoxLayout>();
     dataVisualizationList->addStretch();
-    dataVisualizationGroupBox->setLayout(dataVisualizationList);
+    dataVisualizationGroupBox->setLayout(dataVisualizationList.get());
 
-    dataSourcesGroupBox = new QGroupBox("Data Sources");
-    mainLayout->addWidget(dataSourcesGroupBox, 1, 0);
-    dataSourcesList = new QVBoxLayout();
+    dataSourcesGroupBox = std::make_unique<QGroupBox>("Data Sources");
+    mainLayout->addWidget(dataSourcesGroupBox.get(), 1, 0);
+    dataSourcesList = std::make_unique<QVBoxLayout>();
     dataSourcesList->addStretch();
-    dataSourcesGroupBox->setLayout(dataSourcesList);
+    dataSourcesGroupBox->setLayout(dataSourcesList.get());
 
-    utilitiesGroupBox = new QGroupBox("Utilities");
-    mainLayout->addWidget(utilitiesGroupBox, 0, 1);
-    utilitiesList = new QVBoxLayout();
+    utilitiesGroupBox = std::make_unique<QGroupBox>("Utilities");
+    mainLayout->addWidget(utilitiesGroupBox.get(), 0, 1);
+    utilitiesList = std::make_unique<QVBoxLayout>();
     utilitiesList->addStretch();
-    utilitiesGroupBox->setLayout(utilitiesList);
+    utilitiesGroupBox->setLayout(utilitiesList.get());
 
-    organizationGroupBox = new QGroupBox("Organization");
-    mainLayout->addWidget(organizationGroupBox, 1, 1);
-    organizationList = new QVBoxLayout();
+    organizationGroupBox = std::make_unique<QGroupBox>("Organization");
+    mainLayout->addWidget(organizationGroupBox.get(), 1, 1);
+    organizationList = std::make_unique<QVBoxLayout>();
     organizationList->addStretch();
-    organizationGroupBox->setLayout(organizationList);
+    organizationGroupBox->setLayout(organizationList.get());
 
-    testingGroupBox = new QGroupBox("Testing");
-    mainLayout->addWidget(testingGroupBox, 0, 2);
-    testingList = new QVBoxLayout();
+    testingGroupBox = std::make_unique<QGroupBox>("Testing");
+    mainLayout->addWidget(testingGroupBox.get(), 0, 2);
+    testingList = std::make_unique<QVBoxLayout>();
     testingList->addStretch();
-    testingGroupBox->setLayout(testingList);
+    testingGroupBox->setLayout(testingList.get());
 
     for (ModuleInfo moduleInfo : ModulesList::getInstance().getModulesInfo())
     {
diff --git a/src/shared/Components/ModulesPicker/ModulesPicker.h b/src/shared/Components/ModulesPicker/ModulesPicker.h
index 420f779199a04fc5d3a7094ffe280538925e4b7e..b5b216f646f37e16914c5d694aeaccdb4396516c 100644
--- a/src/shared/Components/ModulesPicker/ModulesPicker.h
+++ b/src/shared/Components/ModulesPicker/ModulesPicker.h
@@ -44,17 +44,17 @@ signals:
 private:
     void createSplitter(Qt::Orientation orientation);
 
-    Module* selectedModule = nullptr;
-
-    QGridLayout* mainLayout;
-    QGroupBox* dataVisualizationGroupBox;
-    QVBoxLayout* dataVisualizationList;
-    QGroupBox* dataSourcesGroupBox;
-    QVBoxLayout* dataSourcesList;
-    QGroupBox* utilitiesGroupBox;
-    QVBoxLayout* utilitiesList;
-    QGroupBox* organizationGroupBox;
-    QVBoxLayout* organizationList;
-    QGroupBox* testingGroupBox;
-    QVBoxLayout* testingList;
+    std::shared_ptr<Module> selectedModule;
+
+    std::unique_ptr<QGridLayout> mainLayout;
+    std::unique_ptr<QGroupBox> dataVisualizationGroupBox;
+    std::unique_ptr<QVBoxLayout> dataVisualizationList;
+    std::unique_ptr<QGroupBox> dataSourcesGroupBox;
+    std::unique_ptr<QVBoxLayout> dataSourcesList;
+    std::unique_ptr<QGroupBox> utilitiesGroupBox;
+    std::unique_ptr<QVBoxLayout> utilitiesList;
+    std::unique_ptr<QGroupBox> organizationGroupBox;
+    std::unique_ptr<QVBoxLayout> organizationList;
+    std::unique_ptr<QGroupBox> testingGroupBox;
+    std::unique_ptr<QVBoxLayout> testingList;
 };