Index: sources/ApplicationController.cpp
===================================================================
diff -u -raa8f2c87c14c68d1fda6da2540d47144990a596c -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision aa8f2c87c14c68d1fda6da2540d47144990a596c)
+++ sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -49,7 +49,7 @@
     _init = true;
 
     initConnections();
-    LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
@@ -169,7 +169,7 @@
 
 /*!
  * \brief   ApplicationController::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void ApplicationController::quitThread()
Index: sources/MainTimer.cpp
===================================================================
diff -u -r6816b783f50e08267aa016d64350bc020080d901 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/MainTimer.cpp	(.../MainTimer.cpp)	(revision 6816b783f50e08267aa016d64350bc020080d901)
+++ sources/MainTimer.cpp	(.../MainTimer.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -46,7 +46,7 @@
     else {
         startTimer(_interval);
     }
-    LOG_DEBUG("UI," + tr("Main Timer Initialized"));
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
     return true;
 }
 
Index: sources/bluetooth/BluetoothInterface.cpp
===================================================================
diff -u -raeb915075b9e13e5c1aaf2800ba6db03b6c24a0b -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/bluetooth/BluetoothInterface.cpp	(.../BluetoothInterface.cpp)	(revision aeb915075b9e13e5c1aaf2800ba6db03b6c24a0b)
+++ sources/bluetooth/BluetoothInterface.cpp	(.../BluetoothInterface.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -49,7 +49,7 @@
     // runs in BluetoothInterface thread
     // REMINDER:initConnections(); has been removed from here to the ondoStart,
     //          since the _local, _agent objects are created there.
-    LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
@@ -108,7 +108,7 @@
 
 /*!
  * \brief   BluetoothInterface::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void BluetoothInterface::quitThread()
@@ -698,7 +698,7 @@
             Types::U08 batteryLevel;
             if (GetValue(data, index, batteryLevel)) {
                 _tempBatt = batteryLevel.value;
-                LOG_DEBUG("UI," + tr("BCUFF Battery: %1").arg(_tempBatt));
+                LOG_DEBUG_UI(tr("BCUFF Battery: %1").arg(_tempBatt));
             }
             break;
         }
Index: sources/canbus/CanInterface.cpp
===================================================================
diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/canbus/CanInterface.cpp	(.../CanInterface.cpp)	(revision fc329c788fe9453983072bee937ccbc95b4ed6e4)
+++ sources/canbus/CanInterface.cpp	(.../CanInterface.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -163,7 +163,7 @@
 
 /*!
  * \brief   CanInterface::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void CanInterface::quitThread()
Index: sources/canbus/FrameInterface.cpp
===================================================================
diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/canbus/FrameInterface.cpp	(.../FrameInterface.cpp)	(revision fc329c788fe9453983072bee937ccbc95b4ed6e4)
+++ sources/canbus/FrameInterface.cpp	(.../FrameInterface.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -47,7 +47,7 @@
 
     startTimer(1, Qt::PreciseTimer);
 
-    LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
@@ -118,7 +118,7 @@
 
 /*!
  * \brief   FrameInterface::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void FrameInterface::quitThread()
Index: sources/canbus/MessageAcknowModel.cpp
===================================================================
diff -u -rf98a23fd4677490ac79802cb675296e51b9cebf2 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/canbus/MessageAcknowModel.cpp	(.../MessageAcknowModel.cpp)	(revision f98a23fd4677490ac79802cb675296e51b9cebf2)
+++ sources/canbus/MessageAcknowModel.cpp	(.../MessageAcknowModel.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -44,7 +44,7 @@
 
     // runs in MessageAcknowModel thread
     initConnections();
-    LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
@@ -110,7 +110,7 @@
 
 /*!
  * \brief   MessageAcknowModel::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void MessageAcknowModel::quitThread()
Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r54221e0e6482d4124661190fab14551cba0ec535 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 54221e0e6482d4124661190fab14551cba0ec535)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -48,7 +48,7 @@
     // runs in the thread
     initConnections();
 
-    LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
@@ -128,7 +128,7 @@
 
 /*!
  * \brief   MessageDispatcher::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void MessageDispatcher::quitThread()
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision fc329c788fe9453983072bee937ccbc95b4ed6e4)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -212,7 +212,6 @@
 bool MessageInterpreter::interpretMessage(const Gui::GuiActionType &vActionId, const QVariantList &vData, QByteArray &vPayload, Can_Id &vCanId)
 {
     bool ok = true;
-    QString mSenderID = "UI,";
     if (vCanId == Can::Can_Id::eChlid_NONE  )
         vCanId =  Can::Can_Id::eChlid_UI_HD ;
     vPayload.clear();
@@ -227,14 +226,14 @@
         if ( length ) { // this message has a variable length
             vPayload = Format::fromVariant(vData[0]);
         }
-        // LOG_EVENT(mSenderID + QString("CheckIn"));
+        // LOG_EVENT_UI(QString("CheckIn"));
         break;
 
     case Gui::GuiActionType::ID_RawData: // len: 255, can have any len
         if ( length ) { // this message has a variable length
             vPayload = Format::fromVariant(vData[0]);
         }
-        LOG_EVENT(mSenderID + QString("RawData"));
+        LOG_EVENT_UI(QString("RawData"));
         break;
 
     case Gui::GuiActionType::ID_PowerOff                                : INTERPRET_TRANSMIT_MESSAGE(AdjustPowerOffRequestData                      ); break;
@@ -291,7 +290,7 @@
     // coco end
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
-        LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
+        LOG_DEBUG_UI(tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));
         ok = false;
         break;
     }
Index: sources/gui/GuiController.cpp
===================================================================
diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision fc329c788fe9453983072bee937ccbc95b4ed6e4)
+++ sources/gui/GuiController.cpp	(.../GuiController.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -125,7 +125,7 @@
 
 /*!
  * \brief   GuiController::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void GuiController::quitThread()
@@ -149,7 +149,7 @@
 
     initConnections();
 
-    LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
 
     return true;
 }
Index: sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml
===================================================================
diff -u -raeb915075b9e13e5c1aaf2800ba6db03b6c24a0b -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml	(.../SettingsBluetoothCuff.qml)	(revision aeb915075b9e13e5c1aaf2800ba6db03b6c24a0b)
+++ sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml	(.../SettingsBluetoothCuff.qml)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -24,8 +24,8 @@
 import "qrc:/components"
 
 /*!
- * \brief   SettingsVolumeBrightness is used to adjust the
- *          volume (alarm/system), brightness on the device
+ * \brief   SettingsBluetoothCuff is used to scan for Omron Bluetooth Cuff
+ *          devices and to let user to connect to it to be able to read the Vital measurements.
  */
 SettingsBase                { id: _root
     itemIndex : SettingsStack.Bluetooth
Index: sources/storage/Logger.cpp
===================================================================
diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/storage/Logger.cpp	(.../Logger.cpp)	(revision fc329c788fe9453983072bee937ccbc95b4ed6e4)
+++ sources/storage/Logger.cpp	(.../Logger.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -87,9 +87,9 @@
 {
     if ( ! checkThread() ) return;
     ADD_EVENT_HEADER;
-    LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className()));
-    LOG_DEBUG("UI," + QString("Application %1 Started").arg(qApp->applicationName()));
-    LOG_EVENT("UI," + qApp-> applicationVersion());
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG_UI(tr("Application %1 Started").arg(qApp->applicationName()));
+    LOG_EVENT_UI(qApp-> applicationVersion());
 }
 
 /*!
@@ -167,7 +167,7 @@
 // coco end
 /*!
  * \brief   Logger::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void Logger::quitThread()
Index: sources/storage/Logger.h
===================================================================
diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/storage/Logger.h	(.../Logger.h)	(revision fc329c788fe9453983072bee937ccbc95b4ed6e4)
+++ sources/storage/Logger.h	(.../Logger.h)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -28,12 +28,15 @@
 
 #define LOG_EXPORT          _Logger.concurrentExportLogs()
 
-#define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug, true )
-
 #define ADD_EVENT_HEADER    emit Storage::Logger::I().didLog(_headerE, Storage::Logger::LogType::eLogEvent, false)
 #define LOG_EVENT(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogEvent, true )
 #define LOG_DATUM(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDatum, true )
+#define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug, true )
 
+#define LOG_EVENT_UI(vCONTENT) emit Storage::Logger::I().didLog("UI," + vCONTENT, Storage::Logger::LogType::eLogEvent, true )
+#define LOG_DATUM_UI(vCONTENT) emit Storage::Logger::I().didLog("UI," + vCONTENT, Storage::Logger::LogType::eLogDatum, true )
+#define LOG_DEBUG_UI(vCONTENT) emit Storage::Logger::I().didLog("UI," + vCONTENT, Storage::Logger::LogType::eLogDebug, true )
+
 #define MIXED_EVENT_DATUM
 
 #undef DISABLE_ACKNOW_CHECKIN_MESSAGE_LOG
Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp
===================================================================
diff -u -raeb915075b9e13e5c1aaf2800ba6db03b6c24a0b -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp	(.../VCommonAdjustmentVitals.cpp)	(revision aeb915075b9e13e5c1aaf2800ba6db03b6c24a0b)
+++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp	(.../VCommonAdjustmentVitals.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -48,7 +48,7 @@
 {
     if ( ! _enabled ) {
         // if the vitals is disabled it means Gui is probably in an incorrect state and is unable to handle the vital information.
-        LOG_EVENT("UI," + tr("Measured vital values ignored due to incorrect state"));
+        LOG_EVENT_UI(tr("Measured vital values ignored due to incorrect state"));
         return;
     }
 
@@ -74,7 +74,7 @@
 
     update(vSystolic, vDiastolic, vHeartRate);
     treatmentLog();
-    LOG_EVENT("UI," + tr("User Vital Confirmation,%1,%2,%3")
+    LOG_EVENT_UI(tr("User Vital Confirmation,%1,%2,%3")
               .arg(_systolic )
               .arg(_diastolic)
               .arg(_heartRate)
@@ -88,7 +88,7 @@
  */
 void View::VTreatmentVitals::doSkip()
 {
-    LOG_EVENT("UI," + tr("User Skipped Vital Entry"));
+    LOG_EVENT_UI(tr("User Skipped Vital Entry"));
 }
 
 /*!
@@ -97,7 +97,7 @@
  */
 void View::VTreatmentVitals::doTimeout()
 {
-    LOG_EVENT("UI," + tr("User Vital Entry Timed out"));
+    LOG_EVENT_UI(tr("User Vital Entry Timed out"));
 }
 
 /*!
Index: sources/wifi/WifiInterface.cpp
===================================================================
diff -u -re4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845 -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e
--- sources/wifi/WifiInterface.cpp	(.../WifiInterface.cpp)	(revision e4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845)
+++ sources/wifi/WifiInterface.cpp	(.../WifiInterface.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
@@ -193,7 +193,7 @@
 
 /*!
  * \brief   MessageAcknowModel::quitThread
- * \details Moves this object to main thread to be handled by QApplicaiton
+ * \details Moves this object to main thread to be handled by QApplication
  *          And to be destroyed there.
  */
 void WifiInterface::quitThread()
@@ -220,7 +220,7 @@
     _init = true;
 
     initConnections();
-    LOG_DEBUG("UI," + tr("%1 Initialized").arg(metaObject()->className()));
+    LOG_DEBUG_UI(tr("%1 Initialized").arg(metaObject()->className()));
     return true;
 }