diff --git a/OpenVehicleApp/ovms/Base.lproj/MainStoryboard_iPhone.storyboard b/OpenVehicleApp/ovms/Base.lproj/MainStoryboard_iPhone.storyboard
index 460d5bd..37cbd28 100644
--- a/OpenVehicleApp/ovms/Base.lproj/MainStoryboard_iPhone.storyboard
+++ b/OpenVehicleApp/ovms/Base.lproj/MainStoryboard_iPhone.storyboard
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="4">
-    <device id="retina3_5" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="4">
+    <device id="retina3_5" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -855,7 +857,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" alpha="0.02" tag="201" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="evp-Bg-OZv" userLabel="Homelink Button">
-                                        <rect key="frame" x="220" y="145" width="56" height="36"/>
+                                        <rect key="frame" x="220" y="114" width="56" height="36"/>
                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="56" id="ULv-eS-ZpQ"/>
@@ -867,18 +869,34 @@
                                             <color key="titleShadowColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                         </state>
                                         <connections>
-                                            <action selector="HomelinkButon:" destination="QVp-45-P9a" eventType="touchUpInside" id="08f-zF-dPj"/>
+                                            <action selector="HomelinkButton:" destination="QVp-45-P9a" eventType="touchUpInside" id="08f-zF-dPj"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" alpha="0.02" tag="201" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IOw-6D-K9h" userLabel="Climate control Button">
+                                        <rect key="frame" x="222" y="170" width="54" height="36"/>
+                                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="36" id="WPa-uZ-u9L"/>
+                                            <constraint firstAttribute="width" constant="54" id="bFT-zW-Qqy"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" type="boldSystem" size="button"/>
+                                        <state key="normal">
+                                            <color key="titleColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" red="1" green="1" blue="1" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="ClimateControlButton:" destination="QVp-45-P9a" eventType="touchUpInside" id="DPi-N7-Vl8"/>
                                         </connections>
                                     </button>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="homelink-logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="HBh-mc-tup" userLabel="Homelink Logo">
-                                        <rect key="frame" x="239" y="151" width="24" height="24"/>
+                                        <rect key="frame" x="239" y="115" width="24" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="24" id="7k4-wj-eKu"/>
                                             <constraint firstAttribute="width" constant="24" id="vWU-nQ-oVR"/>
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="HOMELINK" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="7jl-Gg-kK5" userLabel="Homelink Label">
-                                        <rect key="frame" x="222" y="166" width="57" height="18"/>
+                                        <rect key="frame" x="222" y="133" width="57" height="18"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="18" id="2Rc-ig-XUP"/>
                                             <constraint firstAttribute="width" constant="57" id="mZ7-Qk-hbb"/>
@@ -887,8 +905,37 @@
                                         <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="-" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="cye-uS-ICY" userLabel="Mcar cabin temp">
+                                        <rect key="frame" x="8" y="192.5" width="56" height="14.5"/>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="13"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="CABIN" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="XYe-6g-AOI" userLabel="Cabin temp Label">
+                                        <rect key="frame" x="9" y="175.5" width="57" height="17"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="17" id="aOC-M9-qQ4"/>
+                                            <constraint firstAttribute="width" constant="57" id="drJ-ni-q4C"/>
+                                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="17" id="fYE-BO-lY6"/>
+                                        </constraints>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="10"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="A/C" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="ytR-1U-1YW" userLabel="Climate control Label">
+                                        <rect key="frame" x="222.5" y="175.5" width="57" height="17"/>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="14"/>
+                                        <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" misplaced="YES" text="-" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="QKi-fI-Amq" userLabel="Mcar hvac status">
+                                        <rect key="frame" x="224" y="189" width="52" height="18"/>
+                                        <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="13"/>
+                                        <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="wsymbol_395.png" translatesAutoresizingMaskIntoConstraints="NO" id="J2r-IJ-j7d">
-                                        <rect key="frame" x="10" y="147" width="56" height="21"/>
+                                        <rect key="frame" x="10" y="113" width="56" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="21" id="47G-i8-pw0"/>
                                             <constraint firstAttribute="width" constant="56" id="Yrq-MI-Gx4"/>
@@ -1066,7 +1113,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="-" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="Ktq-Dz-PKA">
-                                        <rect key="frame" x="10" y="163" width="57" height="18"/>
+                                        <rect key="frame" x="10" y="133" width="57" height="18"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="18" id="Grg-46-5O0"/>
                                             <constraint firstAttribute="width" constant="57" id="Kx1-uu-4RM"/>
@@ -1082,7 +1129,9 @@
                                     <constraint firstAttribute="bottom" secondItem="ydx-jw-Xh5" secondAttribute="bottom" constant="10" id="0Kg-bP-YdH"/>
                                     <constraint firstItem="ydx-jw-Xh5" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="14" id="0Qi-8b-UT4"/>
                                     <constraint firstItem="uZW-nt-WxM" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="1xN-ld-cYE"/>
+                                    <constraint firstItem="XYe-6g-AOI" firstAttribute="trailing" secondItem="J2r-IJ-j7d" secondAttribute="trailing" id="2o4-V8-6sg"/>
                                     <constraint firstAttribute="trailing" secondItem="evp-Bg-OZv" secondAttribute="trailing" constant="11" id="3wm-3u-jTK"/>
