diff --git a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib
index 1817892..2b0c9b8 100644
--- a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib
+++ b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
@@ -28,7 +28,7 @@
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bPF-XH-a36">
-                            <rect key="frame" x="0.0" y="0.0" width="320" height="602"/>
+                            <rect key="frame" x="0.0" y="0.0" width="280" height="602"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="gUl-8z-CPz">
@@ -45,7 +45,7 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="P5u-F4-X4a">
-                                    <rect key="frame" x="-80" y="59" width="480" height="162"/>
+                                    <rect key="frame" x="-100" y="59" width="480" height="162"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                     <date key="date" timeIntervalSinceReferenceDate="432266305.732934">
                                         <!--2014-09-13 01:58:25 +0000-->
@@ -86,7 +86,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                     </connections>
                                 </switch>
                                 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="mwj-Ys-4vf">
-                                    <rect key="frame" x="-80" y="98" width="480" height="162"/>
+                                    <rect key="frame" x="-100" y="98" width="480" height="162"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                     <date key="date" timeIntervalSinceReferenceDate="432266362.26397198">
                                         <!--2014-09-13 01:59:22 +0000-->
@@ -113,6 +113,16 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
 </data>
                                     </timeZone>
                                 </datePicker>
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aYc-3W-Uqn">
+                                    <rect key="frame" x="122" y="105" width="37" height="30"/>
+                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    <state key="normal" title="Done">
+                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                    </state>
+                                    <connections>
+                                        <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="20s-GW-y67"/>
+                                    </connections>
+                                </button>
                             </subviews>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                             <constraints>
@@ -121,42 +131,34 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                 <constraint firstAttribute="height" constant="602" id="9TX-1i-78Z"/>
                                 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="top" secondItem="xIo-vd-lE7" secondAttribute="bottom" constant="18" id="Ebo-Ll-h52"/>
                                 <constraint firstItem="gUl-8z-CPz" firstAttribute="leading" secondItem="xIo-vd-lE7" secondAttribute="trailing" constant="8" id="GGW-gp-gX0"/>
-                                <constraint firstAttribute="width" constant="320" id="HeC-5b-Jcm"/>
                                 <constraint firstItem="xIo-vd-lE7" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="25" id="Lre-tN-KLY"/>
+                                <constraint firstAttribute="centerX" secondItem="aYc-3W-Uqn" secondAttribute="centerX" constant="-0.5" id="Ply-4u-pHb"/>
                                 <constraint firstItem="IjI-S6-otK" firstAttribute="leading" secondItem="J6Y-lM-Rjf" secondAttribute="trailing" constant="8" id="SiP-L0-vna"/>
                                 <constraint firstItem="xIo-vd-lE7" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="UYd-kA-RVe"/>
                                 <constraint firstItem="mwj-Ys-4vf" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="8" symbolic="YES" id="awF-Ys-Dzh"/>
                                 <constraint firstItem="P5u-F4-X4a" firstAttribute="top" secondItem="gUl-8z-CPz" secondAttribute="bottom" constant="8" id="cA8-yk-fVJ"/>
                                 <constraint firstItem="J6Y-lM-Rjf" firstAttribute="leading" secondItem="bPF-XH-a36" secondAttribute="leading" constant="20" id="jXK-cV-gUA"/>
+                                <constraint firstItem="aYc-3W-Uqn" firstAttribute="top" secondItem="IjI-S6-otK" secondAttribute="bottom" constant="15" id="r6B-Uv-9fW"/>
                                 <constraint firstAttribute="centerX" secondItem="mwj-Ys-4vf" secondAttribute="centerX" id="vvq-Wh-sPa"/>
                                 <constraint firstItem="gUl-8z-CPz" firstAttribute="top" secondItem="bPF-XH-a36" secondAttribute="top" constant="20" id="wxd-X3-cbH"/>
                             </constraints>
                         </view>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aYc-3W-Uqn">
