Index: simulator/plugins/HDOpMode/loader.py
===================================================================
diff -u -red2d7cb5c8c2059444fd17cd4e1c0975461a903c -r68ba5188e33d6f05936fb77626822f416b9abb37
--- simulator/plugins/HDOpMode/loader.py	(.../loader.py)	(revision ed2d7cb5c8c2059444fd17cd4e1c0975461a903c)
+++ simulator/plugins/HDOpMode/loader.py	(.../loader.py)	(revision 68ba5188e33d6f05936fb77626822f416b9abb37)
@@ -39,7 +39,7 @@
         :return: none
         """
         self.tbReset.clicked.connect(self._init_widgets)
-        self.tblOpMode.cellClicked.connect(self.do_treatment_states)
+        self.tblOpMode.currentCellChanged.connect(self.do_treatment_states)
 
     @Slot()
     def _init_widgets(self):
Index: simulator/plugins/filterFlush/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -r68ba5188e33d6f05936fb77626822f416b9abb37
--- simulator/plugins/filterFlush/interface.ui	(.../interface.ui)	(revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/filterFlush/interface.ui	(.../interface.ui)	(revision 68ba5188e33d6f05936fb77626822f416b9abb37)
@@ -154,7 +154,7 @@
           <number>300</number>
          </property>
          <property name="value">
-          <number>0</number>
+          <number>300</number>
          </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
Index: simulator/plugins/pretreatmentstates/interface.ui
===================================================================
diff -u -re847980b3b629b142afe7403587fd4cc13ac8ba3 -r68ba5188e33d6f05936fb77626822f416b9abb37
--- simulator/plugins/pretreatmentstates/interface.ui	(.../interface.ui)	(revision e847980b3b629b142afe7403587fd4cc13ac8ba3)
+++ simulator/plugins/pretreatmentstates/interface.ui	(.../interface.ui)	(revision 68ba5188e33d6f05936fb77626822f416b9abb37)
@@ -6,14 +6,26 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>991</width>
+    <width>678</width>
     <height>1082</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>&amp;1 States/&amp;2 Pre-Treatment &amp;States</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -59,12 +71,24 @@
       <property name="geometry">
        <rect>
         <x>0</x>
-        <y>0</y>
-        <width>957</width>
-        <height>1521</height>
+        <y>-479</y>
+        <width>650</width>
+        <height>1515</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <property name="topMargin">
+        <number>6</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
+       <property name="bottomMargin">
+        <number>6</number>
+       </property>
        <item>
         <widget class="QTableWidget" name="tblSubMode">
          <property name="minimumSize">
Index: simulator/plugins/pretreatmentstates/loader.py
===================================================================
diff -u -rad05ce7c5ed604813d9fd6ba1ad487096c9729b8 -r68ba5188e33d6f05936fb77626822f416b9abb37
--- simulator/plugins/pretreatmentstates/loader.py	(.../loader.py)	(revision ad05ce7c5ed604813d9fd6ba1ad487096c9729b8)
+++ simulator/plugins/pretreatmentstates/loader.py	(.../loader.py)	(revision 68ba5188e33d6f05936fb77626822f416b9abb37)
@@ -59,15 +59,15 @@
         """
         self.tbReset.clicked.connect(self._init_widgets)
 
-        self.tblSubMode.cellClicked.connect(self.do_treatment_states)
-        self.tblWaterSampleStates.cellClicked.connect(self.do_treatment_states)
-        self.tblConsumablesSelfTestStates.cellClicked.connect(self.do_treatment_states)
-        self.tblNoCartridgeSelfTestStates.cellClicked.connect(self.do_treatment_states)
-        self.tblInstallationStates.cellClicked.connect(self.do_treatment_states)
-        self.tblDrySelfTestStates.cellClicked.connect(self.do_treatment_states)
-        self.tblPrimeStates.cellClicked.connect(self.do_treatment_states)
-        self.tblRecirculateStates.cellClicked.connect(self.do_treatment_states)
-        self.tblPatientConnectionStates.cellClicked.connect(self.do_treatment_states)
+        self.tblSubMode.currentCellChanged.connect(self.do_treatment_states)
+        self.tblWaterSampleStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblConsumablesSelfTestStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblNoCartridgeSelfTestStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblInstallationStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblDrySelfTestStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblPrimeStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblRecirculateStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblPatientConnectionStates.currentCellChanged.connect(self.do_treatment_states)
 
     @Slot()
     def _init_widgets(self):
Index: simulator/plugins/treatmentstates/loader.py
===================================================================
diff -u -red2d7cb5c8c2059444fd17cd4e1c0975461a903c -r68ba5188e33d6f05936fb77626822f416b9abb37
--- simulator/plugins/treatmentstates/loader.py	(.../loader.py)	(revision ed2d7cb5c8c2059444fd17cd4e1c0975461a903c)
+++ simulator/plugins/treatmentstates/loader.py	(.../loader.py)	(revision 68ba5188e33d6f05936fb77626822f416b9abb37)
@@ -57,15 +57,15 @@
         """
         self.tbReset.clicked.connect(self._init_widgets)
 
-        self.tblSubMode.cellClicked.connect(self.do_treatment_states)
-        self.tblUFStates.cellClicked.connect(self.do_treatment_states)
-        self.tblSalineStates.cellClicked.connect(self.do_treatment_states)
-        self.tblHeparinStates.cellClicked.connect(self.do_treatment_states)
-        self.tblRinsebackStates.cellClicked.connect(self.do_treatment_states)
-        self.tblRecirculateStates.cellClicked.connect(self.do_treatment_states)
-        self.tblBloodPrimeStates.cellClicked.connect(self.do_treatment_states)
-        self.tblTreatmentEndStates.cellClicked.connect(self.do_treatment_states)
-        self.tblTreatmentStopStates.cellClicked.connect(self.do_treatment_states)
+        self.tblSubMode.currentCellChanged.connect(self.do_treatment_states)
+        self.tblUFStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblSalineStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblHeparinStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblRinsebackStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblRecirculateStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblBloodPrimeStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblTreatmentEndStates.currentCellChanged.connect(self.do_treatment_states)
+        self.tblTreatmentStopStates.currentCellChanged.connect(self.do_treatment_states)
         # apply/send the initial states
         # self.do_treatment_states()
 
Index: simulator/simulator/loader.py
===================================================================
diff -u -rad05ce7c5ed604813d9fd6ba1ad487096c9729b8 -r68ba5188e33d6f05936fb77626822f416b9abb37
--- simulator/simulator/loader.py	(.../loader.py)	(revision ad05ce7c5ed604813d9fd6ba1ad487096c9729b8)
+++ simulator/simulator/loader.py	(.../loader.py)	(revision 68ba5188e33d6f05936fb77626822f416b9abb37)
@@ -38,6 +38,9 @@
             self.__init_plugins()
             self.__init_actions()
 
+        # self.hd_simulator.cmd_set_treatment_blood_flow_rate(0, 11, 12, 13, 14, 15, 16, 17)
+        # self.hd_simulator.cmd_set_treatment_dialysate_flow_rate(0, 11, 12, 13, 14, 15, 16, 17)
+
     def _init_loader(self):
         """
         initializes the class by calling it's initializer methods to make objects ready