diff --git a/GUI/View/Common/IntensityDataPropertyWidget.cpp b/GUI/View/Common/IntensityDataPropertyWidget.cpp
index 005707544730eb8de5036a79f6afb979bcc107e6..65e001a9428994b288162f90b6b98e02ee54c70a 100644
--- a/GUI/View/Common/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Common/IntensityDataPropertyWidget.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Util/ComboProperty.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
 #include <QCheckBox>
diff --git a/GUI/View/Device/AxisPropertyForm.cpp b/GUI/View/Device/AxisPropertyForm.cpp
index 5d5b22e9ca6e7a34031713acdfcebf257475d52e..914fcab6c0d3984d4bf3f6b69d8d8d6d08930ee6 100644
--- a/GUI/View/Device/AxisPropertyForm.cpp
+++ b/GUI/View/Device/AxisPropertyForm.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Device/AxisPropertyForm.h"
 #include "GUI/Model/Descriptor/AxisProperty.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include <QFormLayout>
diff --git a/GUI/View/Device/BackgroundForm.cpp b/GUI/View/Device/BackgroundForm.cpp
index 79f6cb2b4499ca9f1c43a78cf7479f409248a05b..c668b0fdc7c48cb14e340080f304e39a2bfdd6a7 100644
--- a/GUI/View/Device/BackgroundForm.cpp
+++ b/GUI/View/Device/BackgroundForm.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Device/BackgroundForm.h"
 #include "GUI/Model/Device/BackgroundItems.h"
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include <QFormLayout>
diff --git a/GUI/View/Device/DetectorAlignmentForm.cpp b/GUI/View/Device/DetectorAlignmentForm.cpp
index 1a58cc00335f2d99aaa748124154f2c9f8f20c42..b635fcb2306a1cefc75ad849e8cafb4fc3192183 100644
--- a/GUI/View/Device/DetectorAlignmentForm.cpp
+++ b/GUI/View/Device/DetectorAlignmentForm.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Device/DetectorAlignmentForm.h"
 #include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include <QComboBox>
 #include <QFormLayout>
diff --git a/GUI/View/Device/FootprintForm.cpp b/GUI/View/Device/FootprintForm.cpp
index 22445e131446e5e501e86bebb30d30d4336af3a7..b86403e3664d32af6adb3bf784898e5aa5917dc8 100644
--- a/GUI/View/Device/FootprintForm.cpp
+++ b/GUI/View/Device/FootprintForm.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Device/FootprintForm.h"
 #include "GUI/Model/Device/FootprintItems.h"
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include <QFormLayout>
diff --git a/GUI/View/Device/ResolutionForm.cpp b/GUI/View/Device/ResolutionForm.cpp
index f3adabbdf6699773a7ffa30ee6fd2d81406fd786..b65a614a05453fffe8acd8173aca435e2680e17a 100644
--- a/GUI/View/Device/ResolutionForm.cpp
+++ b/GUI/View/Device/ResolutionForm.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Device/ResolutionForm.h"
 #include "GUI/Model/Device/DetectorItems.h"
 #include "GUI/Model/Device/ResolutionFunctionItems.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include <QFormLayout>
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp
index 2d0143269165031322efb6325183ace3f910fa0c..4be49cdf059720bf56322399263847dcc6adeae9 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Number/SafeSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index 2f1f3b70ab18248fcbbfed1db69da17a10c63d26..a7b07f1573feb8aab887d0ff7b0f1dceb124e418 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/RectangularDetectorItem.h"
 #include "GUI/Model/Device/SphericalDetectorItem.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Device/RectangularDetectorForm.h"
 #include "GUI/View/Device/SphericalDetectorForm.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index c18c544a5d50d739cf740f5d6b577bfedf1dc43b..ddd3b289a2b1377fbc8bbd82e8cde6743e986bcc 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Descriptor/DistributionItems.h"
 #include "GUI/Model/Device/BeamDistributionItem.h"
 #include "GUI/Support/XML/Backup.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Instrument/DistributionPlot.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Number/SafeSpinBox.h"
