diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp b/src/blackgui/components/aircraftmodelvalidationcomponent.cpp
index d2670dd28..d2b99894b 100644
--- a/src/blackgui/components/aircraftmodelvalidationcomponent.cpp
+++ b/src/blackgui/components/aircraftmodelvalidationcomponent.cpp
@@ -87,7 +87,7 @@ namespace BlackGui
             CAircraftMatcherSetup setup = m_matchingSettings.get();
             if (setup.doVerificationAtStartup() == checked) { return; }
             setup.setVerificationAtStartup(checked);
-            CStatusMessage msg = m_matchingSettings.setAndSave(setup);
+            const CStatusMessage msg = m_matchingSettings.setAndSave(setup);
             Q_UNUSED(msg);
         }
 
diff --git a/src/blackgui/components/aircraftmodelvalidationcomponent.ui b/src/blackgui/components/aircraftmodelvalidationcomponent.ui
index 1365eac84..5a67bf05a 100644
--- a/src/blackgui/components/aircraftmodelvalidationcomponent.ui
+++ b/src/blackgui/components/aircraftmodelvalidationcomponent.ui
@@ -25,7 +25,7 @@
       <attribute name="title">
        <string>Invalid models</string>
       </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+      <layout class="QVBoxLayout" name="vl_InvalidModels">
        <item>
         <widget class="BlackGui::Views::CAircraftModelView" name="tvp_InvalidModels">
          <property name="selectionBehavior">
@@ -59,28 +59,8 @@
    </item>
    <item>
     <widget class="QWidget" name="wi_Buttons" native="true">
-     <layout class="QHBoxLayout" name="hl_ValidationButtons">
-      <item>
-       <widget class="QCheckBox" name="cb_EnableStartupCheck">
-        <property name="text">
-         <string>check at startup</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <spacer name="hs_Buttons">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="1">
        <widget class="BlackGui::Components::CSimulatorSelector" name="comp_Simulator">
         <property name="minimumSize">
          <size>
@@ -96,24 +76,31 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QPushButton" name="pb_TriggerValidation">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="cb_EnableStartupCheck">
         <property name="text">
-         <string>trigger validation</string>
+         <string>check at startup</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="0" column="4">
+       <widget class="QPushButton" name="pb_TempDisableSelected">
+        <property name="text">
+         <string>temp.disable selected</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
        <widget class="QPushButton" name="pb_TempDisableInvalid">
         <property name="text">
          <string>temp.disable invalid</string>
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QPushButton" name="pb_TempDisableSelected">
+      <item row="0" column="2">
+       <widget class="QPushButton" name="pb_TriggerValidation">
         <property name="text">
-         <string>temp.disable selected</string>
+         <string>trigger validation</string>
         </property>
        </widget>
       </item>
diff --git a/src/blackgui/components/logcomponent.ui b/src/blackgui/components/logcomponent.ui
index 98d4efe99..b3f99d010 100644
--- a/src/blackgui/components/logcomponent.ui
+++ b/src/blackgui/components/logcomponent.ui
@@ -2,27 +2,13 @@
 <ui version="4.0">
  <class>CLogComponent</class>
  <widget class="QFrame" name="CLogComponent">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>264</width>
-    <height>335</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Log component</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::NoFrame</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Plain</enum>
-  </property>
-  <property name="lineWidth">
-   <number>0</number>
-  </property>
-  <layout class="QGridLayout" name="gl_LogComponent">
+  <layout class="QVBoxLayout" name="vl_LogComponent">
+   <property name="spacing">
+    <number>0</number>
+   </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -35,10 +21,7 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
+   <item>
     <widget class="QTabWidget" name="tw_StatusPage">
      <property name="currentIndex">
       <number>0</number>
@@ -64,14 +47,7 @@
         <number>0</number>
        </property>
        <item>
-        <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_StatusMessages">
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
-         </property>
-        </widget>
+        <widget class="BlackGui::Components::CStatusMessagesDetail" name="comp_StatusMessages"/>
        </item>
       </layout>
      </widget>
diff --git a/src/blackgui/components/statusmessagesdetail.ui b/src/blackgui/components/statusmessagesdetail.ui
index 4c10104f9..2bd09cbcd 100644
--- a/src/blackgui/components/statusmessagesdetail.ui
+++ b/src/blackgui/components/statusmessagesdetail.ui
@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>CStatusMessagesDetail</class>
  <widget class="QFrame" name="CStatusMessagesDetail">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>640</width>
-    <height>480</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Status messages plus details</string>
   </property>