-                            <rect key="frame" x="122" y="98" width="37" height="30"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <state key="normal" title="Done">
-                                <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                            </state>
-                            <connections>
-                                <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="20s-GW-y67"/>
-                            </connections>
-                        </button>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="bottom" secondItem="bPF-XH-a36" secondAttribute="bottom" constant="-463" id="BSg-SY-YvA"/>
-                        <constraint firstItem="bPF-XH-a36" firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" constant="20" id="JcL-2N-ehq"/>
-                        <constraint firstItem="bPF-XH-a36" firstAttribute="leading" secondItem="fz9-NP-VLV" secondAttribute="leading" id="a6a-pD-vUI"/>
+                        <constraint firstItem="bPF-XH-a36" firstAttribute="width" secondItem="fz9-NP-VLV" secondAttribute="width" id="GmM-Hm-Avd"/>
+                        <constraint firstItem="bPF-XH-a36" firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" id="JcL-2N-ehq"/>
                         <constraint firstItem="bPF-XH-a36" firstAttribute="top" secondItem="fz9-NP-VLV" secondAttribute="top" id="dVI-xT-cob"/>
-                        <constraint firstAttribute="trailing" secondItem="bPF-XH-a36" secondAttribute="trailing" constant="-40" id="qyC-rv-007"/>
+                        <constraint firstAttribute="trailing" secondItem="bPF-XH-a36" secondAttribute="trailing" id="qyC-rv-007"/>
                     </constraints>
                 </scrollView>
             </subviews>
             <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
             <constraints>
                 <constraint firstItem="fz9-NP-VLV" firstAttribute="top" secondItem="kvr-be-fbh" secondAttribute="top" constant="20" symbolic="YES" id="ENJ-tA-Y3H"/>
-                <constraint firstAttribute="centerX" secondItem="fz9-NP-VLV" secondAttribute="centerX" id="X8u-75-ogj"/>
+                <constraint firstItem="fz9-NP-VLV" firstAttribute="leading" secondItem="kvr-be-fbh" secondAttribute="leading" constant="20" id="fJ1-JO-Czs"/>
+                <constraint firstAttribute="trailing" secondItem="fz9-NP-VLV" secondAttribute="trailing" constant="20" id="pFv-mr-RlH"/>
                 <constraint firstAttribute="bottom" secondItem="fz9-NP-VLV" secondAttribute="bottom" constant="321" id="qh2-6H-Nq5"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
diff --git a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib
index 1e334ea..b506f05 100644
--- a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib
+++ b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_Landscape.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
@@ -138,19 +138,20 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                 <constraint firstAttribute="height" constant="602" id="aC4-YZ-T3h"/>
                                 <constraint firstItem="MAy-lw-s1B" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" symbolic="YES" id="caz-mx-Bec"/>
                                 <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="cTb-x4-h2w" secondAttribute="bottom" constant="8" id="lj7-2h-Tuu"/>
+                                <constraint firstItem="nfK-Us-pVk" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" id="pkJ-df-ypc"/>
                                 <constraint firstItem="WCO-rz-s5y" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="qzS-Hb-i2n"/>
                                 <constraint firstItem="Ses-ng-Dli" firstAttribute="leading" secondItem="YyP-Hs-KVd" secondAttribute="leading" constant="20" id="sOT-a5-RCf"/>
                                 <constraint firstItem="84e-nH-INk" firstAttribute="top" secondItem="Ses-ng-Dli" secondAttribute="bottom" constant="13" id="uuD-yP-qFl"/>
                                 <constraint firstItem="MAy-lw-s1B" firstAttribute="leading" secondItem="84e-nH-INk" secondAttribute="leading" id="v55-li-xEh"/>
                                 <constraint firstItem="cTb-x4-h2w" firstAttribute="leading" secondItem="Ses-ng-Dli" secondAttribute="trailing" constant="8" id="vTL-Oe-xpz"/>
                                 <constraint firstItem="D6M-uD-fFw" firstAttribute="leading" secondItem="WCO-rz-s5y" secondAttribute="trailing" constant="8" id="wcC-ev-DCg"/>
-                                <constraint firstItem="nfK-Us-pVk" firstAttribute="top" secondItem="D6M-uD-fFw" secondAttribute="bottom" constant="8" id="z2P-uq-uq4"/>
                             </constraints>
                         </view>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="YyP-Hs-KVd" secondAttribute="trailing" id="2ue-Lq-Fiu"/>