+                                    <constraint firstItem="QKi-fI-Amq" firstAttribute="baseline" secondItem="cye-uS-ICY" secondAttribute="baseline" id="56x-rV-1z4"/>
                                     <constraint firstAttribute="bottom" secondItem="W8h-P3-hsR" secondAttribute="bottom" constant="27" id="6wb-rn-vQx"/>
                                     <constraint firstAttribute="width" constant="287" id="7ZP-Aa-iQS"/>
                                     <constraint firstItem="ZSe-co-Q5V" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="139" id="8dx-gn-kYe"/>
@@ -1090,7 +1139,9 @@
                                     <constraint firstAttribute="bottom" secondItem="uZW-nt-WxM" secondAttribute="bottom" constant="10" id="APs-95-hKn"/>
                                     <constraint firstItem="Nol-jU-v3m" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="Acg-5O-ffw"/>
                                     <constraint firstItem="ME6-jf-qXo" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="B33-i0-M6B"/>
+                                    <constraint firstItem="IOw-6D-K9h" firstAttribute="leading" secondItem="7jl-Gg-kK5" secondAttribute="leading" id="BNv-0f-9hq"/>
                                     <constraint firstItem="E6h-hK-fCp" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="10" id="DA4-Ix-IQX"/>
+                                    <constraint firstItem="XYe-6g-AOI" firstAttribute="centerY" secondItem="A0o-RY-onr" secondAttribute="centerY" id="E7g-Zi-bsw"/>
                                     <constraint firstItem="kzO-qD-izT" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="Enu-99-kPT"/>
                                     <constraint firstItem="L3M-Se-Ave" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="10" id="Eud-eu-ma5"/>
                                     <constraint firstItem="tWp-hW-qv5" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="8" id="FaJ-rv-AFC"/>
@@ -1099,6 +1150,7 @@
                                     <constraint firstAttribute="trailing" secondItem="dSt-fr-TTW" secondAttribute="trailing" constant="10" id="GhO-dh-9xP"/>
                                     <constraint firstAttribute="height" constant="368" id="HVO-T4-lkP"/>
                                     <constraint firstItem="fn1-Q1-0eF" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="139" id="KV6-u6-0g8"/>
+                                    <constraint firstItem="yOm-eK-EiO" firstAttribute="top" secondItem="QKi-fI-Amq" secondAttribute="bottom" constant="30" id="LhM-p0-Pe1"/>
                                     <constraint firstItem="yy1-Al-VLM" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="24" id="MWJ-0K-8hg"/>
                                     <constraint firstItem="uyN-xq-DsY" firstAttribute="top" secondItem="0rd-Ad-rTR" secondAttribute="bottom" constant="1" id="N5Y-vg-FLE"/>
                                     <constraint firstItem="MO1-D4-O0F" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="24" id="PD6-iP-MIx"/>
@@ -1107,44 +1159,55 @@
                                     <constraint firstItem="E6h-hK-fCp" firstAttribute="top" secondItem="1Vf-q6-6iU" secondAttribute="bottom" id="Qac-wQ-okr"/>
                                     <constraint firstItem="ZSe-co-Q5V" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="96" id="SL1-U5-r9L"/>
                                     <constraint firstItem="Nol-jU-v3m" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="24" id="T37-ww-N84"/>
+                                    <constraint firstItem="QKi-fI-Amq" firstAttribute="trailing" secondItem="evp-Bg-OZv" secondAttribute="trailing" id="TQ0-YD-4Gs"/>
                                     <constraint firstItem="OC6-3T-D0U" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="10" id="TTt-RH-WZe"/>
                                     <constraint firstItem="Gj2-y1-rHO" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="ULB-yg-5bZ"/>
                                     <constraint firstItem="Ktq-Dz-PKA" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="10" id="UNB-XW-rxm"/>
                                     <constraint firstAttribute="bottom" secondItem="kzO-qD-izT" secondAttribute="bottom" constant="10" id="VGI-MZ-iNJ"/>
-                                    <constraint firstItem="7jl-Gg-kK5" firstAttribute="top" secondItem="uyN-xq-DsY" secondAttribute="bottom" constant="78" id="WE6-PP-2aE"/>
+                                    <constraint firstItem="XYe-6g-AOI" firstAttribute="top" secondItem="ytR-1U-1YW" secondAttribute="top" id="Vem-pt-GZU"/>
+                                    <constraint firstItem="7jl-Gg-kK5" firstAttribute="top" secondItem="uyN-xq-DsY" secondAttribute="bottom" constant="45" id="WE6-PP-2aE"/>
                                     <constraint firstItem="CmF-mX-gkX" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="10" id="WjN-sJ-Frr"/>
                                     <constraint firstItem="MO1-D4-O0F" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="Wnb-8a-VWF"/>
                                     <constraint firstItem="1Vf-q6-6iU" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="10" id="XGp-k2-sej"/>
                                     <constraint firstAttribute="bottom" secondItem="ZT2-sz-zYB" secondAttribute="bottom" constant="10" id="Y98-50-ZGP"/>
