diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index e2fb8e5189..53bc8275b5 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>536</width>
-    <height>752</height>
+    <height>768</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,6 +16,78 @@
   <layout class="QGridLayout" name="gridLayout_4">
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QGroupBox" name="gb_gmsh_param">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="layoutDirection">
+        <enum>Qt::LeftToRight</enum>
+       </property>
+       <property name="title">
+        <string>FreeCAD FEM Solver frame work</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetNoConstraint</enum>
+        </property>
+        <item>
+         <layout class="QGridLayout" name="gl_01">
+          <item row="0" column="0">
+           <widget class="Gui::PrefRadioButton" name="rb_ccx_solver_old">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="accessibleDescription">
+             <string>sdfsdfsdfds</string>
+            </property>
+            <property name="text">
+             <string>CCX Tools (well tested)</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>useOldSolverFrameWork</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="Gui::PrefRadioButton" name="rb_ccx_solver_new">
+            <property name="font">
+             <font>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>General FEM solver framework</string>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>useNewSolverFrameWork</cstring>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
      <item>
       <widget class="QGroupBox" name="gb_01_ccx_param">
        <property name="sizePolicy">
@@ -35,7 +107,7 @@
        </property>
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout" columnstretch="2,3">
           <item row="3" column="1">
            <widget class="Gui::PrefFileChooser" name="fc_ccx_binary_path" native="true">
             <property name="enabled">
@@ -79,14 +151,14 @@
           <item row="4" column="0">
            <widget class="QLabel" name="l_editor">
             <property name="text">
-             <string>Editor</string>
+             <string>Input file Editor</string>
             </property>
            </widget>
           </item>
           <item row="4" column="1">
            <widget class="Gui::PrefCheckBox" name="cb_int_editor">
             <property name="text">
-             <string>Use internal editor for .inp files</string>
+             <string>Use internal editor for *.inp files</string>
             </property>
             <property name="checked">
              <bool>true</bool>
@@ -118,7 +190,7 @@
           <item row="2" column="1">
            <widget class="Gui::PrefCheckBox" name="cb_ccx_binary_std">
             <property name="text">
-             <string>Use standard ccx binary path</string>
+             <string>Search in known binary directories</string>
             </property>
             <property name="checked">
              <bool>true</bool>
@@ -143,14 +215,7 @@
              </size>
             </property>
             <property name="text">
-             <string>ccx binary path:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="l_editor_3">
-            <property name="text">
-             <string>Solver frame work to run CalculiX with</string>
+             <string>ccx binary path</string>
             </property>
            </widget>
           </item>
@@ -170,7 +235,7 @@
           <item row="6" column="0">
            <widget class="QLabel" name="l_editor_2">
             <property name="text">
-             <string>Split .inp</string>
+             <string>Input file splitting</string>
             </property>
            </widget>
           </item>
@@ -180,7 +245,7 @@
              <bool>true</bool>
             </property>
             <property name="text">
-             <string>Split writing of  .inp</string>
+             <string>Split writing of  *.inp</string>
             </property>
             <property name="checked">
              <bool>false</bool>
@@ -200,50 +265,6 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="Gui::PrefRadioButton" name="rb_ccx_solver_new">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="text">
-             <string>General FEM solver framework</string>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>useNewSolverFrameWork</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="Gui::PrefRadioButton" name="rb_ccx_solver_old">
-            <property name="font">
-             <font>
-              <weight>75</weight>
-              <bold>true</bold>
-             </font>
-            </property>
-            <property name="accessibleDescription">
-             <string>sdfsdfsdfds</string>
-            </property>
-            <property name="text">
-             <string>CCX Tools (well tested)</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>useOldSolverFrameWork</cstring>
-            </property>
-           </widget>
-          </item>
          </layout>
         </item>
        </layout>
@@ -256,7 +277,7 @@
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
-         <layout class="QGridLayout" name="gl_analysis">
+         <layout class="QGridLayout" name="gl_analysis" columnstretch="3,2">
           <item row="0" column="0">
            <widget class="QLabel" name="l_type">
             <property name="text">
@@ -322,7 +343,7 @@
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_1">
         <item>
-         <layout class="QGridLayout" name="gl_solver">
+         <layout class="QGridLayout" name="gl_solver" columnstretch="3,2">
           <item row="4" column="0">
            <widget class="QLabel" name="l_use_iterations_param">
             <property name="text">
@@ -543,7 +564,7 @@
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
-         <layout class="QGridLayout" name="gl_thremomech">
+         <layout class="QGridLayout" name="gl_thremomech" columnstretch="3,2">
           <item row="3" column="0">
            <widget class="QLabel" name="l_ccx_max_iterations">
             <property name="text">
@@ -608,7 +629,7 @@
        </property>
        <layout class="QGridLayout" name="gridLayout_3">
         <item row="0" column="0">