+                        <constraint firstItem="YyP-Hs-KVd" firstAttribute="width" secondItem="LR9-4f-pyO" secondAttribute="width" id="3pE-Bi-Nlz"/>
                         <constraint firstItem="YyP-Hs-KVd" firstAttribute="top" secondItem="LR9-4f-pyO" secondAttribute="top" id="5tN-HC-Y4Y"/>
                         <constraint firstAttribute="bottom" secondItem="YyP-Hs-KVd" secondAttribute="bottom" constant="-466" id="N0Z-v2-m3i"/>
                         <constraint firstItem="YyP-Hs-KVd" firstAttribute="leading" secondItem="LR9-4f-pyO" secondAttribute="leading" id="r0r-8k-tpO"/>
@@ -162,7 +163,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                 <constraint firstItem="LR9-4f-pyO" firstAttribute="top" secondItem="4CX-TI-g0c" secondAttribute="top" constant="20" id="5bJ-Km-lml"/>
                 <constraint firstItem="LR9-4f-pyO" firstAttribute="leading" secondItem="4CX-TI-g0c" secondAttribute="leading" constant="20" symbolic="YES" id="He8-2n-c8r"/>
                 <constraint firstAttribute="bottom" secondItem="LR9-4f-pyO" secondAttribute="bottom" constant="164" id="Kof-P4-pbo"/>
-                <constraint firstItem="LR9-4f-pyO" firstAttribute="centerX" secondItem="4CX-TI-g0c" secondAttribute="centerX" id="sXP-9K-cYu"/>
+                <constraint firstAttribute="trailing" secondItem="LR9-4f-pyO" secondAttribute="trailing" constant="20" id="Y2j-bK-dce"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
             <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
diff --git a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib
index 45b0471..b3f2518 100644
--- a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib
+++ b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
@@ -132,7 +132,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                 <constraint firstItem="5jh-Em-ORd" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" symbolic="YES" id="HEo-mI-aaq"/>
                                 <constraint firstItem="WiF-nR-ajG" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="N5v-Sy-RWV"/>
                                 <constraint firstItem="5bA-94-boo" firstAttribute="top" secondItem="qf5-xv-6RK" secondAttribute="bottom" constant="8" id="PPB-jm-7y8"/>
-                                <constraint firstItem="JjT-6I-8h2" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="232" id="Sjv-9Y-pUr"/>
                                 <constraint firstItem="5jh-Em-ORd" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" id="TGZ-nc-u8T"/>
                                 <constraint firstItem="dRe-Qx-Lml" firstAttribute="leading" secondItem="E2t-iZ-4z0" secondAttribute="leading" constant="20" id="d01-Ej-wEd"/>
                                 <constraint firstItem="5bA-94-boo" firstAttribute="leading" secondItem="dRe-Qx-Lml" secondAttribute="trailing" constant="8" id="eFD-VY-09E"/>
@@ -141,6 +140,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                 <constraint firstAttribute="centerX" secondItem="yQT-o9-gle" secondAttribute="centerX" id="t22-P0-QPH"/>
                                 <constraint firstItem="JjT-6I-8h2" firstAttribute="top" secondItem="5bA-94-boo" secondAttribute="bottom" constant="7" id="tQp-z3-Xn1"/>
                                 <constraint firstAttribute="height" constant="626" id="tS1-Rt-VK1"/>
+                                <constraint firstAttribute="centerX" secondItem="JjT-6I-8h2" secondAttribute="centerX" constant="-0.5" id="ubr-xC-I3x"/>
                                 <constraint firstAttribute="width" constant="500" id="wri-92-iq4"/>
                                 <constraint firstItem="qf5-xv-6RK" firstAttribute="leading" secondItem="WiF-nR-ajG" secondAttribute="trailing" constant="8" id="ws8-Uc-fCh"/>
                                 <constraint firstItem="WiF-nR-ajG" firstAttribute="top" secondItem="E2t-iZ-4z0" secondAttribute="top" constant="25" id="zdK-ew-c5q"/>
diff --git a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
index 9acc45d..8fe159d 100644
--- a/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
+++ b/DUREX Vendor Control/Base.lproj/DateRangePickerViewController_iPad_Landscape.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
@@ -51,7 +51,7 @@
                                         <!--2014-09-19 14:59:03 +0000-->
                                     </date>
                                     <timeZone key="timeZone" name="America/Los_Angeles">
-                                        <mutableData key="data">
+                                        <data key="data">
 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
@@ -69,7 +69,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
-</mutableData>
+</data>
                                     </timeZone>
                                 </datePicker>
                                 <datePicker hidden="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="Ke5-90-B8V">