-                                    <constraint firstItem="evp-Bg-OZv" firstAttribute="top" secondItem="uyN-xq-DsY" secondAttribute="bottom" constant="57" id="YNv-L0-L1O"/>
+                                    <constraint firstItem="evp-Bg-OZv" firstAttribute="top" secondItem="uyN-xq-DsY" secondAttribute="bottom" constant="26" id="YNv-L0-L1O"/>
                                     <constraint firstAttribute="bottom" secondItem="Hvm-f7-boq" secondAttribute="bottom" constant="10" id="Z8h-53-VvG"/>
                                     <constraint firstItem="0rd-Ad-rTR" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="53" id="ZH8-AJ-hqR"/>
                                     <constraint firstItem="W8h-P3-hsR" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="akf-PQ-d61"/>
+                                    <constraint firstItem="ytR-1U-1YW" firstAttribute="leading" secondItem="cuU-21-cm1" secondAttribute="trailing" constant="3" id="bHq-11-erq"/>
                                     <constraint firstAttribute="bottom" secondItem="dSt-fr-TTW" secondAttribute="bottom" constant="27" id="bMT-6E-b5V"/>
                                     <constraint firstAttribute="trailing" secondItem="fn1-Q1-0eF" secondAttribute="trailing" constant="89" id="dpw-F0-CI4"/>
+                                    <constraint firstItem="ytR-1U-1YW" firstAttribute="centerX" secondItem="HBh-mc-tup" secondAttribute="centerX" id="eFw-kk-Ubc"/>
                                     <constraint firstItem="sLP-2x-CjX" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="24" id="eVb-tF-BRv"/>
                                     <constraint firstItem="982-WB-UWS" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="eal-83-PuG"/>
                                     <constraint firstItem="1Vf-q6-6iU" firstAttribute="top" secondItem="OC6-3T-D0U" secondAttribute="bottom" constant="148" id="ekG-X7-hOc"/>
                                     <constraint firstAttribute="trailing" secondItem="HBh-mc-tup" secondAttribute="trailing" constant="24" id="en2-oF-FJB"/>
                                     <constraint firstItem="55m-RB-368" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="10" id="eph-y3-LI8"/>
                                     <constraint firstItem="cuU-21-cm1" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="10" id="fgg-HU-Rc3"/>
+                                    <constraint firstItem="QKi-fI-Amq" firstAttribute="top" secondItem="7jl-Gg-kK5" secondAttribute="bottom" constant="38" id="g4x-Rm-bvU"/>
                                     <constraint firstItem="OC6-3T-D0U" firstAttribute="top" secondItem="CmF-mX-gkX" secondAttribute="bottom" id="gll-Us-Wnu"/>
+                                    <constraint firstItem="QKi-fI-Amq" firstAttribute="centerX" secondItem="7jl-Gg-kK5" secondAttribute="centerX" id="hcP-NX-bWa"/>
                                     <constraint firstItem="55m-RB-368" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="10" id="i8r-ha-BSk"/>
-                                    <constraint firstItem="J2r-IJ-j7d" firstAttribute="top" secondItem="OC6-3T-D0U" secondAttribute="bottom" constant="58" id="kfr-IY-25l"/>
+                                    <constraint firstItem="J2r-IJ-j7d" firstAttribute="top" secondItem="OC6-3T-D0U" secondAttribute="bottom" constant="24" id="kfr-IY-25l"/>
                                     <constraint firstItem="CmF-mX-gkX" firstAttribute="top" secondItem="55m-RB-368" secondAttribute="bottom" constant="23" id="kkX-Ak-bu4"/>
-                                    <constraint firstItem="HBh-mc-tup" firstAttribute="top" secondItem="uyN-xq-DsY" secondAttribute="bottom" constant="63" id="l3x-dD-EgP"/>
+                                    <constraint firstItem="HBh-mc-tup" firstAttribute="top" secondItem="uyN-xq-DsY" secondAttribute="bottom" constant="27" id="l3x-dD-EgP"/>
                                     <constraint firstItem="yy1-Al-VLM" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="lmL-6t-9vz"/>
                                     <constraint firstItem="L3M-Se-Ave" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="10" id="mcv-Kr-WO7"/>
                                     <constraint firstItem="72a-c3-rKG" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="24" id="nLw-QH-P5L"/>
                                     <constraint firstItem="J2r-IJ-j7d" firstAttribute="leading" secondItem="A0o-RY-onr" secondAttribute="leading" constant="10" id="o6B-6T-h8G"/>
+                                    <constraint firstItem="cye-uS-ICY" firstAttribute="centerX" secondItem="1Vf-q6-6iU" secondAttribute="centerX" id="omT-j0-fcM"/>
+                                    <constraint firstItem="cye-uS-ICY" firstAttribute="leading" secondItem="tWp-hW-qv5" secondAttribute="leading" id="pIs-cX-tQo"/>
                                     <constraint firstAttribute="trailing" secondItem="Hvm-f7-boq" secondAttribute="trailing" constant="10" id="pOY-G0-0Cn"/>
                                     <constraint firstItem="8Qv-w9-QFk" firstAttribute="top" secondItem="yOm-eK-EiO" secondAttribute="bottom" id="pbE-Qn-Jif"/>
