Index: simulator/plugins/GeneralProgressMessage/interface.ui
===================================================================
diff -u -r2204a65b0af94e7e555f0f4207fd2701c164d1d5 -r12408471ebe8f39c87bd0242a2d5e36f122175d4
--- simulator/plugins/GeneralProgressMessage/interface.ui	(.../interface.ui)	(revision 2204a65b0af94e7e555f0f4207fd2701c164d1d5)
+++ simulator/plugins/GeneralProgressMessage/interface.ui	(.../interface.ui)	(revision 12408471ebe8f39c87bd0242a2d5e36f122175d4)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>468</width>
-    <height>153</height>
+    <width>375</width>
+    <height>182</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -42,7 +42,7 @@
      </item>
      <item>
       <layout class="QGridLayout" name="gridLayout_3">
-       <item row="3" column="2">
+       <item row="4" column="2">
         <widget class="QLabel" name="lblCountdown">
          <property name="minimumSize">
           <size>
@@ -63,28 +63,50 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QSlider" name="sldCountdown">
-         <property name="font">
-          <font>
-           <pointsize>10</pointsize>
-          </font>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="leMessageID">
+         <property name="inputMask">
+          <string>D000</string>
          </property>
-         <property name="minimum">
-          <number>0</number>
+         <property name="text">
+          <string>96</string>
          </property>
-         <property name="maximum">
-          <number>300</number>
+        </widget>
+       </item>
+       <item row="2" column="2">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Decimal</string>
          </property>
-         <property name="value">
-          <number>300</number>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>MsgID</string>
          </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item row="3" column="0">
+        <widget class="QLabel" name="lblTimeoutTitle">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Timeout</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
         <widget class="QLabel" name="lblCountdownTitle">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -128,23 +150,28 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="lblTimeoutTitle">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+       <item row="4" column="1">
+        <widget class="QSlider" name="sldCountdown">
+         <property name="font">
+          <font>
+           <pointsize>10</pointsize>
+          </font>
          </property>
-         <property name="text">
-          <string>Timeout</string>
+         <property name="minimum">
+          <number>0</number>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <property name="maximum">
+          <number>300</number>
          </property>
+         <property name="value">
+          <number>300</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
         </widget>
        </item>
-       <item row="2" column="1">
+       <item row="3" column="1">
         <widget class="QSlider" name="sldTimeout">
          <property name="font">
           <font>
@@ -165,7 +192,7 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="2">
+       <item row="3" column="2">
         <widget class="QLineEdit" name="leTargetMax">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -196,32 +223,22 @@
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QLabel" name="label">
+        <widget class="QRadioButton" name="rbHD">
          <property name="text">
-          <string>MsgID</string>
+          <string>HD</string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <property name="checked">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="QLineEdit" name="leMessageID">
-         <property name="inputMask">
-          <string>D000</string>
-         </property>
+        <widget class="QRadioButton" name="rbDG">
          <property name="text">
-          <string>96</string>
+          <string>DG</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="2">
-        <widget class="QLabel" name="label_3">
-         <property name="text">
-          <string>Decimal</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </item>
     </layout>
Index: simulator/plugins/GeneralProgressMessage/loader.py
===================================================================
diff -u -r2204a65b0af94e7e555f0f4207fd2701c164d1d5 -r12408471ebe8f39c87bd0242a2d5e36f122175d4
--- simulator/plugins/GeneralProgressMessage/loader.py	(.../loader.py)	(revision 2204a65b0af94e7e555f0f4207fd2701c164d1d5)
+++ simulator/plugins/GeneralProgressMessage/loader.py	(.../loader.py)	(revision 12408471ebe8f39c87bd0242a2d5e36f122175d4)
@@ -19,10 +19,11 @@
     """
     The Saline Bolus ui loader class
     """
+    rbHD: QtWidgets.QRadioButton
+    rbDG: QtWidgets.QRadioButton
     leMessageID: QtWidgets.QLineEdit
     leTargetMax: QtWidgets.QLineEdit
     sldTimeout: QtWidgets.QSlider
-    sldTimeout: QtWidgets.QSlider
     sldCountdown: QtWidgets.QSlider
 
     def __init__(self, hd_simulator: HDSimulator):
@@ -33,6 +34,8 @@
         finds and creates widgets
         :return: none
         """
+        self.rbHD = self.find_radio_button('rbHD')
+        self.rbDG = self.find_radio_button('rbDG')
         self.leMessageID = self.find_line_edit('leMessageID')
         self.leTargetMax = self.find_line_edit('leTargetMax')
         self.sldTimeout = self.find_slider('sldTimeout')
@@ -61,6 +64,7 @@
         :return: none
         """
         self.sldTimeout.setMaximum(int(value))
+        self.sldCountdown.setMaximum(int(value))
 
     @Slot()
     def do_data(self):
@@ -72,4 +76,4 @@
         message_id = self.leMessageID.text()
         timeout = self.sldTimeout.value()
         countdown = self.sldCountdown.value()
-        self.hd_simulator.cmd_send_general_progress_data(int(message_id), timeout, countdown)
+        self.hd_simulator.cmd_send_general_progress_data(int(message_id), timeout, countdown, self.rbHD.isChecked())
Index: simulator/plugins/HDOpMode/loader.py
===================================================================
diff -u -ra11b044673a77150b1d3485d43a5a001340a0feb -r12408471ebe8f39c87bd0242a2d5e36f122175d4
--- simulator/plugins/HDOpMode/loader.py	(.../loader.py)	(revision a11b044673a77150b1d3485d43a5a001340a0feb)
+++ simulator/plugins/HDOpMode/loader.py	(.../loader.py)	(revision 12408471ebe8f39c87bd0242a2d5e36f122175d4)
@@ -12,6 +12,7 @@
 from dialin.ui.hd_simulator import HDSimulator
 # plugin specific
 from dialin.common.hd_defs import HDDefs
+from dialin.common.hd_defs import HD_Standby_States
 
 
 class Loader(DynamicLoader):
@@ -50,7 +51,7 @@
         :return: none
         """
         self.tblOpMode.setCurrentCell(HDDefs.MODE_INIT.value, 0)
-        self.tblSubMode.setCurrentCell(HDDefs.MODE_INIT.value, 0)
+        self.tblSubMode.setCurrentCell(HD_Standby_States.STANDBY_START_STATE.value, 0)
 
     @Slot()
     def do_treatment_states(self):