diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index b3efad0fb..b0f0a77fb 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -17,7 +17,7 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
-      <widget class="QGroupBox" name="gb_calculix">
+      <widget class="QGroupBox" name="gb_01_ccx_param">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -38,8 +38,61 @@
          <enum>QLayout::SetNoConstraint</enum>
         </property>
         <item>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
+         <layout class="QGridLayout" name="gl_ccx">
+          <item row="0" column="2">
+           <widget class="Gui::PrefFileChooser" name="fc_ccx_binary" native="true">
+            <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 CalculiX ccx binary file</string>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>ccxBinaryPath</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="l_ext_editor">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>External editor:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
            <widget class="Gui::PrefCheckBox" name="cb_int_editor">
             <property name="text">
              <string>Use internal editor for .inp files</string>
@@ -51,92 +104,42 @@
              <cstring>UseInternalEditor</cstring>
             </property>
             <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem</cstring>
+             <cstring>Mod/Fem/Ccx</cstring>
             </property>
            </widget>
           </item>
-          <item>
-           <layout class="QGridLayout" name="gl_calculix">
-            <item row="2" column="0">
-             <widget class="QLabel" name="l_ext_editor">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>External editor:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="2">
-             <widget class="Gui::PrefFileChooser" name="fc_ext_editor" native="true">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="prefEntry" stdset="0">
-               <cstring>ExternalEditorPath</cstring>
-              </property>
-              <property name="prefPath" stdset="0">
-               <cstring>Mod/Fem</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="2">
-             <widget class="Gui::PrefFileChooser" name="fc_ccx_binary" native="true">
-              <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 CalculiX ccx binary file</string>
-              </property>
-              <property name="prefEntry" stdset="0">
-               <cstring>ccxBinaryPath</cstring>
-              </property>
-              <property name="prefPath" stdset="0">
-               <cstring>Mod/Fem</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="l_ccx_binary">
-              <property name="minimumSize">
-               <size>
-                <width>100</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>ccx binary</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+          <item row="1" column="0">
+           <widget class="QLabel" name="l_editor">
+            <property name="text">
+             <string>Editor</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="2">
+           <widget class="Gui::PrefFileChooser" name="fc_ext_editor" native="true">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>ExternalEditorPath</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="l_ccx_binary">
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>ccx binary</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </item>
@@ -144,35 +147,79 @@
       </widget>
      </item>
      <item>
-      <widget class="QGroupBox" name="gb_calculix_anpreferences">
+      <widget class="QGroupBox" name="gb_02_analysis_param">
+       <property name="title">
+        <string>Analysis defaults</string>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <layout class="QGridLayout" name="gl_analysis">
+          <item row="0" column="0">
+           <widget class="QLabel" name="l_type">
+            <property name="text">
+             <string>Type</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="Gui::PrefComboBox" name="cb_analysis_type">
+            <property name="minimumSize">
+             <size>
+              <width>148</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="toolTip">
+             <string>Default type on analysis</string>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>AnalysisType</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+            <item>
+             <property name="text">
+              <string>Static</string>
+             </property>
+             <property name="icon">
+              <iconset resource="Resources/Fem.qrc">
+               <normaloff>:/icons/fem-static-analysis.svg</normaloff>:/icons/fem-static-analysis.svg</iconset>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Frequency</string>
+             </property>
+             <property name="icon">
+              <iconset resource="Resources/Fem.qrc">
+               <normaloff>:/icons/fem-frequency-analysis.svg</normaloff>:/icons/fem-frequency-analysis.svg</iconset>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>Thermomech</string>
+             </property>
+             <property name="icon">
+              <iconset resource="Resources/Fem.qrc">
+               <normaloff>:/icons/fem-thermomechanical-analysis.svg</normaloff>:/icons/fem-thermomechanical-analysis.svg</iconset>
+             </property>
+            </item>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="gb_03_solver_param">
        <property name="title">
         <string>Solver defaults</string>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_1">
         <item>
-         <layout class="QGridLayout" name="gl_ccx_solver">
-          <item row="0" column="1">
-           <widget class="Gui::PrefSpinBox" name="sb_ccx_numcpu">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>40</number>
-            </property>
-            <property name="singleStep">
-             <number>1</number>
-            </property>
-            <property name="value">
-             <number>1</number>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>AnalysisNumCPUs</cstring>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-           </widget>
-          </item>
+         <layout class="QGridLayout" name="gl_solver">
           <item row="1" column="0">
            <widget class="QLabel" name="l_solver">
             <property name="enabled">
@@ -249,57 +296,26 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="l_type">
-            <property name="text">
-             <string>Type</string>
+          <item row="0" column="1">
+           <widget class="Gui::PrefSpinBox" name="sb_ccx_numcpu">
+            <property name="minimum">
+             <number>1</number>
             </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="Gui::PrefComboBox" name="cb_analysis_type">
-            <property name="minimumSize">
-             <size>
-              <width>148</width>
-              <height>0</height>
-             </size>
+            <property name="maximum">
+             <number>40</number>
             </property>
-            <property name="toolTip">
-             <string>Default type on analysis</string>
+            <property name="singleStep">
+             <number>1</number>
+            </property>
+            <property name="value">
+             <number>1</number>
             </property>
             <property name="prefEntry" stdset="0">
-             <cstring>AnalysisType</cstring>
+             <cstring>AnalysisNumCPUs</cstring>
             </property>
             <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem</cstring>
+             <cstring>Mod/Fem/Ccx</cstring>
             </property>