-                                    <constraint firstItem="Ktq-Dz-PKA" firstAttribute="top" secondItem="OC6-3T-D0U" secondAttribute="bottom" constant="74" id="qkA-Ot-N8b"/>
+                                    <constraint firstItem="IOw-6D-K9h" firstAttribute="top" secondItem="7jl-Gg-kK5" secondAttribute="bottom" constant="19" id="qHm-Ht-lcl"/>
+                                    <constraint firstItem="Ktq-Dz-PKA" firstAttribute="top" secondItem="OC6-3T-D0U" secondAttribute="bottom" constant="44" id="qkA-Ot-N8b"/>
                                     <constraint firstAttribute="bottom" secondItem="tWp-hW-qv5" secondAttribute="bottom" constant="27" id="qkB-fy-pZd"/>
                                     <constraint firstItem="sLP-2x-CjX" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="sJc-Cn-PH9"/>
                                     <constraint firstItem="Gj2-y1-rHO" firstAttribute="top" secondItem="A0o-RY-onr" secondAttribute="top" constant="24" id="sfR-o2-GQQ"/>
                                     <constraint firstAttribute="trailing" secondItem="uyN-xq-DsY" secondAttribute="trailing" constant="10" id="sfZ-4s-Rbn"/>
+                                    <constraint firstItem="ytR-1U-1YW" firstAttribute="centerY" secondItem="A0o-RY-onr" secondAttribute="centerY" id="t4x-rO-QLR"/>
                                     <constraint firstItem="72a-c3-rKG" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="uLa-hD-K33"/>
+                                    <constraint firstItem="cye-uS-ICY" firstAttribute="top" secondItem="XYe-6g-AOI" secondAttribute="bottom" id="uVl-FK-p9e"/>
                                     <constraint firstItem="cuU-21-cm1" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="ucq-3P-s0k"/>
                                     <constraint firstAttribute="trailing" secondItem="7jl-Gg-kK5" secondAttribute="trailing" constant="8" id="v2g-vu-d1T"/>
                                     <constraint firstItem="8IY-yH-cja" firstAttribute="centerX" secondItem="A0o-RY-onr" secondAttribute="centerX" id="vNk-Yq-oj1"/>
@@ -1169,16 +1232,19 @@
                     <connections>
                         <outlet property="m_car_ambient_temp" destination="Ktq-Dz-PKA" id="AWJ-hv-TR6"/>
                         <outlet property="m_car_aux_battery" destination="L3M-Se-Ave" id="CkT-vN-ofk"/>
+                        <outlet property="m_car_cabin_temp" destination="cye-uS-ICY" id="OPG-Df-LV4"/>
                         <outlet property="m_car_door_cp" destination="sLP-2x-CjX" id="hkb-k7-G7R"/>
                         <outlet property="m_car_door_hd" destination="72a-c3-rKG" id="itb-GX-kHE"/>
                         <outlet property="m_car_door_ld" destination="Gj2-y1-rHO" id="bPe-Yt-OeC"/>
                         <outlet property="m_car_door_rd" destination="982-WB-UWS" id="90j-kp-zHK"/>
                         <outlet property="m_car_door_tr" destination="MO1-D4-O0F" id="AFe-Hs-p6i"/>
+                        <outlet property="m_car_hvac_status" destination="QKi-fI-Amq" id="Sk7-kw-HO1"/>
                         <outlet property="m_car_lights" destination="cuU-21-cm1" id="4Ql-iQ-gJp"/>
                         <outlet property="m_car_lockunlock" destination="8IY-yH-cja" id="yyp-iR-JVi"/>
                         <outlet property="m_car_outlineimage" destination="yy1-Al-VLM" id="RU9-12-oiZ"/>
                         <outlet property="m_car_temp_battery" destination="Hvm-f7-boq" id="jZr-fc-vyS"/>
                         <outlet property="m_car_temp_battery_l" destination="dSt-fr-TTW" id="Aox-Kt-9Pt"/>
+                        <outlet property="m_car_temp_cabin_l" destination="XYe-6g-AOI" id="FnV-k7-CVu"/>
                         <outlet property="m_car_temp_motor" destination="uZW-nt-WxM" id="eWv-Ge-3Dz"/>
                         <outlet property="m_car_temp_motor_l" destination="W8h-P3-hsR" id="nHR-OH-qgk"/>
                         <outlet property="m_car_temp_pem" destination="ydx-jw-Xh5" id="0fO-7j-MZl"/>
@@ -1194,6 +1260,7 @@
                         <outlet property="m_car_wheel_rl_temp" destination="E6h-hK-fCp" id="6Ys-zX-CnL"/>
                         <outlet property="m_car_wheel_rr_pressure" destination="yOm-eK-EiO" id="zAi-bT-R8A"/>
                         <outlet property="m_car_wheel_rr_temp" destination="8Qv-w9-QFk" id="iOR-wb-W1L"/>
+                        <outlet property="m_climatecontrol_button" destination="IOw-6D-K9h" id="Vgl-eJ-I0W"/>
                         <outlet property="m_homelink_button" destination="evp-Bg-OZv" id="PcU-Ek-ciI"/>
                         <outlet property="m_lock_button" destination="ZSe-co-Q5V" id="R0C-gD-OVm"/>
                         <outlet property="m_valet_button" destination="fn1-Q1-0eF" id="wWB-ti-3IX"/>
@@ -1506,7 +1573,6 @@
                             </pickerView>
                             <segmentedControl opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="5tY-j8-As0">
                                 <rect key="frame" x="40" y="57" width="239" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <segments>
                                     <segment title="Standard"/>
                                     <segment title="Storage"/>
