Index: sources/gui/qml/pages/TreatmentFlowBase.qml
===================================================================
diff -u -rf0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957 -rbd476995001c165188e4c86010bf8b0505d2ca35
--- sources/gui/qml/pages/TreatmentFlowBase.qml	(.../TreatmentFlowBase.qml)	(revision f0cbe4cfc8a5e6e7aa58a8eeaab2d838cf2ff957)
+++ sources/gui/qml/pages/TreatmentFlowBase.qml	(.../TreatmentFlowBase.qml)	(revision bd476995001c165188e4c86010bf8b0505d2ca35)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    TreatmentFlowBase.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      01-Mar-2021
+ * \date    (last)      06-Jul-2021
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  12-Jan-2021
+ * \date    (original)  15-May-2021
  *
  */
 
@@ -28,6 +28,7 @@
 ScreenItem { id: _root
     objectName: "_TreatmentFlowBase"
 
+    property alias  informationText : _information.text
     property alias  reasonText      : _notification.text
     property alias  header          : _titleBar
     property alias  title           : _titleText
@@ -38,6 +39,7 @@
     property string instructionlocation     : ""
     property var    instructionStepNames    : []
     property var    instructionStepImages   : []
+    readonly property bool instructionIsLast: instruction ? instruction.lastStep : true
 
     property bool   hasTimeCircle           : false
     readonly property alias timeCircle      : _timeCircleLoader.item
@@ -77,6 +79,7 @@
     }
 
     Text { id: _titleText
+        visible: ! instructionBased
         anchors {
             top         : _root.top
             topMargin   : titleTopMargin
@@ -95,7 +98,7 @@
         readonly property int outerVMargin  : 15
         active              : _root.instructionBased
         anchors {
-            top             : title.bottom
+            top             : title.visible ? title.bottom : title.top
             bottom          : footer.top
             left            : parent.left
             right           : parent.right
@@ -105,6 +108,7 @@
             bottomMargin    : outerVMargin
         }
         sourceComponent     : InstructionView { id: _instructionView
+            label           : title.visible ? "" : _root.title.text
             location        : _root.instructionlocation
             stepNames       : _root.instructionStepNames
             stepImages      : _root.instructionStepImages
@@ -152,10 +156,16 @@
 
     Footer { id: _footer }
 
-    NotificationBar { id: _notification
-        iconVisible: false
+    NotificationBarSmall { id: _information
+        visible     : text
+        color       : Colors.transparent
+        textColor   : Colors.white
+        imageSource : ""
+        text        : ""
     }
 
+    NotificationBarSmall { id: _notification }
+
     Connections { target: vSettings
         onSettingsChanged : {
             if ( instructionBased ) {