@@ -79,7 +79,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                         <!--2014-09-19 14:59:23 +0000-->
                                     </date>
                                     <timeZone key="timeZone" name="America/Los_Angeles">
-                                        <mutableData key="data">
+                                        <data key="data">
 VFppZgAAAAAAAAAAAAAAAAAAAAAAAAAEAAAABAAAAAAAAAC5AAAABAAAABCepkign7sVkKCGKqChmveQ
 y4kaoNIj9HDSYSYQ1v50INiArZDa/tGg28CQENzes6DdqayQ3r6VoN+JjpDgnneg4WlwkOJ+WaDjSVKQ
 5F47oOUpNJDmR1gg5xJREOgnOiDo8jMQ6gccIOrSFRDr5v4g7LH3EO3G4CDukdkQ76/8oPBxuxDxj96g
@@ -97,7 +97,7 @@ f5gqkAABAAECAwEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
 AQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEAAQABAAEA
 AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
-</mutableData>
+</data>
                                     </timeZone>
                                 </datePicker>
                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8k-7k-O2i">
@@ -127,7 +127,6 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                             <constraints>
                                 <constraint firstAttribute="centerX" secondItem="Ke5-90-B8V" secondAttribute="centerX" id="28y-vd-Y2h"/>
-                                <constraint firstItem="hDh-hS-ruL" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" constant="232" id="Ekb-HV-H85"/>
                                 <constraint firstItem="hDh-hS-ruL" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="7" id="GS8-uL-yin"/>
                                 <constraint firstItem="z8k-7k-O2i" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" constant="20" id="Gq5-cV-ofW"/>
                                 <constraint firstItem="95w-9e-lc5" firstAttribute="leading" secondItem="z8k-7k-O2i" secondAttribute="trailing" constant="8" id="Lpl-at-M2a"/>
@@ -139,6 +138,7 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                                 <constraint firstItem="Jbw-43-Qar" firstAttribute="leading" secondItem="uBj-9s-9fc" secondAttribute="leading" id="k7J-l3-qIy"/>
                                 <constraint firstItem="7sY-pS-rR6" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="25" id="oqv-Fr-c2u"/>
                                 <constraint firstItem="Jbw-43-Qar" firstAttribute="top" secondItem="ycu-em-WhN" secondAttribute="bottom" constant="8" symbolic="YES" id="owB-Oe-jji"/>
+                                <constraint firstAttribute="centerX" secondItem="hDh-hS-ruL" secondAttribute="centerX" constant="-0.5" id="p2z-oA-1jg"/>
                                 <constraint firstItem="ycu-em-WhN" firstAttribute="top" secondItem="uBj-9s-9fc" secondAttribute="top" constant="20" id="tS4-38-qyM"/>
                                 <constraint firstItem="Ke5-90-B8V" firstAttribute="top" secondItem="95w-9e-lc5" secondAttribute="bottom" constant="2" id="uZx-7C-faF"/>
                                 <constraint firstAttribute="width" constant="500" id="vFe-sZ-zeI"/>
diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
index 3b563ec..3b073cb 100644
--- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index eb75504..f1c23a0 100644
--- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -410,12 +410,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DateRangePickerViewController.m"
-            timestampString = "435674474.73691"
+            timestampString = "435964226.359983"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "150"
-            endingLineNumber = "150"
-            landmarkName = "-resizeViewHeight:::"
+            startingLineNumber = "159"
+            endingLineNumber = "159"
+            landmarkName = "-resizeViewHeight::::"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -426,11 +426,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DateRangePickerViewController.m"
-            timestampString = "435674474.73691"
+            timestampString = "435964363.033461"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "176"
-            endingLineNumber = "176"
+            startingLineNumber = "187"
+            endingLineNumber = "187"
             landmarkName = "-toggleFromDate:"
             landmarkType = "5">
          </BreakpointContent>
@@ -442,11 +442,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DateRangePickerViewController.m"
-            timestampString = "435674474.73691"
+            timestampString = "435964363.033461"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "175"
-            endingLineNumber = "175"
+            startingLineNumber = "186"
+            endingLineNumber = "186"
             landmarkName = "-toggleFromDate:"
             landmarkType = "5">
          </BreakpointContent>