@@ -1906,8 +1972,8 @@
         <scene sceneID="O8c-Ru-BnI">
             <objects>
                 <viewController title="Messages" id="H1m-bJ-b0G" sceneMemberID="viewController">
-                    <containerView key="view" opaque="NO" contentMode="scaleToFill" misplaced="YES" id="hSu-ll-V2H">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="387"/>
+                    <containerView key="view" opaque="NO" contentMode="scaleToFill" id="hSu-ll-V2H">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="367"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                         <color key="backgroundColor" red="0.069420576100000006" green="0.1059532762" blue="0.19171994919999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <connections>
@@ -1952,7 +2018,7 @@
         <image name="homelink-logo.png" width="128" height="128"/>
         <image name="ic_pin.png" width="32" height="32"/>
         <image name="message.png" width="30" height="30"/>
-        <image name="motortemp_letterbox.png" width="534" height="610"/>
+        <image name="motortemp_letterbox.png" width="128.16000366210938" height="146.39999389648438"/>
         <image name="ol_car_roadster_thundergray.png" width="304" height="606"/>
         <image name="parking.png" width="102.36966705322266" height="102.36966705322266"/>
         <image name="roadster_outline_cp.png" width="304" height="606"/>
diff --git a/OpenVehicleApp/ovms/motortemp_letterbox.png b/OpenVehicleApp/ovms/motortemp_letterbox.png
index 9298d89..a624b55 100644
Binary files a/OpenVehicleApp/ovms/motortemp_letterbox.png and b/OpenVehicleApp/ovms/motortemp_letterbox.png differ
diff --git a/OpenVehicleApp/ovms/ovmsAppDelegate.h b/OpenVehicleApp/ovms/ovmsAppDelegate.h
index d49f3ec..c02900a 100644
--- a/OpenVehicleApp/ovms/ovmsAppDelegate.h
+++ b/OpenVehicleApp/ovms/ovmsAppDelegate.h
@@ -206,6 +206,7 @@
 @property (assign) int car_doors1;
 @property (assign) int car_doors2;
 @property (assign) int car_doors3;
+@property (assign) int car_doors5;
 @property (assign) int car_stale_pemtemps;
 @property (assign) int car_stale_ambienttemps;
 
@@ -225,6 +226,7 @@
 @property (assign) int car_speed;
 @property (assign) int car_parktime;
 @property (assign) int car_ambient_temp;
+@property (assign) int car_cabin_temp;
 @property (assign) float car_tpms_fr_pressure;
 @property (assign) int car_tpms_fr_temp;
 @property (assign) float car_tpms_rr_pressure;
@@ -253,6 +255,8 @@
 @property (strong, nonatomic) NSString* car_tpms_rr_pressure_s;
 @property (strong, nonatomic) NSString* car_tpms_fl_pressure_s;
 @property (strong, nonatomic) NSString* car_tpms_rl_pressure_s;
+@property (strong, nonatomic) NSString* car_cabin_temp_s;
+@property (strong, nonatomic) NSString* car_hvac_s;
 @property (strong, nonatomic) NSString* car_tpms_fr_temp_s;
 @property (strong, nonatomic) NSString* car_tpms_rr_temp_s;
 @property (strong, nonatomic) NSString* car_tpms_fl_temp_s;
@@ -318,5 +322,6 @@
 - (void)commandDoUSSD:(NSString*)ussd;
 - (void)commandDoRequestGPRSData;
 - (void)commandDoHomelink:(int)button;
+- (void)commandDoClimateControl:(int)button;
 
 @end
diff --git a/OpenVehicleApp/ovms/ovmsAppDelegate.m b/OpenVehicleApp/ovms/ovmsAppDelegate.m
index 62ed1b5..166dc3a 100644
--- a/OpenVehicleApp/ovms/ovmsAppDelegate.m
+++ b/OpenVehicleApp/ovms/ovmsAppDelegate.m
@@ -66,6 +66,7 @@ @implementation ovmsAppDelegate
 @synthesize car_doors1;
 @synthesize car_doors2;
 @synthesize car_doors3;
+@synthesize car_doors5;
 @synthesize car_stale_pemtemps;
 @synthesize car_stale_ambienttemps;
 @synthesize car_lockstate;
@@ -84,6 +85,7 @@ @implementation ovmsAppDelegate
 @synthesize car_speed;
 @synthesize car_parktime;
 @synthesize car_ambient_temp;
+@synthesize car_cabin_temp;
 @synthesize car_tpms_fr_pressure;
 @synthesize car_tpms_fr_temp;
 @synthesize car_tpms_rr_pressure;
@@ -109,6 +111,8 @@ @implementation ovmsAppDelegate
 @synthesize car_tpms_rr_pressure_s;
 @synthesize car_tpms_fl_pressure_s;
 @synthesize car_tpms_rl_pressure_s;
+@synthesize car_cabin_temp_s;
+@synthesize car_hvac_s;
 @synthesize car_tpms_fr_temp_s;
 @synthesize car_tpms_rr_temp_s;
 @synthesize car_tpms_fl_temp_s;
@@ -589,6 +593,7 @@ - (void)serverClearState
   car_tmotor = 0;
   car_tbattery = 0;
   car_ambient_temp = -127;
