diff --git a/gui/src/aaregui/panels/raster_data_collection.py b/gui/src/aaregui/panels/raster_data_collection.py
index 2c36593a..ae1bc96d 100644
--- a/gui/src/aaregui/panels/raster_data_collection.py
+++ b/gui/src/aaregui/panels/raster_data_collection.py
@@ -116,10 +116,9 @@ class RasterDataCollectionPanel(ScanSettingsPanel):
         self._layout.addItem(horizontal_spacer, 10, 0, 1, 5)
 
         self._layout.addWidget(QLabel("Measurement time", parent=self), 11, 0)
-        self.total_time = QLabel(f"{self.__total_time}")
+        self.total_time = QLabel(f"{self.__total_time} min 0 s")
         self.total_time.setAlignment(Qt.AlignmentFlag.AlignRight | Qt.AlignmentFlag.AlignVCenter)
         self._layout.addWidget(self.total_time, 11, 1, 1, 3)
-        self._layout.addWidget(QLabel("min", parent=self), 11, 4)
 
         self.image_time_enter.newValue.connect(self.exp_time_s)
         self.calculate_total_time()
@@ -188,7 +187,7 @@ class RasterDataCollectionPanel(ScanSettingsPanel):
         self.size_x_label.setText(f"{self.__size_x * self.__n_x:.1f}")
         self.n_y_label.setText(str(self.__n_y))
         self.size_y_label.setText(f"{self.__size_y * self.__n_y:.1f}")
-        self.total_time.setText(f"{(self.__total_time / 60.0):.2f}")
+        self.update_total_time_label()
         try:
             self.exp_time_s(self.image_time_enter.value)
         except ValueError as e:
@@ -206,13 +205,23 @@ class RasterDataCollectionPanel(ScanSettingsPanel):
             # Add other raster-specific parameters here as needed
         ]
 
+    def update_total_time_label(self):
+        mins = int(self.__total_time // 60)
+        secs = int(round(self.__total_time % 60))
+        if secs == 60:
+            mins += 1
+            secs = 0
+        self.total_time.setText(f"{mins} min {secs} s")
+
     def calculate_total_time(self):
         if self.__n_x <= 0 or self.__n_y <= 0 or self.image_time_enter.value < 0:
             self.__total_time = 0.0
         else:
-            self.__total_time = self.__n_x * self.__n_y * self.image_time_enter.value
+            self.__total_time = self.__n_x * self.__n_y * self.image_time_enter.value * 1.3
+            #30% buffer added
         # Show minutes
-        self.total_time.setText(f"{(self.__total_time/60.0):.2f}")
+        self.update_total_time_label()
+
 
 
     @Slot()