diff --git a/GUI/View/Instrument/OffspecDetectorEditor.cpp b/GUI/View/Instrument/OffspecDetectorEditor.cpp
index 0efb85d479970bbaab943b97c929e6ae4abb5a9f..dadcb005daa0e01eab4bc3ad3467c3f5bf49d15e 100644
--- a/GUI/View/Instrument/OffspecDetectorEditor.cpp
+++ b/GUI/View/Instrument/OffspecDetectorEditor.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Instrument/OffspecDetectorEditor.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/Model/Device/SphericalDetectorItem.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Device/SphericalDetectorForm.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include <QFormLayout>
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
index fc03658cb3660fccb80668a6e7497cc3b23f6f7a..52545eedc3d4e0915dd172b2b1908e32fa6b799f 100644
--- a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+++ b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include <QCheckBox>
diff --git a/GUI/View/Common/WidgetUtils.cpp b/GUI/View/Number/NumWidgetUtils.cpp
similarity index 98%
rename from GUI/View/Common/WidgetUtils.cpp
rename to GUI/View/Number/NumWidgetUtils.cpp
index d85dc82757d7c9a8bcec19f57ad23f784cd47d6a..fef86554455f101d4908dbf6457857a31e653b91 100644
--- a/GUI/View/Common/WidgetUtils.cpp
+++ b/GUI/View/Number/NumWidgetUtils.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Common/WidgetUtils.cpp
+//! @file      GUI/View/Number/NumWidgetUtils.cpp
 //! @brief     Implements GUI::Util namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Number/NumberUtil.h"
diff --git a/GUI/View/Common/WidgetUtils.h b/GUI/View/Number/NumWidgetUtils.h
similarity index 97%
rename from GUI/View/Common/WidgetUtils.h
rename to GUI/View/Number/NumWidgetUtils.h
index b81f3690747e90dbe99b833462b857912ca1142a..6914ee0e9abb4cc9ede1b6fff3f6934d74aae042 100644
--- a/GUI/View/Common/WidgetUtils.h
+++ b/GUI/View/Number/NumWidgetUtils.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Common/WidgetUtils.h
+//! @file      GUI/View/Number/NumWidgetUtils.h
 //! @brief     Defines GUI::Util namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_COMMON_WIDGETUTILS_H
-#define BORNAGAIN_GUI_VIEW_COMMON_WIDGETUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_NUMBER_NUMWIDGETUTILS_H
+#define BORNAGAIN_GUI_VIEW_NUMBER_NUMWIDGETUTILS_H
 
 #include "Fit/Param/RealLimits.h"
 #include "GUI/Model/Descriptor/SelectionProperty.h"
@@ -154,4 +154,4 @@ QDoubleSpinBox* createDoubleSpinbox(std::function<double()> getter,
                                     bool easyScrollable = true);
 } // namespace GUI::Util
 
-#endif // BORNAGAIN_GUI_VIEW_COMMON_WIDGETUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_NUMBER_NUMWIDGETUTILS_H
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index a4052f102454854c05712a2c8d0eb7a6eb36605f..c8f1f0fc8f514a4f402c664bfdd675fb46fe685f 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/Util/ComboProperty.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/Number/DoubleSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
 #include <QAction>
diff --git a/GUI/View/SampleDesigner/InterferenceForm.cpp b/GUI/View/SampleDesigner/InterferenceForm.cpp
index da2b3c45e71cb98d03d76bfb8c98ca547c32a121..46e1890615d750d8c78f25410bca16ca7df5d7d8 100644
--- a/GUI/View/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/View/SampleDesigner/InterferenceForm.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Sample/Lattice2DItems.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "GUI/View/Common/CustomEventFilters.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/LatticeTypeSelectionForm.h"
 #include "GUI/View/SampleDesigner/SampleEditorController.h"
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index 18abe080164832ac015e555e069c16f535758752..236d148b91cd55c57466833b4753d81348922c62 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Sample/MaterialModel.h"
 #include "GUI/Model/Sample/SampleItem.h"
 #include "GUI/Util/ActionFactory.h"
-#include "GUI/View/Common/WidgetUtils.h"
+#include "GUI/View/Number/NumWidgetUtils.h"
 #include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
 #include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
 #include "GUI/View/SampleDesigner/WidgetMoverButton.h"