+  car_cabin_temp = -127;
   car_trip = 0;
   car_odometer = 0;
   car_speed = 0;
@@ -617,6 +622,7 @@ - (void)serverClearState
   car_tpms_rr_pressure_s = @"";
   car_tpms_fl_pressure_s = @"";
   car_tpms_rl_pressure_s = @"";
+  car_cabin_temp_s = @"";
   car_tpms_fr_temp_s = @"";
   car_tpms_rr_temp_s = @"";
   car_tpms_fl_temp_s = @"";
@@ -859,8 +865,23 @@ - (void)handleCommand:(char)code command:(NSString*)cmd
           }
         if ([lparts count] >= 15)
           {
-            car_aux_battery_voltage = [[lparts objectAtIndex:14] floatValue];
+          car_aux_battery_voltage = [[lparts objectAtIndex:14] floatValue];
           }
+        if ([lparts count] >= 18)
+          {
+          car_doors5 = [[lparts objectAtIndex:17] intValue];
+          if (car_doors5 & 0x80) // HVAC
+              car_hvac_s = @"ON";
+          else
+              car_hvac_s = @"OFF";
+          }
+        if ([lparts count] >= 21)
+          {
+          car_cabin_temp = [[lparts objectAtIndex:20] intValue];
+          }
+        else
+          car_cabin_temp = -127;
+        car_cabin_temp_s = [self convertTemperatureUnits:car_cabin_temp];
         }
       }
       break;
@@ -1576,6 +1597,12 @@ - (void)commandDoHomelink:(int)button
   [self commandIssue:[NSString stringWithFormat:@"24,%d",button]];
   }
 