@@ -490,11 +490,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DateRangePickerViewController.m"
-            timestampString = "435674474.73691"
+            timestampString = "435964363.033461"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "158"
-            endingLineNumber = "158"
+            startingLineNumber = "169"
+            endingLineNumber = "169"
             landmarkName = "-toggleFromDate:"
             landmarkType = "5">
          </BreakpointContent>
@@ -520,11 +520,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DateRangePickerViewController.m"
-            timestampString = "435674474.73691"
+            timestampString = "435964226.359983"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "75"
-            endingLineNumber = "75"
+            startingLineNumber = "76"
+            endingLineNumber = "76"
             landmarkName = "-parentViewControllerDidRotateWithOrientation:"
             landmarkType = "5">
          </BreakpointContent>
@@ -603,8 +603,8 @@
             timestampString = "435859231.211213"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "806"
-            endingLineNumber = "806"
+            startingLineNumber = "1100"
+            endingLineNumber = "1100"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -616,11 +616,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "MenuTableViewController.m"
-            timestampString = "435859231.211213"
+            timestampString = "435855046.616674"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1100"
-            endingLineNumber = "1100"
+            startingLineNumber = "780"
+            endingLineNumber = "780"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -635,8 +635,8 @@
             timestampString = "435855046.616674"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "780"
-            endingLineNumber = "780"
+            startingLineNumber = "779"
+            endingLineNumber = "779"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -651,9 +651,9 @@
             timestampString = "435855046.616674"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "779"
-            endingLineNumber = "779"
-            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            startingLineNumber = "768"
+            endingLineNumber = "768"
+            landmarkName = "-tableView:sectionForSectionIndexTitle:atIndex:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
@@ -663,13 +663,61 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "MenuTableViewController.m"
-            timestampString = "435855046.616674"
+            filePath = "DateRangePickerViewController.m"
+            timestampString = "435964226.359983"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "768"
-            endingLineNumber = "768"
-            landmarkName = "-tableView:sectionForSectionIndexTitle:atIndex:"
+            startingLineNumber = "138"
+            endingLineNumber = "138"
+            landmarkName = "-resizeViewHeight::::"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "DateRangePickerViewController.m"
+            timestampString = "435964226.359983"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "143"
+            endingLineNumber = "143"
+            landmarkName = "-resizeViewHeight::::"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "DateRangePickerViewController.m"
+            timestampString = "435964226.359983"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "135"
+            endingLineNumber = "135"
+            landmarkName = "-resizeViewHeight::::"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "DateRangePickerViewController.m"
+            timestampString = "435963776.690848"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "64"
+            endingLineNumber = "64"
+            landmarkName = "-parentViewControllerDidRotateWithOrientation:"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
diff --git a/DUREX Vendor Control/DateRangePickerViewController.m b/DUREX Vendor Control/DateRangePickerViewController.m
index 0dc22ed..b1b1c26 100644
--- a/DUREX Vendor Control/DateRangePickerViewController.m
+++ b/DUREX Vendor Control/DateRangePickerViewController.m
@@ -12,7 +12,6 @@
 
 @property uint8_t isExtended;
 @property NSUInteger currentHeight;
-@property NSUInteger currentWidth;
 
 @end
 
@@ -41,12 +40,7 @@
     [self.toDate setDate:[NSDate date]];
     
     [self setIsExtended:0];
-    
     [self setCurrentHeight:[self scrollView].frame.size.height];
