diff --git a/GUI/View/PropertyEditor/CustomEventFilters.cpp b/GUI/View/Common/CustomEventFilters.cpp
similarity index 99%
rename from GUI/View/PropertyEditor/CustomEventFilters.cpp
rename to GUI/View/Common/CustomEventFilters.cpp
index 7584aeb9e07e55a16bfede88d895a299155d0b8b..1cc117b1e297c3f59ae99c403e93f7b1dc9f76be 100644
--- a/GUI/View/PropertyEditor/CustomEventFilters.cpp
+++ b/GUI/View/Common/CustomEventFilters.cpp
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
+#include "GUI/View/Common/CustomEventFilters.h"
 #include <QApplication>
 #include <QComboBox>
 #include <QKeyEvent>
diff --git a/GUI/View/PropertyEditor/CustomEventFilters.h b/GUI/View/Common/CustomEventFilters.h
similarity index 100%
rename from GUI/View/PropertyEditor/CustomEventFilters.h
rename to GUI/View/Common/CustomEventFilters.h
diff --git a/GUI/View/Common/DockWidgetInfo.cpp b/GUI/View/Common/DockWidgetInfo.cpp
index c16945773ae99e04cd08ebb23d632a65500ce00e..aa9938eba816d7e7f2abe663c27c784548a1af49 100644
--- a/GUI/View/Common/DockWidgetInfo.cpp
+++ b/GUI/View/Common/DockWidgetInfo.cpp
@@ -13,8 +13,6 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Common/DockWidgetInfo.h"
-#include <QDockWidget>
-#include <QWidget>
 
 DockWidgetInfo::DockWidgetInfo()
     : m_dock(nullptr)
diff --git a/GUI/View/Edit/DoubleLineEdit.cpp b/GUI/View/Common/DoubleLineEdit.cpp
similarity index 97%
rename from GUI/View/Edit/DoubleLineEdit.cpp
rename to GUI/View/Common/DoubleLineEdit.cpp
index 820bb35ed6ceaf4f25e670622460a9ef61253d4d..5cfa0c08772f64590995497dee16e9f541e268d7 100644
--- a/GUI/View/Edit/DoubleLineEdit.cpp
+++ b/GUI/View/Common/DoubleLineEdit.cpp
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Edit/DoubleLineEdit.h"
+#include "GUI/View/Common/DoubleLineEdit.h"
 #include <QDoubleValidator>
 
 DoubleLineEdit::DoubleLineEdit(QWidget* parent, const DoubleDescriptor& d)
diff --git a/GUI/View/Edit/DoubleLineEdit.h b/GUI/View/Common/DoubleLineEdit.h
similarity index 100%
rename from GUI/View/Edit/DoubleLineEdit.h
rename to GUI/View/Common/DoubleLineEdit.h
diff --git a/GUI/View/Edit/DoubleSpinBox.cpp b/GUI/View/Common/DoubleSpinBox.cpp
similarity index 98%
rename from GUI/View/Edit/DoubleSpinBox.cpp
rename to GUI/View/Common/DoubleSpinBox.cpp
index 27c851d1211edbe9a249c69021abaffc0a34f084..48366a3db7ef96e5dbc1cdabbaa6224f53303275 100644
--- a/GUI/View/Edit/DoubleSpinBox.cpp
+++ b/GUI/View/Common/DoubleSpinBox.cpp
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/EditUtil.h"
 #include <QWheelEvent>
 
diff --git a/GUI/View/Edit/DoubleSpinBox.h b/GUI/View/Common/DoubleSpinBox.h
similarity index 100%
rename from GUI/View/Edit/DoubleSpinBox.h
rename to GUI/View/Common/DoubleSpinBox.h
diff --git a/GUI/View/Common/ItemComboToolbar.cpp b/GUI/View/Common/ItemComboToolbar.cpp
index 432703a6ec9c920dcd114acb9512c2348ca1230c..6cf14b882b4364619374c828c6948427daa90a90 100644
--- a/GUI/View/Common/ItemComboToolbar.cpp
+++ b/GUI/View/Common/ItemComboToolbar.cpp
@@ -14,7 +14,6 @@
 
 #include "GUI/View/Common/ItemComboToolbar.h"
 #include "Base/Util/Assert.h"