-         <layout class="QGridLayout" name="gl_frequ" columnstretch="0,0,0">
+         <layout class="QGridLayout" name="gl_frequ" columnstretch="6,3,1">
           <item row="1" column="1">
            <widget class="Gui::PrefSpinBox" name="sb_eigenmode_number">
             <property name="maximum">
@@ -733,6 +754,11 @@
    <extends>Gui::FileChooser</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
+  <customwidget>
+   <class>Gui::PrefRadioButton</class>
+   <extends>QRadioButton</extends>
+   <header>Gui/PrefWidgets.h</header>
+  </customwidget>
   <customwidget>
    <class>Gui::PrefSpinBox</class>
    <extends>QSpinBox</extends>
@@ -748,11 +774,6 @@
    <extends>QDoubleSpinBox</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::PrefRadioButton</class>
-   <extends>QRadioButton</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="Resources/Fem.qrc"/>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui
index bc52463b86..ea3ba1199d 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemElmer.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>377</width>
+    <width>390</width>
     <height>451</height>
    </rect>
   </property>
@@ -18,149 +18,194 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="gb_elmer_param">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Binaries</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <layout class="QFormLayout" name="gl_elmer">
-        <item row="0" column="0">
-         <widget class="QLabel" name="l_elmer_binary_std">
-          <property name="text">
-           <string>ElmerSolver:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="Gui::PrefFileChooser" name="fc_elmer_binary_path" native="true">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="sizeIncrement">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="baseSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Leave blank to use default Elmer elmer binary file</string>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>elmerBinaryPath</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Fem/Elmer</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="Gui::PrefCheckBox" name="cb_elmer_binary_std">
-          <property name="text">
-           <string>use standard path</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>UseStandardElmerLocation</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Fem/Elmer</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="l_grid_binary_std">
-          <property name="text">
-           <string>ElmerGrid:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="Gui::PrefFileChooser" name="fc_grid_binary_path" native="true">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="sizeIncrement">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="baseSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Leave blank to use default ElmerGrid binary file</string>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>gridBinaryPath</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Fem/Grid</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1">
-         <widget class="Gui::PrefCheckBox" name="cb_grid_binary_std">
-          <property name="text">
-           <string>use standard path</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-          <property name="prefEntry" stdset="0">
-           <cstring>UseStandardGridLocation</cstring>
-          </property>
-          <property name="prefPath" stdset="0">
-           <cstring>Mod/Fem/Grid</cstring>
-          </property>
-         </widget>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <widget class="QGroupBox" name="gb_gmsh_param">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="layoutDirection">
+        <enum>Qt::LeftToRight</enum>
+       </property>
+       <property name="title">
+        <string>Elmer binaries</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetNoConstraint</enum>
+        </property>
+        <item>
+         <layout class="QGridLayout" name="gl_01">
+          <item row="1" column="1">
+           <widget class="Gui::PrefFileChooser" name="fc_grid_binary_path" native="true">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="sizeIncrement">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="baseSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Leave blank to use default ElmerGrid binary file</string>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>gridBinaryPath</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Grid</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="l_elmer_binary_path">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>ElmerSolver binary path</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="l_grid_binary_path">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>ElmerGrid binary path</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="l_grid_binary_std">
+            <property name="text">
+             <string>ElmerGrid:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="Gui::PrefCheckBox" name="cb_grid_binary_std">
+            <property name="text">
+             <string>Search in known binary directories</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>UseStandardGridLocation</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Grid</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="l_elmer_binary_std">
+            <property name="text">
+             <string>ElmerSolver:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="Gui::PrefCheckBox" name="cb_elmer_binary_std">
+            <property name="text">
+             <string>Search in known binary directories</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>UseStandardElmerLocation</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Elmer</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="Gui::PrefFileChooser" name="fc_elmer_binary_path" native="true">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="sizeIncrement">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="baseSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Leave blank to use default Elmer elmer binary file</string>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>elmerBinaryPath</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Elmer</cstring>
+            </property>
+           </widget>
+          </item>
+         </layout>
         </item>
        </layout>
-      </item>
-     </layout>
-    </widget>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
@@ -197,21 +242,27 @@
    <extends>Gui::FileChooser</extends>
    <header>Gui/PrefWidgets.h</header>
   </customwidget>
-  <customwidget>
-   <class>Gui::PrefRadioButton</class>
-   <extends>QRadioButton</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
-  <customwidget>
-   <class>Gui::PrefLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>Gui/PrefWidgets.h</header>
-  </customwidget>
  </customwidgets>
  <resources>
   <include location="Resources/Fem.qrc"/>
  </resources>
  <connections>
+  <connection>
+   <sender>cb_elmer_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>l_elmer_binary_path</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>71</x>
+     <y>114</y>
+    </hint>
+   </hints>
+  </connection>
   <connection>
    <sender>cb_elmer_binary_std</sender>
    <signal>toggled(bool)</signal>
