diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp
index 81716aa48..7828cc5a7 100644
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -121,9 +121,9 @@ namespace BlackGui
 
         void CAtcStationComponent::update()
         {
+            if (!sGui || !sGui->getIContextNetwork()) { return; }
             Q_ASSERT(this->ui->tvp_AtcStationsBooked);
             Q_ASSERT(this->ui->tvp_AtcStationsOnline);
-            Q_ASSERT(sGui->getIContextNetwork());
 
             // check if component is visible, if we have already data then skip udpate
             bool hasData = this->countBookedStations() > 0 || this->countOnlineStations() > 0;
diff --git a/src/blackgui/components/dbstashcomponent.cpp b/src/blackgui/components/dbstashcomponent.cpp
index e8c0dc01f..876b85b24 100644
--- a/src/blackgui/components/dbstashcomponent.cpp
+++ b/src/blackgui/components/dbstashcomponent.cpp
@@ -82,11 +82,6 @@ namespace BlackGui
         CDbStashComponent::~CDbStashComponent()
         { }
 
-        void CDbStashComponent::gracefulShutdown()
-        {
-            // shutdown
-        }
-
         CStatusMessage CDbStashComponent::validateStashModel(const CAircraftModel &model, bool allowReplace) const
         {
             if (!allowReplace && this->ui->tvp_StashAircraftModels->container().containsModelStringOrDbKey(model))
diff --git a/src/blackgui/components/dbstashcomponent.h b/src/blackgui/components/dbstashcomponent.h
index 74d7b68f6..26e1e93ff 100644
--- a/src/blackgui/components/dbstashcomponent.h
+++ b/src/blackgui/components/dbstashcomponent.h
@@ -70,9 +70,6 @@ namespace BlackGui
             //! Destructor
             ~CDbStashComponent();
 
-            //! Graceful shutdown
-            void gracefulShutdown();
-
             //! Test the given model if it can be stashed
             BlackMisc::CStatusMessage validateStashModel(const BlackMisc::Simulation::CAircraftModel &model, bool allowReplace) const;
 
diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 1a4cce96e..c91445625 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -547,14 +547,14 @@ namespace BlackGui
             QString modelStr(model.hasModelString() ? model.getModelString() : "<unknown>");
             if (model.getAircraftIcaoCode().hasDesignator())
             {
-                CLogMessage(this).validationInfo("Reverse lookup for %1") << modelStr;
+                CLogMessage(this).validationInfo("Reverse lookup for '%1'") << modelStr;
 
                 // update GUI
                 this->setGuiIcaoValues(model, false);
             }
             else
             {
-                CLogMessage(this).validationInfo("Reverse lookup for %1 failed, set data manually") << modelStr;
+                CLogMessage(this).validationInfo("Reverse lookup for '%1'' failed, set data manually") << modelStr;
             }
         }
 
diff --git a/src/blackgui/components/modelmatchercomponent.h b/src/blackgui/components/modelmatchercomponent.h
index 634eab9cc..bab207471 100644
--- a/src/blackgui/components/modelmatchercomponent.h
+++ b/src/blackgui/components/modelmatchercomponent.h
@@ -27,7 +27,6 @@
 class QWidget;
 
 namespace Ui { class CModelMatcherComponent; }
-
 namespace BlackGui
 {
     namespace Components
diff --git a/src/blackgui/components/statusmessageform.cpp b/src/blackgui/components/statusmessageform.cpp
index f8172245d..49ca8869d 100644
--- a/src/blackgui/components/statusmessageform.cpp
+++ b/src/blackgui/components/statusmessageform.cpp
@@ -61,5 +61,16 @@ namespace BlackGui
         {
             this->setVisible(!isVisible());
         }
+
+        void CStatusMessageForm::setReducedInfo(bool minimized)
+        {
+            ui->le_Timestamp->setVisible(!minimized);
+            ui->lbl_Timestamp->setVisible(!minimized);
+            ui->le_Categories->setVisible(!minimized);
+            ui->lbl_Categories->setVisible(!minimized);
+            ui->le_Severity->setVisible(!minimized);
+            ui->lbl_SeverityIcon->setVisible(!minimized);
+            ui->lbl_Severity->setVisible(!minimized);
+        }
     } // ns
 } // ns