-    [self setCurrentWidth:[self scrollView].frame.size.width];
-    
-    [self.scrollView setAutoresizesSubviews:YES];
-    [self.scrollView setAutoresizingMask: UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
     
     [super viewDidLoad];
     // Do any additional setup after loading the view from its nib.
@@ -66,18 +60,24 @@
 - (void) parentViewControllerDidRotateWithOrientation: (UIDeviceOrientation) orientation
 {
     NSLog(@"[DateRangePickerViewController.m]: Screen did rotate");
-    [UIView beginAnimations:nil context:NULL];
-    [UIView setAnimationDuration:0.25];
-    [self expandScrollView];
-    self.scrollView.frame = CGRectMake(self.scrollView.frame.origin.x, self.scrollView.frame.origin.y, self.currentWidth,self.currentHeight);
-    [UIView commitAnimations];
-    [self.scrollView setContentSize:CGSizeMake([self scrolledView].frame.size.width,[self  currentHeight])];
+    [self resizeViewHeight:self.scrollView :self.currentHeight :FALSE :FALSE];
+    if([self.fromToggler isOn])
+    {
+        NSUInteger height = [self fromDate].frame.size.height;
+        self.currentHeight -= (height + 20);
+        [self toggleFromDate:self];
+    }
+    if([self.toToggler isOn])
+    {
+        NSUInteger height = [self toDate].frame.size.height;
+        self.currentHeight -= (height + 20);
+        [self toggleToDate:self];
+    }
 }
 
 - (void) parentViewControllerWillRotateToInterfaceOrientation: (UIInterfaceOrientation)toInterfaceOrientation duration: (NSTimeInterval)duration
 {
     NSLog(@"[DateRangePickerViewController.m]: Screen will rotate");
-    [self.scrollView setNeedsUpdateConstraints];
 }
 
 - (void) expandScrollView
@@ -127,30 +127,41 @@
     [UIView commitAnimations];
 }
 
-- (void) resizeViewHeight : (UIView*) view : (NSInteger) height : (Boolean) ignoreHeight
+- (void) resizeViewHeight : (UIView*) view : (NSInteger) height : (Boolean) ignoreHeight : (Boolean) realResize
 {
+    NSLog(@"[DateRangePickerViewController.m]: currentHeight is %d", self.currentHeight);
     CGRect screenRect = [[UIScreen mainScreen] bounds];
-    CGFloat screenHeight = screenRect.size.height;
-    if((height > screenHeight) && !ignoreHeight)
+    CGFloat screenHeight;
+    if(UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation]))
     {
-        NSLog(@"[DateRangePickerViewController.m]: Screen height limit reached");
+        screenHeight = screenRect.size.width;
     }
     else
     {
-        [UIView beginAnimations:nil context:NULL];
-        [UIView setAnimationDuration:0.5];
-        view.frame = CGRectMake(view.frame.origin.x, view.frame.origin.y, view.frame.size.width,height);
-        [UIView commitAnimations];
+        screenHeight = screenRect.size.height;
     }
-    if(height < 0)
+    if((height > (screenHeight-40)) && !ignoreHeight)
     {
-        [self setIsExtended: [self isExtended] - 1];
+        NSLog(@"[DateRangePickerViewController.m]: Screen height limit reached");
+        height = screenHeight-40;
     }
-    else
+    [UIView beginAnimations:nil context:NULL];
+    [UIView setAnimationDuration:0.5];
+    view.frame = CGRectMake(view.frame.origin.x, view.frame.origin.y, view.frame.size.width,height);
+    [UIView commitAnimations];
+    if(realResize)
     {
-        [self setIsExtended: [self isExtended] + 1];
+        if(height < 0)
+        {
+            [self setIsExtended: [self isExtended] - 1];
+        }
+        else
+        {
+            [self setIsExtended: [self isExtended] + 1];
+        }
     }
     [self.scrollView setContentSize:CGSizeMake([self scrolledView].frame.size.width,[self  currentHeight])];
+    [self.scrollView flashScrollIndicators];
 }
 
 - (IBAction)toggleFromDate:(id)sender
@@ -165,7 +176,7 @@
         [self moveDown:[self doneButton] :height];
         [self moveDown:[self toLabel] :height];
         [self setCurrentHeight:[self currentHeight] + height + 20];
-        [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE];
+        [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE];
     }
     else
     {
@@ -176,7 +187,7 @@
         [self moveUp:[self doneButton] :height];
         [self moveUp:[self toLabel] :height];
         [self setCurrentHeight:[self currentHeight] - height - 20];
-        [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE];
+        [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE];
     }
 }
 - (IBAction)toggleToDate:(id)sender
@@ -188,7 +199,7 @@
         [[self toDate] setHidden:FALSE];
         [self moveDown:[self doneButton] :height];
         [self setCurrentHeight:[self currentHeight] + height + 20];
-        [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE];
+        [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE];
     }
     else
     {
@@ -196,7 +207,7 @@
         [[self toDate] setHidden:TRUE];
         [self moveUp:[self doneButton] :height];
         [self setCurrentHeight:[self currentHeight] - height - 20];
-        [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE];
+        [self resizeViewHeight : [self scrollView] : [self currentHeight] : FALSE : TRUE];
     }
 }