Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -red9ea343a2a22623796045d9e1229a2cbfa8c970 -rd0c1c6aa5856a7acbca29a4c5435cc20db3ea383
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision ed9ea343a2a22623796045d9e1229a2cbfa8c970)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision d0c1c6aa5856a7acbca29a4c5435cc20db3ea383)
@@ -675,7 +675,8 @@
 bool MessageInterpreter::logUnhandledMessage(const Message &vMessage) const {
     bool ok = false;
     quint16 id = vMessage.actionId;
-    QString logString;    if (_messageList.contains(id)) {
+    QString logString;
+    if (_messageList.contains(id)) {
         ok = true;
         QStringList items = _messageList[id];
         int index = 0;
Index: sources/cloudsync/CloudSyncController.h
===================================================================
diff -u -r1c23a7f4c576dd70c2bfb94a85af470b7d641f1e -rd0c1c6aa5856a7acbca29a4c5435cc20db3ea383
--- sources/cloudsync/CloudSyncController.h	(.../CloudSyncController.h)	(revision 1c23a7f4c576dd70c2bfb94a85af470b7d641f1e)
+++ sources/cloudsync/CloudSyncController.h	(.../CloudSyncController.h)	(revision d0c1c6aa5856a7acbca29a4c5435cc20db3ea383)
@@ -99,7 +99,6 @@
         eError_CredentialRemove , // the credential files sent to UI can't be removed.
         eError_CredentialEmpty  , // the UI folder doesn't have credential files.
 
-
         eError_OutFileEmpty     , // Out file has changed from CS2UI but the content is empty.
     };
 
Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r23eda7b49841f242485b70d0a96f4bdde50f71bc -rd0c1c6aa5856a7acbca29a4c5435cc20db3ea383
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 23eda7b49841f242485b70d0a96f4bdde50f71bc)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision d0c1c6aa5856a7acbca29a4c5435cc20db3ea383)
@@ -480,8 +480,6 @@
  */
 void DeviceController::onProcessBrightnessExitCode(int vExitCode, QProcess::ExitStatus)
 {
-    // TODO: Move this into the model.
-    // _deviceBrightnessResponse._data.mBrightnessPercent = _deviceBrightnessRequest._data.mBrightness_old * 10; // set to old value in case of error
     if ( ! checkError(static_cast<DeviceError::Scripts_Error_Enum>(vExitCode), _deviceBrightnessResponse, _deviceBrightnessResponse.toString()) ) { // has no error
         if (_deviceBrightnessRequest._data.mRead) {
             bool ok = false;
Index: sources/device/DeviceModels.cpp
===================================================================
diff -u -r23eda7b49841f242485b70d0a96f4bdde50f71bc -rd0c1c6aa5856a7acbca29a4c5435cc20db3ea383
--- sources/device/DeviceModels.cpp	(.../DeviceModels.cpp)	(revision 23eda7b49841f242485b70d0a96f4bdde50f71bc)
+++ sources/device/DeviceModels.cpp	(.../DeviceModels.cpp)	(revision d0c1c6aa5856a7acbca29a4c5435cc20db3ea383)
@@ -126,8 +126,6 @@
  */
 Device::DeviceError::Scripts_Error_Enum MDeviceBrightnessRequest::setBrightnessSysVal()
 {
-    // _data.mBrightnessPercent = 200;
-
     // check range(min,max)
     quint8 len = UI2HW.size();
     if ( ! len ) {
Index: sources/device/DeviceModels.h
===================================================================
diff -u -r23eda7b49841f242485b70d0a96f4bdde50f71bc -rd0c1c6aa5856a7acbca29a4c5435cc20db3ea383
--- sources/device/DeviceModels.h	(.../DeviceModels.h)	(revision 23eda7b49841f242485b70d0a96f4bdde50f71bc)
+++ sources/device/DeviceModels.h	(.../DeviceModels.h)	(revision d0c1c6aa5856a7acbca29a4c5435cc20db3ea383)
@@ -89,7 +89,7 @@
 //        On the CANBus it was separated since the type of data in send and receive was totally different.
 //        But here it's the same.
     // TODO: improve later - this has to be match with HW2UI in response
-    QMap<quint8, quint8> UI2HW = { // has to map to keep the order
+    QMap<quint8, quint8> UI2HW = { // the mapping is not linear so has to be mapped to keep the order
         { 20,  1},
         { 40,  3},
         { 60,  5},
@@ -124,7 +124,7 @@
  */
 class MDeviceBrightnessResponse : public MDeviceResponseBase {
     // TODO: improve later - this has to be match with UI2HW in request
-    QMap<quint8, quint8> HW2UI = { // has to map to keep the order
+    QMap<quint8, quint8> HW2UI = { // the mapping is not linear so has to be mapped to keep the order
         {  1,  20},
         {  3,  40},
         {  5,  60},
Index: sources/gui/qml/dialogs/NotificationDialog.qml
===================================================================
diff -u -r388ecba67cdd4402c04df9516b44d714745eef7e -rd0c1c6aa5856a7acbca29a4c5435cc20db3ea383
--- sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision 388ecba67cdd4402c04df9516b44d714745eef7e)
+++ sources/gui/qml/dialogs/NotificationDialog.qml	(.../NotificationDialog.qml)	(revision d0c1c6aa5856a7acbca29a4c5435cc20db3ea383)
@@ -171,7 +171,7 @@
             horizontalCenter: parent.horizontalCenter
             rightMargin     : spacing
             leftMargin      : spacing
-            bottomMargin    : spacing / 2
+            bottomMargin    : spacing / 2 // give the content more space.
         }
 
         // IMPORTANT NOTE : Alarm Dialog buttons
Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp
===================================================================
diff -u -red9ea343a2a22623796045d9e1229a2cbfa8c970 -rd0c1c6aa5856a7acbca29a4c5435cc20db3ea383
--- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp	(.../VPreTreatmentAdjustmentDisposablesConfirm.cpp)	(revision ed9ea343a2a22623796045d9e1229a2cbfa8c970)
+++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp	(.../VPreTreatmentAdjustmentDisposablesConfirm.cpp)	(revision d0c1c6aa5856a7acbca29a4c5435cc20db3ea383)
@@ -23,7 +23,7 @@
     \details All the class signal/slot connections are defined here.
 */
 void View::VPreTreatmentAdjustmentDisposablesConfirm::initConnections() {
-    ADJUST_VIEW_CONNECTION(AdjustDisposablesConfirmRequestData);
+    ADJUST_VIEW_CONNECTION(AdjustDisposablesConfirmRequestData );
     ACTION_VIEW_CONNECTION(AdjustDisposablesConfirmResponseData);
 }
 
@@ -34,12 +34,12 @@
  */
 void View::VPreTreatmentAdjustmentDisposablesConfirm::onActionReceive(const AdjustDisposablesConfirmResponseData &vData)
 {
-    adjustment_Accepted         ( vData.mAccepted      );
-    adjustment_Reason           ( vData.mReason        );
+    adjustment_Accepted ( vData.mAccepted   );
+    adjustment_Reason   ( vData.mReason     );
 
     // *** has to be the last to let the information to be set and then emit the signal ***
     // *** otherwise will use the previous values before being set.                     ***
-    adjustment                  ( true );
+    adjustment          ( true );
 }
 
 /*!