diff --git a/OpenVehicleApp/ovms/ovmsBodyViewController.m b/OpenVehicleApp/ovms/ovmsBodyViewController.m
index 75ce58a..5fbc49c 100644
--- a/OpenVehicleApp/ovms/ovmsBodyViewController.m
+++ b/OpenVehicleApp/ovms/ovmsBodyViewController.m
@@ -399,49 +399,41 @@ -(void) update
     m_car_wheel_rl_temp.textColor = [UIColor whiteColor];
     }
   
-  if ([ovmsAppDelegate myRef].car_tpms_fr_temp > 0)
-    {
+  if ([ovmsAppDelegate myRef].car_tpms_fr_pressure_s > 0)
     m_car_wheel_fr_pressure.text = [ovmsAppDelegate myRef].car_tpms_fr_pressure_s;
-    m_car_wheel_fr_temp.text = [ovmsAppDelegate myRef].car_tpms_fr_temp_s;
-    }
   else
-    {
     m_car_wheel_fr_pressure.text = @"";
+  if ([ovmsAppDelegate myRef].car_tpms_fr_temp > 0)
+    m_car_wheel_fr_temp.text = [ovmsAppDelegate myRef].car_tpms_fr_temp_s;
+  else
     m_car_wheel_fr_temp.text = @"";
-    }
 
-  if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
-    {
+  if ([ovmsAppDelegate myRef].car_tpms_rr_pressure_s > 0)
     m_car_wheel_rr_pressure.text = [ovmsAppDelegate myRef].car_tpms_rr_pressure_s;
-    m_car_wheel_rr_temp.text = [ovmsAppDelegate myRef].car_tpms_rr_temp_s;
-    }
   else
-    {
     m_car_wheel_rr_pressure.text = @"";
+  if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
+    m_car_wheel_rr_temp.text = [ovmsAppDelegate myRef].car_tpms_rr_temp_s;
+  else
     m_car_wheel_rr_temp.text = @"";
-    }
 
-  if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
-    {
+  if ([ovmsAppDelegate myRef].car_tpms_fl_pressure_s > 0)
     m_car_wheel_fl_pressure.text = [ovmsAppDelegate myRef].car_tpms_fl_pressure_s;
-    m_car_wheel_fl_temp.text = [ovmsAppDelegate myRef].car_tpms_fl_temp_s;
-    }
   else
-    {
     m_car_wheel_fl_pressure.text = @"";
+  if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
+    m_car_wheel_fl_temp.text = [ovmsAppDelegate myRef].car_tpms_fl_temp_s;
+  else
     m_car_wheel_fl_temp.text = @"";
-    }
-  
-  if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
-    {
+
+  if ([ovmsAppDelegate myRef].car_tpms_rl_pressure_s > 0)
     m_car_wheel_rl_pressure.text = [ovmsAppDelegate myRef].car_tpms_rl_pressure_s;
-    m_car_wheel_rl_temp.text = [ovmsAppDelegate myRef].car_tpms_rl_temp_s;
-    }
   else
-    {
     m_car_wheel_rl_pressure.text = @"";
+  if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
+    m_car_wheel_rl_temp.text = [ovmsAppDelegate myRef].car_tpms_rl_temp_s;
+  else
     m_car_wheel_rl_temp.text = @"";
-    }
     
     m_car_aux_battery.text = [NSString stringWithFormat:@"%0.1fV",
                                 [ovmsAppDelegate myRef].car_aux_battery_voltage];
diff --git a/OpenVehicleApp/ovms/ovmsStatusViewControllerPad.m b/OpenVehicleApp/ovms/ovmsStatusViewControllerPad.m
index e62b27c..602d8be 100644
--- a/OpenVehicleApp/ovms/ovmsStatusViewControllerPad.m
+++ b/OpenVehicleApp/ovms/ovmsStatusViewControllerPad.m
@@ -819,49 +819,41 @@ -(void) updateCar
     m_car_wheel_rl_temp.textColor = [UIColor whiteColor];
     }
   
-  if ([ovmsAppDelegate myRef].car_tpms_fr_temp > 0)
-    {
+  if ([ovmsAppDelegate myRef].car_tpms_fr_pressure_s > 0)
     m_car_wheel_fr_pressure.text = [ovmsAppDelegate myRef].car_tpms_fr_pressure_s;
-    m_car_wheel_fr_temp.text = [ovmsAppDelegate myRef].car_tpms_fr_temp_s;
-    }
   else
-    {
     m_car_wheel_fr_pressure.text = @"";
+  if ([ovmsAppDelegate myRef].car_tpms_fr_temp > 0)
+    m_car_wheel_fr_temp.text = [ovmsAppDelegate myRef].car_tpms_fr_temp_s;
+  else
     m_car_wheel_fr_temp.text = @"";
-    }
-  
-  if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
-    {
+
+  if ([ovmsAppDelegate myRef].car_tpms_rr_pressure_s > 0)
     m_car_wheel_rr_pressure.text = [ovmsAppDelegate myRef].car_tpms_rr_pressure_s;
-    m_car_wheel_rr_temp.text = [ovmsAppDelegate myRef].car_tpms_rr_temp_s;
-    }
   else
-    {
     m_car_wheel_rr_pressure.text = @"";
+  if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
+    m_car_wheel_rr_temp.text = [ovmsAppDelegate myRef].car_tpms_rr_temp_s;
+  else
     m_car_wheel_rr_temp.text = @"";
-    }
-  
-  if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
-    {
+
+  if ([ovmsAppDelegate myRef].car_tpms_fl_pressure_s > 0)
     m_car_wheel_fl_pressure.text = [ovmsAppDelegate myRef].car_tpms_fl_pressure_s;
-    m_car_wheel_fl_temp.text = [ovmsAppDelegate myRef].car_tpms_fl_temp_s;
-    }
   else
-    {
     m_car_wheel_fl_pressure.text = @"";
+  if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
+    m_car_wheel_fl_temp.text = [ovmsAppDelegate myRef].car_tpms_fl_temp_s;
+  else
     m_car_wheel_fl_temp.text = @"";
-    }
-  
-  if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
-    {
+
+  if ([ovmsAppDelegate myRef].car_tpms_rl_pressure_s > 0)
     m_car_wheel_rl_pressure.text = [ovmsAppDelegate myRef].car_tpms_rl_pressure_s;
-    m_car_wheel_rl_temp.text = [ovmsAppDelegate myRef].car_tpms_rl_temp_s;
-    }
   else
-    {
     m_car_wheel_rl_pressure.text = @"";
+  if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
+    m_car_wheel_rl_temp.text = [ovmsAppDelegate myRef].car_tpms_rl_temp_s;
+  else
     m_car_wheel_rl_temp.text = @"";
-    }
 
    m_car_aux_battery.text = [NSString stringWithFormat:@"%0.1fV",
                              [ovmsAppDelegate myRef].car_aux_battery_voltage];