diff --git a/.directory b/.directory
index 1355f9665..b6e745d45 100644
--- a/.directory
+++ b/.directory
@@ -1,4 +1,4 @@
 [Dolphin]
 PreviewsShown=true
-Timestamp=2016,1,17,7,1,5
-Version=3
+Timestamp=2017,10,31,10,22,48
+Version=4
diff --git a/src/kdefrontend/ui/fitoptionswidget.ui b/src/kdefrontend/ui/fitoptionswidget.ui
index b0801dec7..1db0c7d10 100644
--- a/src/kdefrontend/ui/fitoptionswidget.ui
+++ b/src/kdefrontend/ui/fitoptionswidget.ui
@@ -1,118 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>FitOptionsWidget</class>
  <widget class="QWidget" name="FitOptionsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>244</width>
     <height>298</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="1" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>129</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="1" column="1">
     <widget class="QPushButton" name="pbApply">
      <property name="text">
       <string>Apply</string>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="QPushButton" name="pbCancel">
      <property name="text">
       <string>Cancel</string>
      </property>
     </widget>
    </item>
    <item row="0" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string/>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="1">
        <widget class="QComboBox" name="cbRobust"/>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="lMaxIterations">
         <property name="text">
          <string>Max. iterations</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="leMaxIterations"/>
       </item>
       <item row="0" column="0">
        <widget class="QLabel" name="lRobust">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="text">
          <string>Robust fit</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QLineEdit" name="leEvaluatedPoints"/>
       </item>
       <item row="6" column="0" colspan="2">
        <widget class="QCheckBox" name="cbUseResults">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If selected, the resulting fit parameter are set as new start values. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
         <property name="text">
          <string>Use results as new start values</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0" colspan="2">
        <widget class="QCheckBox" name="cbEvaluateFullRange">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If selected, the fit function is evaluated for the full range of data points and not only for the given x-range.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
         <property name="text">
          <string>Evaluate full range</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="lEps">
         <property name="text">
          <string>Tolerance</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QLineEdit" name="leEps"/>
       </item>
       <item row="3" column="0">
        <widget class="QLabel" name="lEvaluatedPoints">
         <property name="text">
          <string>Evaluated Points</string>
         </property>
        </widget>
       </item>
       <item row="5" column="0" colspan="2">
        <widget class="QCheckBox" name="cbUseDataErrors">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This option can be used to turn on and off the usage of given data errors when fitting.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
         <property name="text">
          <string>Use given data errors</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>