+- (void)commandDoClimateControl:(int)button
+  {
+  [JHNotificationManager notificationWithMessage:@"Issuing Climate Control Command..."];
+  [self commandIssue:[NSString stringWithFormat:@"26,%d",button]];
+  }
+
 /**
  Returns the managed object context for the application.
  If the context doesn't already exist, it is created and bound to the persistent store coordinator for the application.
diff --git a/OpenVehicleApp/ovms/ovmsBodyViewController.h b/OpenVehicleApp/ovms/ovmsBodyViewController.h
index 97e01ff..2256294 100644
--- a/OpenVehicleApp/ovms/ovmsBodyViewController.h
+++ b/OpenVehicleApp/ovms/ovmsBodyViewController.h
@@ -38,7 +38,10 @@
 @property (strong, nonatomic) IBOutlet UILabel *m_car_temp_pem_l;
 @property (strong, nonatomic) IBOutlet UILabel *m_car_temp_motor_l;
 @property (strong, nonatomic) IBOutlet UILabel *m_car_temp_battery_l;
+@property (strong, nonatomic) IBOutlet UILabel *m_car_temp_cabin_l;
 @property (strong, nonatomic) IBOutlet UILabel *m_car_ambient_temp;
+@property (strong, nonatomic) IBOutlet UILabel *m_car_cabin_temp;
+@property (strong, nonatomic) IBOutlet UILabel *m_car_hvac_status;
 @property (strong, nonatomic) IBOutlet UILabel *m_car_aux_battery;
 @property (strong, nonatomic) IBOutlet UIImageView *m_car_weather;
 @property (strong, nonatomic) IBOutlet UIImageView *m_car_tpmsboxes;
@@ -47,8 +50,10 @@
 @property (strong, nonatomic) IBOutlet UIButton *m_valet_button;
 @property (strong, nonatomic) IBOutlet UIButton *m_wakeup_button;
 @property (strong, nonatomic) IBOutlet UIButton *m_homelink_button;
+@property (strong, nonatomic) IBOutlet UIButton *m_climatecontrol_button;
 
 - (IBAction)WakeupButton:(id)sender;
-- (IBAction)HomelinkButon:(id)sender;
+- (IBAction)HomelinkButton:(id)sender;
+- (IBAction)ClimateControlButton:(id)sender;
 
 @end
diff --git a/OpenVehicleApp/ovms/ovmsBodyViewController.m b/OpenVehicleApp/ovms/ovmsBodyViewController.m
index 75ce58a..2c30bab 100644
--- a/OpenVehicleApp/ovms/ovmsBodyViewController.m
+++ b/OpenVehicleApp/ovms/ovmsBodyViewController.m
@@ -34,13 +34,17 @@ @implementation ovmsBodyViewController
 @synthesize m_car_temp_pem_l;
 @synthesize m_car_temp_motor_l;
 @synthesize m_car_temp_battery_l;
+@synthesize m_car_temp_cabin_l;
 @synthesize m_car_ambient_temp;
+@synthesize m_car_cabin_temp;
+@synthesize m_car_hvac_status;
 @synthesize m_car_weather;
 @synthesize m_car_tpmsboxes;
 @synthesize m_lock_button;
 @synthesize m_valet_button;
 @synthesize m_wakeup_button;
 @synthesize m_homelink_button;
+@synthesize m_climatecontrol_button;
 @synthesize m_car_aux_battery;
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
@@ -136,8 +140,11 @@ - (void)dealloc
   [self setM_car_temp_pem_l:nil];
   [self setM_car_temp_motor_l:nil];
   [self setM_car_temp_battery_l:nil];
+  [self setM_car_temp_cabin_l:nil];
   [self setM_car_outlineimage:nil];
   [self setM_car_ambient_temp:nil];
+  [self setM_car_cabin_temp:nil];
+  [self setM_car_hvac_status:nil];
   [self setM_car_valetonoff:nil];
   [self setM_car_lights:nil];
   [self setM_lock_button:nil];
@@ -147,6 +154,7 @@ - (void)dealloc
   [self setM_car_tpmsboxes:nil];
   [self setM_homelink_button:nil];
   [self setM_car_aux_battery:nil];
+  [self setM_climatecontrol_button:nil];
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -192,6 +200,7 @@ -(void) update
     m_valet_button.enabled=YES;
     m_wakeup_button.enabled=YES;
     m_homelink_button.enabled=YES;
+    m_climatecontrol_button.enabled=YES;
     }
   else
     {
@@ -199,6 +208,7 @@ -(void) update
     m_valet_button.enabled=NO;
     m_wakeup_button.enabled=NO;    
     m_homelink_button.enabled=NO;
+    m_climatecontrol_button.enabled=NO;
     }
   
   int car_ambient_weather = [ovmsAppDelegate myRef].car_ambient_weather;
@@ -311,9 +321,12 @@ -(void) update
     m_car_temp_pem.hidden = YES;
     m_car_temp_motor.hidden = YES;
     m_car_temp_battery.hidden = YES;
+    m_car_cabin_temp.hidden = YES;
+    m_car_hvac_status.hidden = YES;
     m_car_temp_pem_l.textColor = [UIColor grayColor];
     m_car_temp_motor_l.textColor = [UIColor grayColor];
     m_car_temp_battery_l.textColor = [UIColor grayColor];
+    m_car_temp_cabin_l.textColor = [UIColor grayColor];
     }
   else if (car_stale_pemtemps == 0)
     {
@@ -321,15 +334,22 @@ -(void) update
     m_car_temp_pem.hidden = NO;
     m_car_temp_motor.hidden = NO;
     m_car_temp_battery.hidden = NO;
+    m_car_cabin_temp.hidden = NO;
+    m_car_hvac_status.hidden = NO;
     m_car_temp_pem.textColor = [UIColor grayColor];
     m_car_temp_pem_l.textColor = [UIColor grayColor];
     m_car_temp_motor.textColor = [UIColor grayColor];
     m_car_temp_motor_l.textColor = [UIColor grayColor];
     m_car_temp_battery.textColor = [UIColor grayColor];
     m_car_temp_battery_l.textColor = [UIColor grayColor];
+    m_car_cabin_temp.textColor = [UIColor grayColor];
+    m_car_temp_cabin_l.textColor = [UIColor grayColor];
+    m_car_hvac_status.textColor = [UIColor grayColor];
     m_car_temp_pem.text = [ovmsAppDelegate myRef].car_tpem_s;
     m_car_temp_motor.text = [ovmsAppDelegate myRef].car_tmotor_s;
     m_car_temp_battery.text = [ovmsAppDelegate myRef].car_tbattery_s;
+    m_car_cabin_temp.text = [ovmsAppDelegate myRef].car_cabin_temp_s;
+    m_car_hvac_status.text = [ovmsAppDelegate myRef].car_hvac_s;
     }
   else
     {
@@ -337,15 +357,22 @@ -(void) update
     m_car_temp_pem.hidden = NO;
     m_car_temp_motor.hidden = NO;
     m_car_temp_battery.hidden = NO;
+    m_car_cabin_temp.hidden = NO;
+    m_car_hvac_status.hidden = NO;
     m_car_temp_pem.textColor = [UIColor whiteColor];
     m_car_temp_pem_l.textColor = [UIColor whiteColor];
     m_car_temp_motor.textColor = [UIColor whiteColor];
     m_car_temp_motor_l.textColor = [UIColor whiteColor];
     m_car_temp_battery.textColor = [UIColor whiteColor];
     m_car_temp_battery_l.textColor = [UIColor whiteColor];
+    m_car_cabin_temp.textColor = [UIColor whiteColor];
+    m_car_temp_cabin_l.textColor = [UIColor whiteColor];
+    m_car_hvac_status.textColor = [UIColor whiteColor];
     m_car_temp_pem.text = [ovmsAppDelegate myRef].car_tpem_s;
     m_car_temp_motor.text = [ovmsAppDelegate myRef].car_tmotor_s;
     m_car_temp_battery.text = [ovmsAppDelegate myRef].car_tbattery_s;
+    m_car_cabin_temp.text = [ovmsAppDelegate myRef].car_cabin_temp_s;
+    m_car_hvac_status.text = [ovmsAppDelegate myRef].car_hvac_s;
     }
 
   int car_stale_ambienttemps = [ovmsAppDelegate myRef].car_stale_ambienttemps;
@@ -406,9 +433,17 @@ -(void) update
     }
   else
     {
-    m_car_wheel_fr_pressure.text = @"";
     m_car_wheel_fr_temp.text = @"";
     }
+  if ([ovmsAppDelegate myRef].car_tpms_fr_pressure > 0)
+    {
+    m_car_wheel_fr_pressure.text = [NSString stringWithFormat:@"%0.1f PSI",
+                                    [ovmsAppDelegate myRef].car_tpms_fr_pressure];
+    }
+  else
+    {
+    m_car_wheel_fr_pressure.text = @"";
+    }
 
   if ([ovmsAppDelegate myRef].car_tpms_rr_temp > 0)
     {
@@ -417,9 +452,17 @@ -(void) update
     }
   else
     {
-    m_car_wheel_rr_pressure.text = @"";
     m_car_wheel_rr_temp.text = @"";
     }
+  if ([ovmsAppDelegate myRef].car_tpms_rr_pressure > 0)
+    {
+    m_car_wheel_rr_pressure.text = [NSString stringWithFormat:@"%0.1f PSI",
+                                    [ovmsAppDelegate myRef].car_tpms_rr_pressure];
+    }
+  else
+    {
+    m_car_wheel_rr_pressure.text = @"";
+    }
 
   if ([ovmsAppDelegate myRef].car_tpms_fl_temp > 0)
     {
@@ -428,9 +471,17 @@ -(void) update
     }
   else
     {
-    m_car_wheel_fl_pressure.text = @"";
     m_car_wheel_fl_temp.text = @"";
     }
+  if ([ovmsAppDelegate myRef].car_tpms_fl_pressure > 0)
+    {
+    m_car_wheel_fl_pressure.text = [NSString stringWithFormat:@"%0.1f PSI",
+                                    [ovmsAppDelegate myRef].car_tpms_fl_pressure];
+    }
+  else
+    {
+    m_car_wheel_fl_pressure.text = @"";
+    }
   
   if ([ovmsAppDelegate myRef].car_tpms_rl_temp > 0)
     {
@@ -439,9 +490,17 @@ -(void) update
     }
   else
     {
-    m_car_wheel_rl_pressure.text = @"";
     m_car_wheel_rl_temp.text = @"";
     }
+  if ([ovmsAppDelegate myRef].car_tpms_rl_pressure > 0)
+    {
+    m_car_wheel_rl_pressure.text = [NSString stringWithFormat:@"%0.1f PSI",
+                                    [ovmsAppDelegate myRef].car_tpms_rl_pressure];
+    }
+  else
+    {
+    m_car_wheel_rl_pressure.text = @"";
+    }
     
     m_car_aux_battery.text = [NSString stringWithFormat:@"%0.1fV",
                                 [ovmsAppDelegate myRef].car_aux_battery_voltage];
@@ -520,7 +579,19 @@ - (IBAction)WakeupButton:(id)sender
   [actionSheet showInView:[self.view window]];
   }
 
-- (IBAction)HomelinkButon:(id)sender
+- (IBAction)ClimateControlButton:(id)sender
+{
+    // The climate control button has been pressed - let's heat/cool the car
+    UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"Climate Control"
+                                                             delegate:self
+                                                    cancelButtonTitle:@"Cancel"
+                                               destructiveButtonTitle:nil
+                                                    otherButtonTitles:@"Stop",@"Start",nil];
+    [actionSheet showInView:[self.view window]];
+}
+
+
+- (IBAction)HomelinkButton:(id)sender
   {
   // The homelink button has been pressed - let's ask which one he wants
   UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"Homelink"
@@ -548,6 +619,14 @@ - (void)actionSheet:(UIActionSheet *)sender clickedButtonAtIndex:(NSInteger)inde
       [[ovmsAppDelegate myRef] commandDoHomelink:button];
       }
     }
+  else if ([sender.title isEqualToString:@"Climate Control"])
+    {
+    int button = (int)(index - [sender firstOtherButtonIndex]);
+    if ((button>=0)&&(button<2))
+      {
+      [[ovmsAppDelegate myRef] commandDoClimateControl:button];
+      }
+    }
   }
 
 @end
diff --git a/OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m b/OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m
index 0517883..2207de1 100644
--- a/OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m
+++ b/OpenVehicleApp/ovms/ovmsChargerSettingsViewController.m
@@ -43,7 +43,7 @@ - (void)loadView
 - (void)viewDidLoad
 {
   [super viewDidLoad];
-  int cl_row = [ovmsAppDelegate myRef].car_chargelimit-10;
+  int cl_row = [ovmsAppDelegate myRef].car_chargelimit-6;
   if (cl_row<0) cl_row = 0;
   [m_charger_current selectRow:cl_row inComponent:0 animated:NO];
   
@@ -118,7 +118,7 @@ - (IBAction)DoneButton:(id)sender
   {
   int ncm = (int)m_charger_mode.selectedSegmentIndex;
   if (ncm>=2) ncm++;
-  int ncl = (int)[m_charger_current selectedRowInComponent:0] + 10;
+  int ncl = (int)[m_charger_current selectedRowInComponent:0] + 6;
 
   [self dismissViewControllerAnimated:YES completion:nil];
 
@@ -148,14 +148,14 @@ - (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
 
 - (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
 {
-  return (70-10)+1;
+  return (70-6)+1;
 }
 
 - (NSString *)pickerView:(UIPickerView *)pickerView
              titleForRow:(NSInteger)row
             forComponent:(NSInteger)component
 {
-  return [NSString stringWithFormat:@"%d Amps",10+(int)row];
+  return [NSString stringWithFormat:@"%d Amps",6+(int)row];
 } 
 
 #pragma mark -