-#include <QAction>
 #include <QComboBox>
 #include <QStandardItemModel>
 
diff --git a/GUI/View/Common/ItemComboWidget.cpp b/GUI/View/Common/ItemComboWidget.cpp
index ed5f7300ce07bc5e9813aa99cf1e3a36f87b86d8..0f55501477db60e1fc7458361925ca65167a2e0e 100644
--- a/GUI/View/Common/ItemComboWidget.cpp
+++ b/GUI/View/Common/ItemComboWidget.cpp
@@ -13,10 +13,8 @@
 //  ************************************************************************************************
 
 #include "GUI/View/Common/ItemComboWidget.h"
-#include "Base/Util/Assert.h"
 #include "GUI/View/Common/ItemComboToolbar.h"
-#include <QComboBox>
-#include <QEvent>
+#include "Base/Util/Assert.h"
 #include <QStackedWidget>
 #include <QVBoxLayout>
 
diff --git a/GUI/View/Common/ItemComboWidget.h b/GUI/View/Common/ItemComboWidget.h
index f4ac752d0060464813c9822952a3e89142e2e782..9994b2cb1a7858a6da1d63da43ca58a867b0c7c5 100644
--- a/GUI/View/Common/ItemComboWidget.h
+++ b/GUI/View/Common/ItemComboWidget.h
@@ -18,8 +18,6 @@
 #include "Base/Util/IFactory.h"
 #include "GUI/View/Common/SessionItemWidget.h"
 #include <QMap>
-#include <QString>
-#include <QWidget>
 
 class SessionItem;
 class SessionItemWidget;
diff --git a/GUI/View/PropertyEditor/ScientificSpinBox.cpp b/GUI/View/Common/ScientificSpinBox.cpp
similarity index 97%
rename from GUI/View/PropertyEditor/ScientificSpinBox.cpp
rename to GUI/View/Common/ScientificSpinBox.cpp
index b1e43160963a1bd8984ace0cda8537a930000117..df0780c8fce194998f3f6868da29a86068146d5e 100644
--- a/GUI/View/PropertyEditor/ScientificSpinBox.cpp
+++ b/GUI/View/Common/ScientificSpinBox.cpp
@@ -12,8 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
-#include <QDoubleSpinBox>
+#include "GUI/View/Common/ScientificSpinBox.h"
 #include <QLineEdit>
 #include <cmath>
 
@@ -29,7 +28,7 @@ bool useExponentialNotation(double val);
 } // namespace
 
 ScientificSpinBox::ScientificSpinBox(QWidget* parent)
-    : QAbstractSpinBox(parent)
+    : QDoubleSpinBox(parent)
     , m_value(0.0)
     , m_min(-max_val)
     , m_max(max_val)
diff --git a/GUI/View/PropertyEditor/ScientificSpinBox.h b/GUI/View/Common/ScientificSpinBox.h
similarity index 96%
rename from GUI/View/PropertyEditor/ScientificSpinBox.h
rename to GUI/View/Common/ScientificSpinBox.h
index 0ef0a8a24cf74e828d745a6b2b8d6d6b5934380f..73415196b26da10d8f38f91786845892d7813fc1 100644
--- a/GUI/View/PropertyEditor/ScientificSpinBox.h
+++ b/GUI/View/Common/ScientificSpinBox.h
@@ -15,9 +15,9 @@
 #ifndef BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SCIENTIFICSPINBOX_H
 #define BORNAGAIN_GUI_VIEW_PROPERTYEDITOR_SCIENTIFICSPINBOX_H
 
-#include <QAbstractSpinBox>
+#include <QDoubleSpinBox>
 
