diff --git a/src/blackgui/components/coresettingsdialog.cpp b/src/blackgui/components/coresettingsdialog.cpp
index 587478707..2e1c6cef0 100644
--- a/src/blackgui/components/coresettingsdialog.cpp
+++ b/src/blackgui/components/coresettingsdialog.cpp
@@ -9,6 +9,7 @@
 
 #include "coresettingsdialog.h"
 #include "ui_coresettingsdialog.h"
+#include "blackgui/guiapplication.h"
 
 namespace BlackGui
 {
@@ -18,7 +19,9 @@ namespace BlackGui
             QDialog(parent),
             ui(new Ui::CCoreSettingsDialog)
         {
+            Q_ASSERT(sGui);
             ui->setupUi(this);
+            this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
         }
 
         CCoreSettingsDialog::~CCoreSettingsDialog()
diff --git a/src/blackgui/components/settingscomponent.ui b/src/blackgui/components/settingscomponent.ui
index 20a11c0ce..686b25c2b 100644
--- a/src/blackgui/components/settingscomponent.ui
+++ b/src/blackgui/components/settingscomponent.ui
@@ -316,9 +316,6 @@
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Fixed</enum>
-      </property>
       <property name="sizeHint" stdset="0">
        <size>
         <width>20</width>
@@ -350,23 +347,13 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsSimulatorMessagesComponent" name="comp_SettingsSimulatorMessages">
-      <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
-      </property>
-     </widget>
+     <widget class="BlackGui::Components::CSettingsSimulatorMessagesComponent" name="comp_SettingsSimulatorMessages"/>
     </item>
     <item>
      <spacer name="vs_SettingsSimulatorMessages">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Fixed</enum>
-      </property>
       <property name="sizeHint" stdset="0">
        <size>
         <width>20</width>
@@ -492,7 +479,7 @@
          <x>0</x>
          <y>0</y>
          <width>228</width>
-         <height>151</height>
+         <height>306</height>
         </rect>
        </property>
        <layout class="QVBoxLayout" name="vl_DataLoadOverview">
@@ -518,19 +505,6 @@
       </widget>
      </widget>
     </item>
-    <item>
-     <spacer name="vs_DataLoad">
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>20</width>
-        <height>40</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
    </layout>
   </widget>
   <widget class="QWidget" name="tb_SettingsAdvanced">
diff --git a/src/blackgui/components/settingsguicomponent.h b/src/blackgui/components/settingsguicomponent.h
index b373f80c7..16948db1d 100644
--- a/src/blackgui/components/settingsguicomponent.h
+++ b/src/blackgui/components/settingsguicomponent.h
@@ -26,7 +26,8 @@ namespace BlackGui
          * General GUI settings
          */
         class CSettingsGuiComponent :
-            public QFrame, BlackGui::CSingleApplicationUi
+            public QFrame,
+            public BlackGui::CSingleApplicationUi
         {
             Q_OBJECT
 
diff --git a/src/blackgui/components/settingssimulatormessagescomponent.ui b/src/blackgui/components/settingssimulatormessagescomponent.ui
index e1bed949d..7233b652c 100644
--- a/src/blackgui/components/settingssimulatormessagescomponent.ui
+++ b/src/blackgui/components/settingssimulatormessagescomponent.ui
@@ -13,12 +13,6 @@
   <property name="windowTitle">
    <string>Frame</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0" colspan="2">
     <widget class="QGroupBox" name="gb_TechnicalMessages">