diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
index 91996fa8e1..d019e3fe67 100644
--- a/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
+++ b/src/Mod/Path/Gui/Resources/panels/PageOpSurfaceEdit.ui
@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>140</height>
+    <width>357</width>
+    <height>427</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
     <widget class="QFrame" name="frame_2">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
@@ -22,35 +22,49 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>ToolController</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="1">
        <widget class="QComboBox" name="toolController">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The tool and its settings to be used for this operation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
       </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Coolant Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QComboBox" name="coolantController">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The tool and its settings to be used for this operation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QWidget" name="widget" native="true">
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column = "0">
+      <item row="0" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Algorithm</string>
         </property>
        </widget>
       </item>
-      <item row="0" column = "1" colspan="2">
+      <item row="0" column="1" colspan="2">
        <widget class="QComboBox" name="algorithmSelect">
         <item>
          <property name="text">
@@ -64,14 +78,14 @@
         </item>
        </widget>
       </item>
-      <item row="1" column = "0">
+      <item row="1" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>BoundBox</string>
         </property>
        </widget>
       </item>
-      <item row="1" column = "1" colspan="2">
+      <item row="1" column="1" colspan="2">
        <widget class="QComboBox" name="boundBoxSelect">
         <item>
          <property name="text">
@@ -85,8 +99,7 @@
         </item>
        </widget>
       </item>
-
-      <item row="2" column = "0">
+      <item row="2" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>BoundBox extra offset X, Y</string>
@@ -94,28 +107,27 @@
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="Gui::InputField" name="boundBoxExtraOffsetX">
+       <widget class="Gui::InputField" name="boundBoxExtraOffsetX" native="true">
         <property name="unit" stdset="0">
          <string notr="true">mm</string>
         </property>
        </widget>
       </item>
       <item row="2" column="2">
-       <widget class="Gui::InputField" name="boundBoxExtraOffsetY">
+       <widget class="Gui::InputField" name="boundBoxExtraOffsetY" native="true">
         <property name="unit" stdset="0">
          <string notr="true">mm</string>
         </property>
        </widget>
       </item>
-
-      <item row="3" column = "0">
+      <item row="3" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Drop Cutter Direction</string>
         </property>
        </widget>
       </item>
-      <item row="3" column = "1" colspan="2">
+      <item row="3" column="1" colspan="2">
        <widget class="QComboBox" name="dropCutterDirSelect">
         <item>
          <property name="text">
@@ -129,23 +141,21 @@
         </item>
        </widget>
       </item>
-
-        <item row="4" column = "0">
-         <widget class="QLabel" name="label_7">
-          <property name="text">
-           <string>Depth offset</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column = "1" colspan="2">
-            <widget class="Gui::InputField" name="depthOffset">
-             <property name="unit" stdset="0">
-              <string notr="true">mm</string>
-             </property>
-            </widget>
-        </item>
-
-      <item row="5" column = "0">
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="text">
+         <string>Depth offset</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1" colspan="2">
+       <widget class="Gui::InputField" name="depthOffset" native="true">
+        <property name="unit" stdset="0">
+         <string notr="true">mm</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Sample interval</string>
@@ -153,13 +163,13 @@
        </widget>
       </item>
       <item row="5" column="1" colspan="2">
-       <widget class="Gui::InputField" name="sampleInterval">
+       <widget class="Gui::InputField" name="sampleInterval" native="true">
         <property name="unit" stdset="0">
          <string notr="true">mm</string>
         </property>
        </widget>
       </item>
-      <item row="6" column = "0">
+      <item row="6" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Step over</string>
@@ -167,25 +177,25 @@
        </widget>
       </item>
       <item row="6" column="1" colspan="2">
-          <widget class="QSpinBox" name="stepOver">
-           <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The amount by which the tool is laterally displaced on each cycle of the pattern, specified in percent of the tool diameter.&lt;/p&gt;&lt;p&gt;A step over of 100% results in no overlap between two different cycles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-           <property name="minimum">
-            <number>1</number>
-           </property>
-           <property name="maximum">
-            <number>100</number>
-           </property>
-           <property name="singleStep">
-            <number>10</number>
-           </property>
-           <property name="value">
-            <number>100</number>
-           </property>
-          </widget>
+       <widget class="QSpinBox" name="stepOver">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The amount by which the tool is laterally displaced on each cycle of the pattern, specified in percent of the tool diameter.&lt;/p&gt;&lt;p&gt;A step over of 100% results in no overlap between two different cycles.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="singleStep">
+         <number>10</number>
+        </property>
+        <property name="value">
+         <number>100</number>
+        </property>
+       </widget>
       </item>
-      <item row="7" column = "0">
+      <item row="7" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Optimize output</string>
@@ -193,17 +203,16 @@
        </widget>
       </item>
       <item row="7" column="1" colspan="2">
-          <widget class="QCheckBox" name="optimizeEnabled">
-           <property name="text">
-            <string>Enabled</string>
-           </property>
-          </widget>
+       <widget class="QCheckBox" name="optimizeEnabled">
+        <property name="text">
+         <string>Enabled</string>
+        </property>
+       </widget>
       </item>
-  </layout>
-</widget>
-
-  </item>
-   <item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -218,6 +227,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>Gui::InputField</class>
+   <extends>QWidget</extends>
+   <header>gui::inputfield.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>