-class ScientificSpinBox : public QAbstractSpinBox {
+class ScientificSpinBox : public QDoubleSpinBox {
     Q_OBJECT
 
     Q_PROPERTY(double value MEMBER m_value READ value WRITE setValue NOTIFY valueChanged USER true)
diff --git a/GUI/View/Fit/FitParameterDelegate.cpp b/GUI/View/Fit/FitParameterDelegate.cpp
index 9a8adf7c05db6730aefc119bec20a92519b96aac..1d99420d04b931f2bf063ca993b5c917a1c339df 100644
--- a/GUI/View/Fit/FitParameterDelegate.cpp
+++ b/GUI/View/Fit/FitParameterDelegate.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Fit/FitParameterDelegate.h"
 #include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/View/PropertyEditor/CustomEditors.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
+#include "GUI/View/Common/CustomEventFilters.h"
 #include "GUI/View/PropertyEditor/PropertyEditorFactory.h"
 #include <QApplication>
 
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index 1011d930bbd00577ac97fa9ce7f42759b0840746..54dc98c06dea3fb8165265f1b526913ed6af1df0 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -25,7 +25,7 @@
 #include "GUI/View/Fit/FitParameterDelegate.h"
 #include "GUI/View/Fit/ParameterTuningWidget.h"
 #include "GUI/View/Info/OverlayLabelController.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
+#include "GUI/View/Common/CustomEventFilters.h"
 #include "GUI/View/Tool/mainwindow_constants.h"
 #include <QAction>
 #include <QMenu>
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp
index 750966e0e48bee86dd672a4fba18735721e4a015..ad1716ee00b28e5794f3298e74f5a19c4bf62e85 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Job/FitSuiteItem.h"
 #include "GUI/Model/Job/JobItem.h"
 #include "GUI/Model/Job/MinimizerItem.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
 #include "GUI/View/Tool/WidgetUtils.h"
 #include <QComboBox>
diff --git a/GUI/View/Fit/ParameterTuningDelegate.cpp b/GUI/View/Fit/ParameterTuningDelegate.cpp
index d6c4e3956e41c08ff2579b49c3f1ebf38649ff72..881b066bdf4c6df58dda8555ef7282e09c56c49e 100644
--- a/GUI/View/Fit/ParameterTuningDelegate.cpp
+++ b/GUI/View/Fit/ParameterTuningDelegate.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Fit/ParameterTuningDelegate.h"
 #include "GUI/Model/Job/ParameterTreeItems.h"
 #include "GUI/Model/Model/ParameterTuningModel.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
 #include <QAbstractItemModel>
 #include <QApplication>
 #include <QHBoxLayout>
diff --git a/GUI/View/Instrument/AxisPropertyEditor.cpp b/GUI/View/Instrument/AxisPropertyEditor.cpp
index f3ec538e0fad2daa4fbf3c664395b941d88c9ae7..ae8f660693b5863338a08bb668f7243e23f30b13 100644
--- a/GUI/View/Instrument/AxisPropertyEditor.cpp
+++ b/GUI/View/Instrument/AxisPropertyEditor.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Instrument/AxisPropertyEditor.h"
 #include "GUI/Model/Descriptor/AxisProperty.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include "GUI/View/Tool/WidgetUtils.h"
 #include <QFormLayout>
diff --git a/GUI/View/Instrument/DetectorAlignmentEditor.cpp b/GUI/View/Instrument/DetectorAlignmentEditor.cpp
index 816d718e1f1ce4cb9d77a43289eeda91e6c06c2c..6043f2607a67f8b267353f6aa1f9553854037c4a 100644
--- a/GUI/View/Instrument/DetectorAlignmentEditor.cpp
+++ b/GUI/View/Instrument/DetectorAlignmentEditor.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Instrument/DetectorAlignmentEditor.h"
 #include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/WidgetUtils.h"
 #include <QComboBox>
 #include <QFormLayout>
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 37a346ea0abbbeed465d1f6f8ea3644fbe78c7dd..0b758882e116916209da62e66e21f72f73633ca7 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -18,9 +18,9 @@
 #include "GUI/Model/Device/BeamDistributionItem.h"
 #include "GUI/Support/XML/Backup.h"
 #include "GUI/Support/XML/Streamer.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Instrument/DistributionPlot.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include "GUI/View/Tool/WidgetUtils.h"
 #include <QComboBox>
diff --git a/GUI/View/Instrument/EnvironmentEditor.cpp b/GUI/View/Instrument/EnvironmentEditor.cpp
index b646e578aef124bbc298b95a781a181745b92927..648a819ba7b6a28db796d0f51138d588858d494b 100644
--- a/GUI/View/Instrument/EnvironmentEditor.cpp
+++ b/GUI/View/Instrument/EnvironmentEditor.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Instrument/EnvironmentEditor.h"
 #include "GUI/Model/Device/BackgroundItems.h"
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include "GUI/View/Tool/WidgetUtils.h"
 #include <QFormLayout>
diff --git a/GUI/View/Instrument/FootprintCorrectionEditor.cpp b/GUI/View/Instrument/FootprintCorrectionEditor.cpp
index 9346a342948503d88f04da2df1620dab547a98fe..c9da963ad99af4c6e2bbfe04096bac2670e6cda7 100644
--- a/GUI/View/Instrument/FootprintCorrectionEditor.cpp
+++ b/GUI/View/Instrument/FootprintCorrectionEditor.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Instrument/FootprintCorrectionEditor.h"
 #include "GUI/Model/Device/FootprintItems.h"
 #include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include "GUI/View/Tool/WidgetUtils.h"
 #include <QFormLayout>
diff --git a/GUI/View/Instrument/PolarizationAnalysisEditor.cpp b/GUI/View/Instrument/PolarizationAnalysisEditor.cpp
index 0ff106134c296ccca0e5d8d774fde8705d11e2f1..34fc7a4c88416b1ec1b89498d59fc0475c5c750e 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/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include "GUI/View/Tool/WidgetUtils.h"
 #include <QCheckBox>
diff --git a/GUI/View/Instrument/RectangularDetectorEditor.cpp b/GUI/View/Instrument/RectangularDetectorEditor.cpp
index 94db555ae6d3a911ee44fc00ab162889b51a66dd..6475aba98bdb9c4b370648ad22b1e905525ded81 100644
--- a/GUI/View/Instrument/RectangularDetectorEditor.cpp
+++ b/GUI/View/Instrument/RectangularDetectorEditor.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Instrument/RectangularDetectorEditor.h"
 #include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Model/Device/RectangularDetectorItem.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Instrument/DetectorAlignmentEditor.h"
 #include "GUI/View/Instrument/ResolutionFunctionEditor.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/Instrument/ResolutionFunctionEditor.cpp b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
index 3bd729f0d92dc760b1b8c0c8e12434f5ec79fc2e..02132ec1523b1776f3cab1cb2a0bc2544e581ed2 100644
--- a/GUI/View/Instrument/ResolutionFunctionEditor.cpp
+++ b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/Instrument/ResolutionFunctionEditor.h"
 #include "GUI/Model/Device/DetectorItems.h"
 #include "GUI/Model/Device/ResolutionFunctionItems.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include "GUI/View/Tool/WidgetUtils.h"
 #include <QFormLayout>
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 05ad304a104ea1c28d1c2cd85a9a1b774d23f68e..6bea7ea340b3400ca3ecf1c2a33a3388fa0f526f 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -14,7 +14,7 @@
 
 #include "GUI/View/Main/AboutDialog.h"
 #include "GUI/Util/Path.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
+#include "GUI/View/Common/CustomEventFilters.h"
 #include "GUI/View/Tool/DesignerHelper.h"
 #include <QDate>
 #include <QLabel>
diff --git a/GUI/View/Mask/MaskEditorPropertyPanel.cpp b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
index c3980c46891ca0d30d8d00b0ee9f2be333dc6d61..3a01af08df1a2d17965bcba547995ccf4d9aa2f1 100644
--- a/GUI/View/Mask/MaskEditorPropertyPanel.cpp
+++ b/GUI/View/Mask/MaskEditorPropertyPanel.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Device/MaskItems.h"
 #include "GUI/Model/Model/SessionModel.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/PlotUtil/IntensityDataPropertyWidget.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
 #include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/PlotUtil/IntensityDataPropertyWidget.cpp b/GUI/View/PlotUtil/IntensityDataPropertyWidget.cpp
index 69ff7b4bfc2c885f1d71e48cec52e37eba1de1ef..8a24f193cfa14c5b94fa7b68156ed8926e70c7cc 100644
--- a/GUI/View/PlotUtil/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/PlotUtil/IntensityDataPropertyWidget.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Data/IntensityDataItem.h"
 #include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Util/ComboProperty.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
 #include <QAction>
 #include <QCheckBox>
diff --git a/GUI/View/PropertyEditor/CustomEditors.cpp b/GUI/View/PropertyEditor/CustomEditors.cpp
index 54273cf3ff43b968881e61ce363dfbfbf6e2be1d..d68742fe195680b73252a1ba97918731387964c1 100644
--- a/GUI/View/PropertyEditor/CustomEditors.cpp
+++ b/GUI/View/PropertyEditor/CustomEditors.cpp
@@ -16,8 +16,8 @@
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Data/SessionData.h"
 #include "GUI/Util/ComboProperty.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
+#include "GUI/View/Common/CustomEventFilters.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
 #include <QBoxLayout>
 #include <QComboBox>
 #include <cmath>
diff --git a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
index 67a54dd13c1acea8f99527e3ce5820a50251d427..0c93c7770ddb5a766d2278852062b525899e4d6e 100644
--- a/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/View/PropertyEditor/PropertyEditorFactory.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/BaseItem/SessionItem.h"
 #include "GUI/Util/ComboProperty.h"
 #include "GUI/View/PropertyEditor/CustomEditors.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
 #include <QModelIndex>
 #include <QSpinBox>
 
diff --git a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
index 7f08279bb9e1b7db865ed3aeaa44531f63dc7810..eb91624b0692dea976c6c68a81c98fdae71fbc54 100644
--- a/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PropertyEditor/SpecularDataPropertyWidget.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Data/SpecularDataItem.h"
 #include "GUI/Model/Device/AxesItems.h"
 #include "GUI/Util/ComboProperty.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Tool/LayoutUtils.h"
 #include <QAction>
 #include <QCheckBox>
diff --git a/GUI/View/SampleDesigner/FormLayouter.cpp b/GUI/View/SampleDesigner/FormLayouter.cpp
index d8111e5050b8dc40605bc39ee60cafd68c58d9e9..99c5fd526d484561ce6ddcc4c8c4a35d3ff47acc 100644
--- a/GUI/View/SampleDesigner/FormLayouter.cpp
+++ b/GUI/View/SampleDesigner/FormLayouter.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/Model/Descriptor/UIntDescriptor.h"
 #include "GUI/Model/Descriptor/VectorDescriptor.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/View/SampleDesigner/SampleEditorController.h"
 #include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/SampleDesigner/InterferenceForm.cpp b/GUI/View/SampleDesigner/InterferenceForm.cpp
index b869a3f8a7f0ced34f06e91bf35ae7661c340d36..bfa79e5254c2d23975c3b92367a4a984a944867f 100644
--- a/GUI/View/SampleDesigner/InterferenceForm.cpp
+++ b/GUI/View/SampleDesigner/InterferenceForm.cpp
@@ -17,7 +17,7 @@
 #include "GUI/Model/Sample/InterferenceItems.h"
 #include "GUI/Model/Sample/Lattice2DItems.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
+#include "GUI/View/Common/CustomEventFilters.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/LayerEditorUtils.cpp b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
index 52f595d93cc68f6e44eacc09b964db8d04a3c110..e9ef1ca6dc921c2f3012332a9c79a522dfe54338 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.cpp
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.cpp
@@ -21,7 +21,7 @@
 #include "GUI/Model/Sample/ParticleCoreShellItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Sample/ProfileItems.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/SampleDesigner/FormLayouter.h"
 #include "GUI/View/SampleDesigner/MesoCrystalForm.h"
 #include "GUI/View/SampleDesigner/ParticleCompositionForm.h"
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
index 539cb2da06d73241c7604ab19bbc927c094f51a7..8c0e98c7b680ba5bc8ae56301a9dd80f09090479 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp
@@ -21,8 +21,8 @@
 #include "GUI/Model/Sample/MaterialItems.h"
 #include "GUI/Model/Sample/MultiLayerItem.h"
 #include "GUI/Support/XML/Backup.h"
-#include "GUI/View/Edit/DoubleLineEdit.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleLineEdit.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/Global/Globals.h"
 #include "GUI/View/MaterialEditor/MaterialEditorDialog.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
diff --git a/GUI/View/SampleDesigner/MultiLayerForm.cpp b/GUI/View/SampleDesigner/MultiLayerForm.cpp
index 99d8ffcd42ebc08f683e2303ba1923afbaf99f8f..8a1de6c9a3e22cf2a7d2d3bcf0bbfb41e242f919 100644
--- a/GUI/View/SampleDesigner/MultiLayerForm.cpp
+++ b/GUI/View/SampleDesigner/MultiLayerForm.cpp
@@ -15,7 +15,7 @@
 #include "GUI/View/SampleDesigner/MultiLayerForm.h"
 #include "GUI/Model/Sample/MultiLayerItem.h"
 #include "GUI/Util/ActionFactory.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/SampleDesigner/LayerForm.h"
 #include "GUI/View/SampleDesigner/MesoCrystalForm.h"
 #include "GUI/View/SampleDesigner/ParticleCompositionForm.h"
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
index be83d503c255b24fae1bee817f2c49e2b0558991..f38a8d07aa54883aff1ebbb66ebbc0ca1311322c 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
@@ -18,7 +18,7 @@
 #include "GUI/Model/Sample/LayerItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
 #include "GUI/Util/ActionFactory.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/SampleDesigner/InterferenceForm.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/View/SampleDesigner/LayerForm.h"
diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp
index c86211a804c82da72b5fe61177a6045df80c9d34..b2bd5c0db97df6c831ee2507364dfd9535277614 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorController.cpp
@@ -25,7 +25,7 @@
 #include "GUI/Model/Sample/ParticleCoreShellItem.h"
 #include "GUI/Model/Sample/ParticleItem.h"
 #include "GUI/Model/Sample/ParticleLayoutItem.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
 #include "GUI/View/SampleDesigner/InterferenceForm.h"
 #include "GUI/View/SampleDesigner/LatticeTypeSelectionForm.h"
 #include "GUI/View/SampleDesigner/LayerForm.h"
diff --git a/GUI/View/SampleDesigner/SelectionContainerForm.h b/GUI/View/SampleDesigner/SelectionContainerForm.h
index 8aade3c20516d2258afc7ba353bc0292b5bae3ce..37159d92230747d4e2d64060479223b0763fd301 100644
--- a/GUI/View/SampleDesigner/SelectionContainerForm.h
+++ b/GUI/View/SampleDesigner/SelectionContainerForm.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
 #define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SELECTIONCONTAINERFORM_H
 
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
+#include "GUI/View/Common/CustomEventFilters.h"
 #include "GUI/View/SampleDesigner/LayerEditorUtils.h"
 #include "GUI/View/SampleDesigner/SampleEditorController.h"
 #include "GUI/View/Tool/LayoutUtils.h"
diff --git a/GUI/View/Tool/EditUtil.cpp b/GUI/View/Tool/EditUtil.cpp
index d872b890eda5c5e472b26ddb1cb3071c4f731d5f..e67cd88ed0e00e44b0f6040af8925f5610034b16 100644
--- a/GUI/View/Tool/EditUtil.cpp
+++ b/GUI/View/Tool/EditUtil.cpp
@@ -14,9 +14,7 @@
 
 #include "GUI/View/Tool/EditUtil.h"
 #include "Fit/Param/RealLimits.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
 #include <QDoubleSpinBox>
-#include <QDoubleValidator>
 #include <QLineEdit>
 #include <cmath>
 
@@ -60,18 +58,3 @@ void GUI::View::EditUtil::configSpinbox(QDoubleSpinBox* spinBox, int decimals,
     spinBox->setDecimals(decimals);
     spinBox->setSingleStep(singleStep(decimals));
 }
-
-void GUI::View::EditUtil::configSpinbox(ScientificSpinBox* spinBox, int decimals,
-                                        const RealLimits& limits)
-{
-    spinBox->setMaximum(std::numeric_limits<double>::max());
-    spinBox->setMinimum(std::numeric_limits<double>::lowest());
-
-    if (limits.hasLowerLimit())
-        spinBox->setMinimum(limits.lowerLimit());
-    if (limits.hasUpperLimit())
-        spinBox->setMaximum(limits.upperLimit());
-
-    spinBox->setDecimals(decimals);
-    spinBox->setSingleStep(singleStep(decimals));
-}
diff --git a/GUI/View/Tool/EditUtil.h b/GUI/View/Tool/EditUtil.h
index 5c8d4cf0b0aed18bb990751625b64cca1a973cf1..5005143de5f12f6e1cbd2787e02485c1b5588ce8 100644
--- a/GUI/View/Tool/EditUtil.h
+++ b/GUI/View/Tool/EditUtil.h
@@ -20,14 +20,12 @@
 class RealLimits;
 class QDoubleSpinBox;
 class QLineEdit;
-class ScientificSpinBox;
 
 namespace GUI::View::EditUtil {
 
 void configScientificDoubleEdit(QLineEdit* edit, const RealLimits& limits);
 
 void configSpinbox(QDoubleSpinBox* spinBox, int decimals, const RealLimits& limits);
-void configSpinbox(ScientificSpinBox* spinBox, int decimals, const RealLimits& limits);
 
 } // namespace GUI::View::EditUtil
 
diff --git a/GUI/View/Tool/WidgetUtils.cpp b/GUI/View/Tool/WidgetUtils.cpp
index a67920310a0978ea6ed5bb9b02d02f83a3991cc2..22c469911efa91059db40db760d39c3f3ddb3bdc 100644
--- a/GUI/View/Tool/WidgetUtils.cpp
+++ b/GUI/View/Tool/WidgetUtils.cpp
@@ -14,8 +14,8 @@
 
 #include "GUI/View/Tool/WidgetUtils.h"
 #include "GUI/Model/Descriptor/UIntDescriptor.h"
-#include "GUI/View/Edit/DoubleSpinBox.h"
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
+#include "GUI/View/Common/DoubleSpinBox.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
 #include "GUI/View/Tool/EditUtil.h"
 #include <QFormLayout>
 #include <QLabel>
diff --git a/GUI/View/Tool/WidgetUtils.h b/GUI/View/Tool/WidgetUtils.h
index 004431a291740e396491419d980386de07df1cb1..54ffeeb5e35da4cde26120187ef2a5cecedc41b0 100644
--- a/GUI/View/Tool/WidgetUtils.h
+++ b/GUI/View/Tool/WidgetUtils.h
@@ -17,7 +17,7 @@
 
 #include "GUI/Model/Descriptor/SelectionDescriptor.h"
 #include "GUI/Support/Type/Unit.h"
-#include "GUI/View/PropertyEditor/CustomEventFilters.h"
+#include "GUI/View/Common/CustomEventFilters.h"
 #include <QComboBox>
 #include <variant>
 
diff --git a/Tests/Unit/GUI/TestScientificSpinBox.cpp b/Tests/Unit/GUI/TestScientificSpinBox.cpp
index e75b100e5b8c702b728fd0a51c0078bae6008036..c2ad3e8b846549d5ae5217a093d4606a7c660a83 100644
--- a/Tests/Unit/GUI/TestScientificSpinBox.cpp
+++ b/Tests/Unit/GUI/TestScientificSpinBox.cpp
@@ -1,4 +1,4 @@
-#include "GUI/View/PropertyEditor/ScientificSpinBox.h"
+#include "GUI/View/Common/ScientificSpinBox.h"
 #include "Tests/GTestWrapper/google_test.h"
 #include <limits>