diff --git a/src/blackgui/components/statusmessageform.h b/src/blackgui/components/statusmessageform.h
index da6d83ef8..7b56115f7 100644
--- a/src/blackgui/components/statusmessageform.h
+++ b/src/blackgui/components/statusmessageform.h
@@ -23,7 +23,6 @@
 class QWidget;
 
 namespace Ui { class CStatusMessageForm; }
-
 namespace BlackGui
 {
     namespace Components
@@ -52,6 +51,9 @@ namespace BlackGui
             //! Toggle visibility
             void toggleVisibility();
 
+            //! Minimize by hiding status ...
+            void setReducedInfo(bool minimized);
+
         private:
             QScopedPointer<Ui::CStatusMessageForm> ui;
         };
diff --git a/src/blackgui/components/updatetimer.cpp b/src/blackgui/components/updatetimer.cpp
index d458c2729..efd36eb2f 100644
--- a/src/blackgui/components/updatetimer.cpp
+++ b/src/blackgui/components/updatetimer.cpp
@@ -48,6 +48,5 @@ namespace BlackGui
             this->m_timer->start(); // restart other timer
             this->m_timerSingleShot->start(10);
         }
-
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/updatetimer.h b/src/blackgui/components/updatetimer.h
index 9b5d651e7..54a272372 100644
--- a/src/blackgui/components/updatetimer.h
+++ b/src/blackgui/components/updatetimer.h
@@ -25,6 +25,7 @@ namespace BlackGui
     namespace Components
     {
         //! Timer used in components for updates
+        //! \deprecated used at the beginning of the project, likely to be removed in the future
         class BLACKGUI_EXPORT CUpdateTimer: public QObject
         {
             Q_OBJECT
diff --git a/src/blackgui/components/usercomponent.cpp b/src/blackgui/components/usercomponent.cpp
index 6362cb487..ed345fb43 100644
--- a/src/blackgui/components/usercomponent.cpp
+++ b/src/blackgui/components/usercomponent.cpp
@@ -57,9 +57,9 @@ namespace BlackGui
 
         void CUserComponent::update()
         {
+            if (!sGui || !sGui->getIContextNetwork()) { return; }
             Q_ASSERT(this->ui->tvp_AllUsers);
             Q_ASSERT(this->ui->tvp_Clients);
-            Q_ASSERT(sGui->getIContextNetwork());
 
             if (sGui->getIContextNetwork()->isConnected())
             {
@@ -99,6 +99,5 @@ namespace BlackGui
                 this->ui->tvp_Clients->clear();
             }
         }
-
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/usercomponent.ui b/src/blackgui/components/usercomponent.ui
index c15c0192b..c2e8161ff 100644
--- a/src/blackgui/components/usercomponent.ui
+++ b/src/blackgui/components/usercomponent.ui
@@ -27,9 +27,6 @@
     <string>Users</string>
    </attribute>
    <layout class="QVBoxLayout" name="vl_AllUsers">
-    <property name="spacing">
-     <number>0</number>
-    </property>
     <property name="leftMargin">
      <number>0</number>
     </property>
@@ -44,6 +41,12 @@
     </property>
     <item>
      <widget class="BlackGui::Views::CUserView" name="tvp_AllUsers">
+      <property name="selectionMode">
+       <enum>QAbstractItemView::SingleSelection</enum>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
       <attribute name="verticalHeaderVisible">
        <bool>false</bool>
       </attribute>
@@ -56,9 +59,6 @@
     <string>Clients</string>
    </attribute>
    <layout class="QVBoxLayout" name="vl_Clients">
-    <property name="spacing">
-     <number>0</number>
-    </property>
     <property name="leftMargin">
      <number>0</number>
     </property>
@@ -73,6 +73,12 @@
     </property>
     <item>
      <widget class="BlackGui::Views::CClientView" name="tvp_Clients">
+      <property name="selectionMode">
+       <enum>QAbstractItemView::SingleSelection</enum>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
       <attribute name="verticalHeaderVisible">
        <bool>false</bool>
       </attribute>
@@ -80,6 +86,35 @@
     </item>
    </layout>
   </widget>
+  <widget class="QWidget" name="tb_MatchingLog">
+   <attribute name="title">
+    <string>Matching log</string>
+   </attribute>
+   <layout class="QVBoxLayout" name="vl_MatchingLog">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="BlackGui::Components::CModelMatcherLogComponent" name="comp_MatchingLog">
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>
@@ -92,6 +127,12 @@
    <extends>QTableView</extends>
    <header>blackgui/views/clientview.h</header>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CModelMatcherLogComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/modelmatcherlogcomponent.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>