diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java
index 182e3a7..10e92e7 100644
--- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/MainWindow.java
@@ -21,6 +21,7 @@ import org.nanoboot.utils.timecalc.swing.progress.WalkingHumanProgress;
 import org.nanoboot.utils.timecalc.swing.progress.WeekBattery;
 import org.nanoboot.utils.timecalc.swing.progress.YearBattery;
 import org.nanoboot.utils.timecalc.utils.common.Constants;
+import org.nanoboot.utils.timecalc.utils.common.FileConstants;
 import org.nanoboot.utils.timecalc.utils.common.Jokes;
 import org.nanoboot.utils.timecalc.utils.common.TTime;
 import org.nanoboot.utils.timecalc.utils.common.Utils;
@@ -31,6 +32,7 @@ import java.awt.Color;
 import java.awt.Component;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyVetoException;
+import java.io.File;
 
 /**
  * @author Robert Vokac
@@ -256,6 +258,8 @@ public class MainWindow extends TWindow {
 
         remainingTextField.setBoundsFromLeft(remainingTextFieldLabel);
         remainingTextField.setEditable(false);
+        TButton saveButton = new TButton("Save", 80);
+        saveButton.setBoundsFromLeft(remainingTextField);
         //
 
         add(departureTextFieldLabel);
@@ -264,6 +268,12 @@ public class MainWindow extends TWindow {
         add(elapsedTextField);
         add(remainingTextFieldLabel);
         add(remainingTextField);
+        add(saveButton);
+        saveButton.addActionListener(e -> {
+            TTime overtime_ =overtimeTextField.asTimeHM();
+            Utils.writeTextToFile(FileConstants.STARTTIME_TXT, arrivalTextField.asTimeHM().toString().substring(0,5));
+            Utils.writeTextToFile(FileConstants.OVERTIME_TXT, overtime_.toString().substring(0,overtime_.isNegative() ? 6 : 5));
+        });
         //
         configButton.setBoundsFromTop(departureTextFieldLabel);
         workDaysButton.setBoundsFromLeft(configButton);
diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TButton.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TButton.java
index f3e5551..910f062 100644
--- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TButton.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/TButton.java
@@ -28,9 +28,14 @@ public class TButton extends JButton implements GetProperty {
             Visibility.STRONGLY_COLORED.name());
     private Color originalBackground;
     private Color originalForeground;
+    private int customWidth = 0;
 
     public TButton(String label) {
+        this(label, 0);
+    }
+    public TButton(String label, int customWidth) {
         super(label);
+        this.customWidth = customWidth;
         new Timer(100, e -> {
             if (!MainWindow.hideShowFormsCheckBox.isSelected()) {
                 setVisible(false);
@@ -52,7 +57,7 @@ public class TButton extends JButton implements GetProperty {
     }
 
     public void setBounds(int x, int y) {
-        setBounds(x, y, BUTTON_WIDTH, BUTTON_HEIGHT);
+        setBounds(x, y, customWidth == 0 ? BUTTON_WIDTH : customWidth, BUTTON_HEIGHT);
         this.originalBackground = getBackground();
         this.originalForeground = getForeground();
     }