diff --git a/cpdctrl_gui/ui/widgets/measurement_settings.py b/cpdctrl_gui/ui/widgets/measurement_settings.py
index 5723ac2..ce26eaa 100644
--- a/cpdctrl_gui/ui/widgets/measurement_settings.py
+++ b/cpdctrl_gui/ui/widgets/measurement_settings.py
@@ -107,13 +107,15 @@ class MeasurementSettings(QWidget):
         w_box_interval.setSingleStep(0.1)
         self._add_form_field("interval", "Interval [s]", 1.0, w_box_interval, "Amount of seconds to wait between voltage measurements and LED device updates")
         w_box_max_measurements = QSpinBox(self)
-        self._add_form_field("max_measurements", "Max Measurements", 0, QSpinBox(self), "Number of measurements to take. Set to 0 for infinite measurements")
+        w_box_max_measurements.setMaximum(2147483647)   # max int32
+        w_box_max_measurements.setMinimum(0)            # 0 for infinite measurements
+        self._add_form_field("max_measurements", "Max Measurements", 0, w_box_max_measurements, "Number of measurements to take. Set to 0 for infinite measurements")
         self._add_form_field("stop_on_script_end", "Stop on Script End", False, QCheckBox(self), "Stop measurement when LED script ends")
         self._add_form_field("use_buffer", "Use Buffer", False, QCheckBox(self), "If available, use the voltage device buffer for more accurate measurement timings.\nLeads to a lower accuracy of LED update timings, up to 1*interval")
         w_box_flush_after = QSpinBox(self)
         w_box_flush_after.setMaximum(2147483647)  # max int32
         w_box_flush_after.setSingleStep(500)
-        self._add_form_field("flush_after", "Flush after", 0, w_box_flush_after, "Number of measurements to take before writing the data to an intermediate file")
+        self._add_form_field("flush_after", "Flush-Data Interval", 0, w_box_flush_after, "Number of measurements to take before writing the data to an intermediate file")
         self.l_vbox.addStretch(1)
         self._add_form_field("auto_add_metadata", "Auto-add Metadata", True,  QCheckBox(self), "Automatically add measurement metadata to the data file.\nThis includes: device names, measurement mode, measurement interval, start and stop times, led script")