@@ -228,6 +279,86 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>cb_grid_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>l_grid_binary_path</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>71</x>
+     <y>68</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_grid_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fc_grid_binary_path</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_grid_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>l_grid_binary_path</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>247</x>
+     <y>45</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>71</x>
+     <y>68</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_grid_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fc_grid_binary_path</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>247</x>
+     <y>45</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>247</x>
+     <y>68</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_elmer_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>l_elmer_binary_path</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>247</x>
+     <y>91</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>71</x>
+     <y>114</y>
+    </hint>
+   </hints>
+  </connection>
   <connection>
    <sender>cb_elmer_binary_std</sender>
    <signal>toggled(bool)</signal>
@@ -235,76 +366,12 @@
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
+     <x>247</x>
+     <y>91</y>
     </hint>
     <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cb_grid_binary_std</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>fc_grid_binary_path</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cb_grid_binary_std</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>fc_grid_binary_path</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>20</x>
-     <y>20</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cb_wd_custom</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>le_wd_custom</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>188</x>
-     <y>314</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>137</x>
-     <y>372</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>cb_wd_custom</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>le_wd_custom</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>188</x>
-     <y>314</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>137</x>
-     <y>372</y>
+     <x>247</x>
+     <y>114</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui b/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui
index 929cdfdec1..8224c2fe05 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemGeneral.ui
@@ -34,7 +34,7 @@
         <enum>Qt::LeftToRight</enum>
        </property>
        <property name="title">
-        <string>Analysis</string>
+        <string>Working directory ccx tools</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -84,7 +84,7 @@
                </size>
               </property>
               <property name="text">
-               <string>Working directory</string>
+               <string>Use custom directory</string>
               </property>
              </widget>
             </item>
@@ -104,7 +104,7 @@
         </sizepolicy>
        </property>
        <property name="title">
-        <string>Working Directory</string>
+        <string>Working directory gerneral FEM solver frame work</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
@@ -124,7 +124,7 @@
              <string>sdfsdfsdfds</string>
             </property>
             <property name="text">
-             <string>Temporary Directories</string>
+             <string>Temporary directories</string>
             </property>
             <property name="checked">
              <bool>true</bool>
@@ -171,7 +171,7 @@
              </font>
             </property>
             <property name="text">
-             <string>Beside .fcstd File</string>
+             <string>Beside .fcstd file</string>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Fem/Elmer</cstring>
@@ -215,7 +215,7 @@
              </font>
             </property>
             <property name="text">
-             <string>Use Custom Directory</string>
+             <string>Use custom directory</string>
             </property>
             <property name="prefPath" stdset="0">
              <cstring>Mod/Fem/Elmer</cstring>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui b/src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui
index aa3185d1a8..ee01f80833 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemGmsh.ui
@@ -28,7 +28,7 @@
         <enum>Qt::LeftToRight</enum>
        </property>
        <property name="title">
-        <string>Gmsh</string>
+        <string>Gmsh binary</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -42,7 +42,7 @@
           <item row="0" column="2">
            <widget class="Gui::PrefCheckBox" name="cb_gmsh_binary_std">
             <property name="text">
-             <string>Use standard gmsh binary path</string>
+             <string>Search in known binary directories</string>
             </property>
             <property name="checked">
              <bool>true</bool>
@@ -58,7 +58,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="l_gmsh_binary_std">
             <property name="text">
-             <string>Gmsh binary</string>
+             <string>gmsh</string>
             </property>
            </widget>
           </item>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui b/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui
index 4e3396fc13..5ea689ec60 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemZ88.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>FemGui::DlgSettingsFemZ88Imp</class>
  <widget class="QWidget" name="FemGui::DlgSettingsFemZ88Imp">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>369</width>
+    <height>144</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>Z88</string>
   </property>
@@ -20,7 +28,7 @@
         <enum>Qt::LeftToRight</enum>
        </property>
        <property name="title">
-        <string>Z88</string>
+        <string>Z88 binary</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -34,7 +42,7 @@
           <item row="0" column="2">
            <widget class="Gui::PrefCheckBox" name="cb_z88_binary_std">
             <property name="text">
-             <string>Use standard z88r binary path</string>
+             <string>Search in known binary directories</string>
             </property>
             <property name="checked">
              <bool>true</bool>
@@ -50,7 +58,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="l_z88_binary_std">
             <property name="text">
-             <string>Z88 binary</string>
+             <string>z88r</string>
             </property>
            </widget>
           </item>
@@ -66,7 +74,7 @@
              </size>
             </property>
             <property name="text">
-             <string>z88r binary path:</string>
+             <string>z88r binary path</string>
             </property>
            </widget>
           </item>