-            <item>
-             <property name="text">
-              <string>Static</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/Fem.qrc">
-               <normaloff>:/icons/fem-static-analysis.svg</normaloff>:/icons/fem-static-analysis.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Frequency</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/Fem.qrc">
-               <normaloff>:/icons/fem-frequency-analysis.svg</normaloff>:/icons/fem-frequency-analysis.svg</iconset>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Thermomech</string>
-             </property>
-             <property name="icon">
-              <iconset resource="Resources/Fem.qrc">
-               <normaloff>:/icons/fem-thermomechanical-analysis.svg</normaloff>:/icons/fem-thermomechanical-analysis.svg</iconset>
-             </property>
-            </item>
            </widget>
           </item>
          </layout>
@@ -308,105 +324,14 @@
       </widget>
      </item>
      <item>
-      <widget class="QGroupBox" name="thermal_analysis_params">
+      <widget class="QGroupBox" name="gb_04_thermomech_params">
        <property name="title">
         <string>Thermo mechanical defaults</string>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
-         <layout class="QGridLayout" name="thermasl_op">
-          <item row="0" column="0">
-           <widget class="QLabel" name="l_static">
-            <property name="text">
-             <string>Analysis type</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="Gui::PrefCheckBox" name="cb_static">
-            <property name="text">
-             <string>Steady State</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>StaticAnalysis</cstring>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="l_ccx_max_iterations">
-            <property name="text">
-             <string>Maximum Number of iterations</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="Gui::PrefSpinBox" name="sb_ccx_max_iterations">
-            <property name="minimum">
-             <number>1</number>
-            </property>
-            <property name="maximum">
-             <number>10000000</number>
-            </property>
-            <property name="singleStep">
-             <number>10</number>
-            </property>
-            <property name="value">
-             <number>2000</number>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>AnalysisMaxIterations</cstring>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="l_ccx_initial_time_step">
-            <property name="text">
-             <string>Initial time step</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="Gui::PrefDoubleSpinBox" name="dsb_ccx_initial_time_step">
-            <property name="decimals">
-             <number>3</number>
-            </property>
-            <property name="minimum">
-             <double>0.010000000000000</double>
-            </property>
-            <property name="maximum">
-             <double>99999999.000000000000000</double>
-            </property>
-            <property name="singleStep">
-             <double>0.010000000000000</double>
-            </property>
-            <property name="value">
-             <double>0.010000000000000</double>
-            </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>AnalysisInitialTimeStep</cstring>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="l_ccx_analysis_time">
-            <property name="text">
-             <string>End Time</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
+         <layout class="QGridLayout" name="gl_thremomech">
+          <item row="5" column="1">
            <widget class="Gui::PrefDoubleSpinBox" name="dsb_ccx_analysis_time">
             <property name="decimals">
              <number>3</number>
@@ -431,19 +356,110 @@
             </property>
            </widget>
           </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="l_ccx_max_iterations">
+            <property name="text">
+             <string>Maximum Number of iterations</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="Gui::PrefSpinBox" name="sb_ccx_max_iterations">
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>10000000</number>
+            </property>
+            <property name="singleStep">
+             <number>10</number>
+            </property>
+            <property name="value">
+             <number>2000</number>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>AnalysisMaxIterations</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="Gui::PrefDoubleSpinBox" name="dsb_ccx_initial_time_step">
+            <property name="decimals">
+             <number>3</number>
+            </property>
+            <property name="minimum">
+             <double>0.010000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>99999999.000000000000000</double>
+            </property>
+            <property name="singleStep">
+             <double>0.010000000000000</double>
+            </property>
+            <property name="value">
+             <double>0.010000000000000</double>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>AnalysisInitialTimeStep</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="l_ccx_initial_time_step">
+            <property name="text">
+             <string>Initial time step</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="l_ccx_analysis_time">
+            <property name="text">
+             <string>End Time</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="Gui::PrefCheckBox" name="cb_static">
+            <property name="text">
+             <string>Steady State</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>StaticAnalysis</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="l_static">
+            <property name="text">
+             <string>Analysis type</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>
       </widget>
      </item>
      <item>
-      <widget class="QGroupBox" name="gb_solver_params">
+      <widget class="QGroupBox" name="gb_05_frequercy_params">
        <property name="title">
         <string>Frequency defaults</string>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_5">
         <item>
-         <layout class="QGridLayout" name="gridLayout_3">
+         <layout class="QGridLayout" name="gl_freuq">
           <item row="1" column="1">
            <widget class="Gui::PrefSpinBox" name="sb_eigenmode_number">
             <property name="maximum">
@@ -456,7 +472,7 @@
              <cstring>NumberOfEigenmode</cstring>
             </property>
             <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem</cstring>
+             <cstring>Mod/Fem/Ccx</cstring>
             </property>
            </widget>
           </item>
@@ -492,7 +508,7 @@
              <cstring>EigenmodeHighLimit</cstring>
             </property>
             <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem</cstring>
+             <cstring>Mod/Fem/Ccx</cstring>
             </property>
            </widget>
           </item>
@@ -524,7 +540,7 @@
              <cstring>EigenmodeLowLimit</cstring>
             </property>
             <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem</cstring>
+             <cstring>Mod/Fem/Ccx</cstring>
             </property>
            </widget>
           </item>
@@ -600,5 +616,70 @@
  <resources>
   <include location="Resources/Fem.qrc"/>
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>cb_int_editor</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>l_ext_editor</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>406</x>
+     <y>65</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>148</x>
+     <y>88</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_int_editor</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fc_ext_editor</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>406</x>
+     <y>65</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>406</x>
+     <y>88</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_int_editor</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>l_ext_editor</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>406</x>
+     <y>65</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>148</x>
+     <y>88</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_int_editor</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fc_ext_editor</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>406</x>
+     <y>65</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>406</x>
+     <y>88</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>