diff --git a/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib b/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib
index 7a6eeed..44d8229 100644
--- a/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib
+++ b/DUREX Vendor Control/Base.lproj/DatePickerViewController.xib
@@ -6,7 +6,6 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DatePickerViewController">
             <connections>
-                <outlet property="datePicker" destination="6Ex-R5-AYV" id="50R-pL-vEb"/>
                 <outlet property="datePickerView" destination="o92-Jq-3Xo" id="IOi-YU-3Wz"/>
                 <outlet property="view" destination="7fx-e7-JEt" id="dL9-Ac-hWL"/>
             </connections>
@@ -16,15 +15,25 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="o92-Jq-3Xo">
-                    <rect key="frame" x="6" y="105" width="308" height="282"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="o92-Jq-3Xo">
+                    <rect key="frame" x="6" y="126" width="308" height="296"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <datePicker contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="6Ex-R5-AYV">
-                            <rect key="frame" x="-6" y="62" width="320" height="162"/>
+                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8vW-ig-tUA">
+                            <rect key="frame" x="136" y="244" 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="bgh-B7-4fN"/>
+                            </connections>
+                        </button>
+                        <datePicker contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="SbL-OM-Pxu">
+                            <rect key="frame" x="-6" y="20" width="320" height="162"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                            <date key="date" timeIntervalSinceReferenceDate="431369786.91497999">
-                                <!--2014-09-02 16:56:26 +0000-->
+                            <date key="date" timeIntervalSinceReferenceDate="431534074.16804099">
+                                <!--2014-09-04 14:34:34 +0000-->
                             </date>
                             <timeZone key="timeZone" name="America/Los_Angeles">
                                 <data key="data">
@@ -48,26 +57,24 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
 </data>
                             </timeZone>
                         </datePicker>
-                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8vW-ig-tUA">
-                            <rect key="frame" x="131" y="232" width="46" 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="bgh-B7-4fN"/>
-                            </connections>
-                        </button>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="0.95000000000000007" colorSpace="calibratedWhite"/>
                     <constraints>
-                        <constraint firstItem="8vW-ig-tUA" firstAttribute="top" secondItem="6Ex-R5-AYV" secondAttribute="bottom" constant="8" id="M7C-4g-jy1"/>
-                        <constraint firstItem="6Ex-R5-AYV" firstAttribute="centerX" secondItem="8vW-ig-tUA" secondAttribute="centerX" id="QvW-cT-g8h"/>
-                        <constraint firstAttribute="centerX" secondItem="8vW-ig-tUA" secondAttribute="centerX" id="t61-ZC-ePU"/>
+                        <constraint firstAttribute="height" constant="296" id="6Mz-Uy-NbX"/>
+                        <constraint firstAttribute="centerX" secondItem="SbL-OM-Pxu" secondAttribute="centerX" id="IpE-Uj-YXL"/>
+                        <constraint firstItem="8vW-ig-tUA" firstAttribute="top" secondItem="SbL-OM-Pxu" secondAttribute="bottom" constant="8" id="K5g-WK-5Hc"/>
+                        <constraint firstItem="SbL-OM-Pxu" firstAttribute="top" secondItem="o92-Jq-3Xo" secondAttribute="top" constant="20" id="XOm-Da-DXb"/>
+                        <constraint firstAttribute="width" constant="308" id="Zfo-v2-Opc"/>
+                        <constraint firstAttribute="width" constant="308" id="rg4-Lw-oTQ"/>
+                        <constraint firstAttribute="centerX" secondItem="8vW-ig-tUA" secondAttribute="centerX" constant="-0.5" id="xJw-o2-RKF"/>
                     </constraints>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.023529414087533951" green="0.0039215688593685627" blue="0.0039215688593685627" alpha="0.5" colorSpace="deviceRGB"/>
+            <constraints>
+                <constraint firstItem="o92-Jq-3Xo" firstAttribute="top" secondItem="7fx-e7-JEt" secondAttribute="top" constant="126" id="7ki-Mk-J5B"/>
+                <constraint firstAttribute="centerX" secondItem="o92-Jq-3Xo" secondAttribute="centerX" id="fTS-XF-GoP"/>
+            </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
             <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
         </view>
diff --git a/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib b/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib
index 0d6fb5b..1e9fc6b 100644
--- a/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib
+++ b/DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib
@@ -16,13 +16,18 @@
             <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YoS-Cq-kfN">
-                    <rect key="frame" x="192" y="256" width="384" height="321"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YoS-Cq-kfN">
+                    <rect key="frame" x="192" y="351" width="384" height="321"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <datePicker contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="3XX-v6-qTY">
+                        <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" translatesAutoresizingMaskIntoConstraints="NO" id="3XX-v6-qTY">
                             <rect key="frame" x="-192" y="47" width="768" height="216"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="768" id="Pgg-r9-HIP"/>
+                                <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="768" id="ngh-5u-kgr"/>
+                                <constraint firstAttribute="height" constant="216" id="scf-ur-ntV"/>
+                            </constraints>
                             <date key="date" timeIntervalSinceReferenceDate="431372189.40412599">
                                 <!--2014-09-02 17:36:29 +0000-->
                             </date>
@@ -48,8 +53,8 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
 </data>
                             </timeZone>
                         </datePicker>
-                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RGE-Ye-qon">
-                            <rect key="frame" x="169" y="271" width="46" height="30"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RGE-Ye-qon">
+                            <rect key="frame" x="174" y="271" 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"/>
@@ -62,14 +67,18 @@ AQABAAEAAQAB//+dkAEA//+PgAAE//+dkAEI//+dkAEMUERUAFBTVABQV1QAUFBUAAAAAAEAAAABA
                     <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstItem="RGE-Ye-qon" firstAttribute="top" secondItem="3XX-v6-qTY" secondAttribute="bottom" constant="8" id="6iZ-h3-wEL"/>
+                        <constraint firstAttribute="width" constant="384" id="74N-1u-MlE"/>
                         <constraint firstItem="3XX-v6-qTY" firstAttribute="centerX" secondItem="RGE-Ye-qon" secondAttribute="centerX" id="8nT-zM-hgt"/>
+                        <constraint firstItem="3XX-v6-qTY" firstAttribute="top" secondItem="YoS-Cq-kfN" secondAttribute="top" constant="47" id="KBE-yK-lRs"/>
+                        <constraint firstItem="3XX-v6-qTY" firstAttribute="leading" secondItem="YoS-Cq-kfN" secondAttribute="leading" constant="-192" id="VCY-84-a0G"/>
                         <constraint firstAttribute="centerX" secondItem="RGE-Ye-qon" secondAttribute="centerX" id="oSf-yk-jJ4"/>
+                        <constraint firstAttribute="height" constant="321" id="uhB-RO-pEr"/>
                     </constraints>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.023529414087533951" green="0.0039215688593685627" blue="0.0039215688593685627" alpha="0.5" colorSpace="deviceRGB"/>
             <constraints>
-                <constraint firstAttribute="centerY" secondItem="YoS-Cq-kfN" secondAttribute="centerY" constant="95.5" id="IRy-Yg-Vj5"/>
+                <constraint firstAttribute="centerY" secondItem="YoS-Cq-kfN" secondAttribute="centerY" constant="0.5" id="aML-4C-Hmp"/>
                 <constraint firstAttribute="centerX" secondItem="YoS-Cq-kfN" secondAttribute="centerX" id="d3A-NR-o0K"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
diff --git a/DUREX Vendor Control/Base.lproj/NameChangerViewController.xib b/DUREX Vendor Control/Base.lproj/NameChangerViewController.xib
index 5f67659..4375c8d 100644
--- a/DUREX Vendor Control/Base.lproj/NameChangerViewController.xib
+++ b/DUREX Vendor Control/Base.lproj/NameChangerViewController.xib
@@ -18,49 +18,58 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Yfy-pU-0Wn">
-                    <rect key="frame" x="7" y="118" width="307" height="181"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yfy-pU-0Wn">
+                    <rect key="frame" x="7" y="170" width="307" height="181"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vbt-3v-Jzm">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vbt-3v-Jzm">
                             <rect key="frame" x="190" y="20" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="V5R-sY-hSr"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="UP5-iH-LdU">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="UP5-iH-LdU">
                             <rect key="frame" x="190" y="59" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="r0j-J6-UcW"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jP9-NI-B16">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jP9-NI-B16">
                             <rect key="frame" x="190" y="97" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="4mr-ac-X5M"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u0t-Gj-gKZ">
-                            <rect key="frame" x="20" y="24" width="66" height="21"/>
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u0t-Gj-gKZ">
+                            <rect key="frame" x="20" y="24" width="64" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zk3-Qc-MYf">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zk3-Qc-MYf">
                             <rect key="frame" x="20" y="63" width="107" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfh-RB-roO">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zfh-RB-roO">
                             <rect key="frame" x="20" y="101" width="85" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y9f-BL-5ZB">
-                            <rect key="frame" x="130" y="131" width="46" height="30"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y9f-BL-5ZB">
+                            <rect key="frame" x="135" y="131" 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"/>
@@ -73,13 +82,19 @@
                     <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstItem="Zfh-RB-roO" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="4Xl-Uy-ots"/>
+                        <constraint firstItem="u0t-Gj-gKZ" firstAttribute="top" secondItem="Yfy-pU-0Wn" secondAttribute="top" constant="24" id="Bck-MA-vkx"/>
                         <constraint firstItem="Zfh-RB-roO" firstAttribute="top" secondItem="zk3-Qc-MYf" secondAttribute="bottom" constant="17" id="DJs-b3-pqQ"/>
                         <constraint firstItem="u0t-Gj-gKZ" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="FDy-MQ-JZ8"/>
+                        <constraint firstAttribute="width" constant="307" id="GQX-7o-a86"/>
+                        <constraint firstItem="vbt-3v-Jzm" firstAttribute="top" secondItem="Yfy-pU-0Wn" secondAttribute="top" constant="20" id="HP9-VA-6kz"/>
+                        <constraint firstItem="UP5-iH-LdU" firstAttribute="top" secondItem="vbt-3v-Jzm" secondAttribute="bottom" constant="9" id="KeN-pj-WkA"/>
                         <constraint firstAttribute="trailing" secondItem="jP9-NI-B16" secondAttribute="trailing" constant="20" id="S7F-ml-rti"/>
+                        <constraint firstItem="jP9-NI-B16" firstAttribute="top" secondItem="UP5-iH-LdU" secondAttribute="bottom" constant="8" id="VFi-63-f5d"/>
                         <constraint firstAttribute="bottom" secondItem="Y9f-BL-5ZB" secondAttribute="bottom" constant="20" id="W0h-rh-xiC"/>
                         <constraint firstAttribute="trailing" secondItem="vbt-3v-Jzm" secondAttribute="trailing" constant="20" id="Xe6-t2-6JD"/>
                         <constraint firstItem="zk3-Qc-MYf" firstAttribute="top" secondItem="u0t-Gj-gKZ" secondAttribute="bottom" constant="18" id="c79-yI-89e"/>
-                        <constraint firstAttribute="centerX" secondItem="Y9f-BL-5ZB" secondAttribute="centerX" constant="0.5" id="cVt-eu-j0C"/>
+                        <constraint firstAttribute="height" constant="181" id="fv5-UY-KsO"/>
+                        <constraint firstAttribute="centerX" secondItem="Y9f-BL-5ZB" secondAttribute="centerX" constant="0.5" id="h5O-ib-n1S"/>
                         <constraint firstItem="zk3-Qc-MYf" firstAttribute="leading" secondItem="Yfy-pU-0Wn" secondAttribute="leading" constant="20" id="hfD-fm-kDf"/>
                         <constraint firstAttribute="trailing" secondItem="UP5-iH-LdU" secondAttribute="trailing" constant="20" id="i9s-wf-CCF"/>
                     </constraints>
@@ -87,8 +102,8 @@
             </subviews>
             <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
             <constraints>
-                <constraint firstAttribute="centerY" secondItem="Yfy-pU-0Wn" secondAttribute="centerY" constant="75" id="dMJ-8U-j28"/>
-                <constraint firstAttribute="centerX" secondItem="Yfy-pU-0Wn" secondAttribute="centerX" constant="-0.5" id="qFe-Tn-pPX"/>
+                <constraint firstItem="Yfy-pU-0Wn" firstAttribute="top" secondItem="orJ-qi-Y62" secondAttribute="top" constant="170" id="Mv8-ll-5jP"/>
+                <constraint firstAttribute="centerX" secondItem="Yfy-pU-0Wn" secondAttribute="centerX" constant="-0.5" id="oiN-2m-voi"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
             <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
diff --git a/DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad.xib b/DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad.xib
index 353f356..e37d32d 100644
--- a/DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad.xib
+++ b/DUREX Vendor Control/Base.lproj/NameChangerViewController_iPad.xib
@@ -18,49 +18,49 @@
             <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LIm-mD-lnc">
-                    <rect key="frame" x="213" y="294" width="343" height="177"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LIm-mD-lnc">
+                    <rect key="frame" x="213" y="423" width="343" height="177"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Emm-7B-NhE">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Emm-7B-NhE">
                             <rect key="frame" x="226" y="17" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="yPR-D6-SZv"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0sU-V8-QVn">
-                            <rect key="frame" x="226" y="56" width="97" height="30"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits"/>
-                        </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Mqg-fy-qfX">
-                            <rect key="frame" x="226" y="95" width="97" height="30"/>
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Mqg-fy-qfX">
+                            <rect key="frame" x="226" y="94" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="dFt-hu-wOa"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9PW-xp-3t9">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9PW-xp-3t9">
                             <rect key="frame" x="20" y="21" width="64" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RCD-6Z-45A">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RCD-6Z-45A">
                             <rect key="frame" x="20" y="60" width="107" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pLv-EG-y2m">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pLv-EG-y2m">
                             <rect key="frame" x="20" y="98" width="85" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Md5-1l-LqY">
-                            <rect key="frame" x="148" y="127" width="46" height="30"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Md5-1l-LqY">
+                            <rect key="frame" x="153" y="127" 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"/>
@@ -69,28 +69,41 @@
                                 <action selector="closePopup:" destination="-1" eventType="touchUpInside" id="eeR-C7-bL8"/>
                             </connections>
                         </button>
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0sU-V8-QVn">
+                            <rect key="frame" x="226" y="56" width="97" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="mcc-YJ-98f"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="Mqg-fy-qfX" secondAttribute="trailing" constant="20" id="3dG-Y6-RcB"/>
                         <constraint firstItem="9PW-xp-3t9" firstAttribute="leading" secondItem="LIm-mD-lnc" secondAttribute="leading" constant="20" id="5cR-84-mkF"/>
                         <constraint firstItem="pLv-EG-y2m" firstAttribute="leading" secondItem="LIm-mD-lnc" secondAttribute="leading" constant="20" id="71g-b1-lP0"/>
+                        <constraint firstAttribute="width" constant="343" id="7tD-XW-5vz"/>
                         <constraint firstAttribute="trailing" secondItem="Emm-7B-NhE" secondAttribute="trailing" constant="20" id="Djn-mi-3Ed"/>
+                        <constraint firstItem="0sU-V8-QVn" firstAttribute="top" secondItem="Emm-7B-NhE" secondAttribute="bottom" constant="9" id="ISV-fp-0tI"/>
+                        <constraint firstItem="9PW-xp-3t9" firstAttribute="top" secondItem="LIm-mD-lnc" secondAttribute="top" constant="21" id="Jur-BX-YJV"/>
+                        <constraint firstItem="Mqg-fy-qfX" firstAttribute="top" secondItem="0sU-V8-QVn" secondAttribute="bottom" constant="8" id="Y4S-7h-1r0"/>
                         <constraint firstAttribute="centerX" secondItem="Md5-1l-LqY" secondAttribute="centerX" constant="0.5" id="Z6u-Gn-LXz"/>
-                        <constraint firstItem="Mqg-fy-qfX" firstAttribute="top" secondItem="0sU-V8-QVn" secondAttribute="bottom" constant="8" id="dYK-nL-LGw"/>
                         <constraint firstItem="RCD-6Z-45A" firstAttribute="leading" secondItem="LIm-mD-lnc" secondAttribute="leading" constant="20" id="eZd-4s-kd1"/>
+                        <constraint firstAttribute="height" constant="177" id="fXH-ZY-iCb"/>
                         <constraint firstAttribute="bottom" secondItem="Md5-1l-LqY" secondAttribute="bottom" constant="20" id="hb1-WU-uJX"/>
                         <constraint firstItem="RCD-6Z-45A" firstAttribute="top" secondItem="9PW-xp-3t9" secondAttribute="bottom" constant="18" id="oCQ-J2-GWR"/>
-                        <constraint firstItem="0sU-V8-QVn" firstAttribute="top" secondItem="Emm-7B-NhE" secondAttribute="bottom" constant="8" id="rvz-Oc-hbC"/>
                         <constraint firstItem="pLv-EG-y2m" firstAttribute="top" secondItem="RCD-6Z-45A" secondAttribute="bottom" constant="17" id="vnW-bp-wrA"/>
                         <constraint firstAttribute="trailing" secondItem="0sU-V8-QVn" secondAttribute="trailing" constant="20" id="xxe-g4-xO5"/>
+                        <constraint firstItem="Emm-7B-NhE" firstAttribute="top" secondItem="LIm-mD-lnc" secondAttribute="top" constant="17" id="zpe-cG-PUv"/>
                     </constraints>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
             <constraints>
-                <constraint firstAttribute="centerY" secondItem="LIm-mD-lnc" secondAttribute="centerY" constant="129" id="CKd-ne-r1F"/>
                 <constraint firstAttribute="centerX" secondItem="LIm-mD-lnc" secondAttribute="centerX" constant="-0.5" id="kDS-c0-LBA"/>
+                <constraint firstAttribute="centerY" secondItem="LIm-mD-lnc" secondAttribute="centerY" constant="0.5" id="ukF-8r-NKc"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
         </view>
diff --git a/DUREX Vendor Control/Base.lproj/PriceChangerViewController.xib b/DUREX Vendor Control/Base.lproj/PriceChangerViewController.xib
index afc0de3..d31f618 100644
--- a/DUREX Vendor Control/Base.lproj/PriceChangerViewController.xib
+++ b/DUREX Vendor Control/Base.lproj/PriceChangerViewController.xib
@@ -18,49 +18,58 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6eG-rz-OsA">
-                    <rect key="frame" x="7" y="118" width="307" height="181"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6eG-rz-OsA">
+                    <rect key="frame" x="7" y="170" width="307" height="181"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yrc-dD-lC1">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yrc-dD-lC1">
                             <rect key="frame" x="190" y="20" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="mRm-Yc-9KJ"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0IF-Ml-nmK">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0IF-Ml-nmK">
                             <rect key="frame" x="190" y="59" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="D0x-wp-xRk"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0ap-q1-lJS">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0ap-q1-lJS">
                             <rect key="frame" x="190" y="97" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="8Z4-F8-M5m"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VCq-As-NrV">
-                            <rect key="frame" x="20" y="24" width="66" height="21"/>
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VCq-As-NrV">
+                            <rect key="frame" x="20" y="24" width="64" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2cF-of-r57">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2cF-of-r57">
                             <rect key="frame" x="20" y="63" width="107" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cbx-ha-NZx">
-                            <rect key="frame" x="20" y="101" width="82" height="21"/>
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cbx-ha-NZx">
+                            <rect key="frame" x="20" y="101" width="79" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="slH-Zj-pps">
-                            <rect key="frame" x="130" y="131" width="46" height="30"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="slH-Zj-pps">
+                            <rect key="frame" x="135" y="131" 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"/>
@@ -72,22 +81,28 @@
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
                     <constraints>
+                        <constraint firstItem="VCq-As-NrV" firstAttribute="top" secondItem="6eG-rz-OsA" secondAttribute="top" constant="24" id="7Ei-6v-DJy"/>
                         <constraint firstAttribute="trailing" secondItem="0ap-q1-lJS" secondAttribute="trailing" constant="20" id="7GE-ll-lvy"/>
                         <constraint firstAttribute="centerX" secondItem="slH-Zj-pps" secondAttribute="centerX" constant="0.5" id="8wy-KG-YiS"/>
+                        <constraint firstItem="0ap-q1-lJS" firstAttribute="top" secondItem="0IF-Ml-nmK" secondAttribute="bottom" constant="8" id="GEg-PI-O0h"/>
                         <constraint firstItem="Cbx-ha-NZx" firstAttribute="leading" secondItem="6eG-rz-OsA" secondAttribute="leading" constant="20" id="KKA-RW-IHT"/>
+                        <constraint firstItem="0IF-Ml-nmK" firstAttribute="top" secondItem="Yrc-dD-lC1" secondAttribute="bottom" constant="9" id="NSa-6w-ZoW"/>
                         <constraint firstItem="Cbx-ha-NZx" firstAttribute="top" secondItem="2cF-of-r57" secondAttribute="bottom" constant="17" id="NdB-eX-528"/>
                         <constraint firstAttribute="trailing" secondItem="Yrc-dD-lC1" secondAttribute="trailing" constant="20" id="QHF-7B-Ic6"/>
+                        <constraint firstItem="Yrc-dD-lC1" firstAttribute="top" secondItem="6eG-rz-OsA" secondAttribute="top" constant="20" id="Um6-gq-dBm"/>
                         <constraint firstAttribute="trailing" secondItem="0IF-Ml-nmK" secondAttribute="trailing" constant="20" id="XV4-Tn-CS3"/>
                         <constraint firstItem="2cF-of-r57" firstAttribute="top" secondItem="VCq-As-NrV" secondAttribute="bottom" constant="18" id="Zyz-on-i4t"/>
                         <constraint firstItem="2cF-of-r57" firstAttribute="leading" secondItem="6eG-rz-OsA" secondAttribute="leading" constant="20" id="bxk-cG-hJO"/>
                         <constraint firstAttribute="bottom" secondItem="slH-Zj-pps" secondAttribute="bottom" constant="20" id="fiT-k5-kVx"/>
+                        <constraint firstAttribute="height" constant="181" id="hT5-6S-IYo"/>
                         <constraint firstItem="VCq-As-NrV" firstAttribute="leading" secondItem="6eG-rz-OsA" secondAttribute="leading" constant="20" id="i5D-Xb-H4X"/>
+                        <constraint firstAttribute="width" constant="307" id="yFZ-8Q-WDt"/>
                     </constraints>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
             <constraints>
-                <constraint firstAttribute="centerY" secondItem="6eG-rz-OsA" secondAttribute="centerY" constant="75" id="Nqt-Ai-WrO"/>
+                <constraint firstItem="6eG-rz-OsA" firstAttribute="top" secondItem="Vhv-I1-cgL" secondAttribute="top" constant="170" id="JVE-no-tdA"/>
                 <constraint firstAttribute="centerX" secondItem="6eG-rz-OsA" secondAttribute="centerX" constant="-0.5" id="ShJ-gZ-P8L"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
diff --git a/DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad.xib b/DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad.xib
index 3e80a25..8465b16 100644
--- a/DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad.xib
+++ b/DUREX Vendor Control/Base.lproj/PriceChangerViewController_iPad.xib
@@ -18,49 +18,58 @@
             <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5MK-ZF-rTd">
-                    <rect key="frame" x="213" y="294" width="343" height="177"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5MK-ZF-rTd">
+                    <rect key="frame" x="213" y="423" width="343" height="177"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ERH-UB-KNz">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ERH-UB-KNz">
                             <rect key="frame" x="226" y="17" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="LcC-bv-dfw"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hmJ-zn-ogZ">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hmJ-zn-ogZ">
                             <rect key="frame" x="226" y="56" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="XQw-vd-dgs"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="suL-QX-iE6">
-                            <rect key="frame" x="226" y="95" width="97" height="30"/>
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="suL-QX-iE6">
+                            <rect key="frame" x="226" y="94" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="hg5-e3-F6K"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6M6-Rz-v0B">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6M6-Rz-v0B">
                             <rect key="frame" x="20" y="21" width="64" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y0J-fk-3XQ">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y0J-fk-3XQ">
                             <rect key="frame" x="20" y="60" width="107" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CRj-D6-8bV">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CRj-D6-8bV">
                             <rect key="frame" x="20" y="98" width="79" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BsH-aP-YXx">
-                            <rect key="frame" x="148" y="127" width="46" height="30"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BsH-aP-YXx">
+                            <rect key="frame" x="153" y="127" 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"/>
@@ -72,14 +81,18 @@
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     <constraints>
+                        <constraint firstItem="ERH-UB-KNz" firstAttribute="top" secondItem="5MK-ZF-rTd" secondAttribute="top" constant="17" id="1AX-c3-CDm"/>
+                        <constraint firstItem="suL-QX-iE6" firstAttribute="top" secondItem="hmJ-zn-ogZ" secondAttribute="bottom" constant="8" id="JgS-D8-cIr"/>
+                        <constraint firstItem="6M6-Rz-v0B" firstAttribute="top" secondItem="5MK-ZF-rTd" secondAttribute="top" constant="21" id="Jq8-3l-kYc"/>
                         <constraint firstItem="y0J-fk-3XQ" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="LSk-KG-aOB"/>
                         <constraint firstItem="y0J-fk-3XQ" firstAttribute="top" secondItem="6M6-Rz-v0B" secondAttribute="bottom" constant="18" id="M4d-Ez-pHf"/>
                         <constraint firstItem="CRj-D6-8bV" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="Oza-iy-MaH"/>
                         <constraint firstItem="6M6-Rz-v0B" firstAttribute="leading" secondItem="5MK-ZF-rTd" secondAttribute="leading" constant="20" id="Sma-ZL-ALv"/>
+                        <constraint firstAttribute="height" constant="177" id="bNq-pw-RTB"/>
                         <constraint firstItem="CRj-D6-8bV" firstAttribute="top" secondItem="y0J-fk-3XQ" secondAttribute="bottom" constant="17" id="duF-LR-Sda"/>
                         <constraint firstAttribute="trailing" secondItem="suL-QX-iE6" secondAttribute="trailing" constant="20" id="jtP-QM-5L3"/>
-                        <constraint firstItem="suL-QX-iE6" firstAttribute="top" secondItem="hmJ-zn-ogZ" secondAttribute="bottom" constant="8" id="kcG-tJ-Cyy"/>
-                        <constraint firstItem="hmJ-zn-ogZ" firstAttribute="top" secondItem="ERH-UB-KNz" secondAttribute="bottom" constant="8" id="pNy-vJ-e91"/>
+                        <constraint firstItem="hmJ-zn-ogZ" firstAttribute="top" secondItem="ERH-UB-KNz" secondAttribute="bottom" constant="9" id="mYf-Tf-3yJ"/>
+                        <constraint firstAttribute="width" constant="343" id="mon-Sh-DKk"/>
                         <constraint firstAttribute="centerX" secondItem="BsH-aP-YXx" secondAttribute="centerX" constant="0.5" id="sN6-ce-scm"/>
                         <constraint firstAttribute="bottom" secondItem="BsH-aP-YXx" secondAttribute="bottom" constant="20" id="tse-ri-BEr"/>
                         <constraint firstAttribute="trailing" secondItem="ERH-UB-KNz" secondAttribute="trailing" constant="20" id="uN1-od-vVE"/>
@@ -89,8 +102,8 @@
             </subviews>
             <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
             <constraints>
+                <constraint firstAttribute="centerY" secondItem="5MK-ZF-rTd" secondAttribute="centerY" constant="0.5" id="I13-zq-tsN"/>
                 <constraint firstAttribute="centerX" secondItem="5MK-ZF-rTd" secondAttribute="centerX" constant="-0.5" id="Lzg-nt-yLC"/>
-                <constraint firstAttribute="centerY" secondItem="5MK-ZF-rTd" secondAttribute="centerY" constant="129" id="iRc-aE-qBX"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
         </view>
diff --git a/DUREX Vendor Control/CommunicationProtocol.m b/DUREX Vendor Control/CommunicationProtocol.m
index 014bf61..8ab5736 100644
--- a/DUREX Vendor Control/CommunicationProtocol.m
+++ b/DUREX Vendor Control/CommunicationProtocol.m
@@ -202,7 +202,7 @@
     [[EMConnectionManager sharedManager] writeValue:[NSNumber numberWithUnsignedChar:(unsigned char)([message length]/MAX_STRING_LENGTH)+1] toResource:@"numPackets" onSuccess:^
      {
          status = TRUE;
-         NSLog(@"[CommunicationProtocol.m]: numPackets set to %d",([message length]/MAX_STRING_LENGTH) + 1);
+         NSLog(@"[CommunicationProtocol.m]: numPackets set to %u",([message length]/MAX_STRING_LENGTH) + 1);
      }
                                              onFail:^(NSError *error)
      {
@@ -315,8 +315,8 @@
     NSMutableString *command = [NSMutableString stringWithFormat: @"A5"];
     NSInteger year = [date year];
     year = year - (year/100)*100;
-    [command appendString:[NSString stringWithFormat:@"%02d",year]];
-    [command appendString:[NSString stringWithFormat:@"%02d%02d%02d%02d%02d",[date month],[date day],[date hour],[date minute],[date second]]];
+    [command appendString:[NSString stringWithFormat:@"%02ld",(long)year]];
+    [command appendString:[NSString stringWithFormat:@"%02ld%02ld%02ld%02ld%02ld",(long)[date month],(long)[date day],(long)[date hour],(long)[date minute],(long)[date second]]];
     [self writeMessage:command];
     NSString *answer = [self readMessage];
     if([answer isEqualToString:@"P51"])
diff --git a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
index 5d83cdd..04201f9 100644
--- a/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
+++ b/DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
@@ -162,7 +162,7 @@
 		3471865418070D9300FA0FB2 = {
 			isa = PBXGroup;
 			children = (
-				3471866618070D9300FA0FB2 /* FirstApp */,
+				3471866618070D9300FA0FB2 /* DUREX Vendor Control */,
 				3471865F18070D9300FA0FB2 /* Frameworks */,
 				3471865E18070D9300FA0FB2 /* Products */,
 			);
@@ -189,53 +189,36 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		3471866618070D9300FA0FB2 /* FirstApp */ = {
+		3471866618070D9300FA0FB2 /* DUREX Vendor Control */ = {
 			isa = PBXGroup;
 			children = (
-				F961D814199A5FA000E9282C /* Localizable.strings */,
-				F961D806199A5F1000E9282C /* MainStoryboard.storyboard */,
-				34AAB876189804FF0019860D /* DUREXAppDelegate.h */,
+				3471868F18070E4300FA0FB2 /* Framework */,
+				347186A718070F7F00FA0FB2 /* Device Picker */,
+				347186B91807290E00FA0FB2 /* Schemas */,
+				3471866718070D9300FA0FB2 /* Supporting Files */,
+				F9ED745419B89E4600C7298D /* Views */,
+				F9ED745519B89E7700C7298D /* Headers */,
 				34AAB877189804FF0019860D /* DUREXAppDelegate.m */,
-				F98356D4192E835F00EA6821 /* InitialViewController.h */,
 				F98356D5192E835F00EA6821 /* InitialViewController.m */,
-				F98356DF192EC84700EA6821 /* MenuTableViewController.h */,
 				F98356E0192EC84700EA6821 /* MenuTableViewController.m */,
-				F98356D9192EAFD400EA6821 /* CommunicationProtocol.h */,
 				F98356DA192EAFD400EA6821 /* CommunicationProtocol.m */,
-				F9A8EF7A192FE201009E7532 /* Stack.h */,
 				F9A8EF7B192FE201009E7532 /* Stack.m */,
-				F933F80119B6819400521B90 /* DatePickerViewController.h */,
 				F933F80219B6819400521B90 /* DatePickerViewController.m */,
-				F9015D9219B73052006C7882 /* DatePickerViewController.xib */,
-				F9015D9919B7305E006C7882 /* DatePickerViewController_iPad.xib */,
-				F92F567619B75F5E00A1EACA /* PriceChangerViewController.h */,
 				F92F567719B75F5E00A1EACA /* PriceChangerViewController.m */,
-				F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */,
-				F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */,
-				F92F568D19B763FD00A1EACA /* NameChangerViewController.h */,
 				F92F568E19B763FD00A1EACA /* NameChangerViewController.m */,
-				F92F569419B7665F00A1EACA /* NameChangerViewController.xib */,
-				F92F569D19B76A5D00A1EACA /* NameChangerViewController_iPad.xib */,
-				34AAB88C189805300019860D /* Images.xcassets */,
-				347186B91807290E00FA0FB2 /* Schemas */,
-				347186A718070F7F00FA0FB2 /* Device Picker */,
-				3471868F18070E4300FA0FB2 /* Framework */,
-				3471866718070D9300FA0FB2 /* Supporting Files */,
+				34AAB880189804FF0019860D /* main.m */,
 			);
-			name = FirstApp;
+			name = "DUREX Vendor Control";
 			path = TestAppExample;
 			sourceTree = "<group>";
 		};
 		3471866718070D9300FA0FB2 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				F97B90C919B859F500DDA9EF /* icon_checkmark.png */,
-				F97B90CA19B859F500DDA9EF /* icon_delete.png */,
-				F961D80E199A5F2D00E9282C /* back_arrow.png */,
-				F98356D7192E906600EA6821 /* bluetooth.png */,
+				F9ED745719B89EF000C7298D /* Images */,
+				F961D814199A5FA000E9282C /* Localizable.strings */,
 				34AAB87E189804FF0019860D /* DUREX Vendor Control-Info.plist */,
 				34AAB87F189804FF0019860D /* DUREX Vendor Control-Prefix.pch */,
-				34AAB880189804FF0019860D /* main.m */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -289,6 +272,48 @@
 			name = Schemas;
 			sourceTree = "<group>";
 		};
+		F9ED745419B89E4600C7298D /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				F961D806199A5F1000E9282C /* MainStoryboard.storyboard */,
+				F9015D9219B73052006C7882 /* DatePickerViewController.xib */,
+				F9015D9919B7305E006C7882 /* DatePickerViewController_iPad.xib */,
+				F92F567F19B7609C00A1EACA /* PriceChangerViewController.xib */,
+				F92F568619B760A800A1EACA /* PriceChangerViewController_iPad.xib */,
+				F92F569419B7665F00A1EACA /* NameChangerViewController.xib */,
+				F92F569D19B76A5D00A1EACA /* NameChangerViewController_iPad.xib */,
+			);
+			name = Views;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		F9ED745519B89E7700C7298D /* Headers */ = {
+			isa = PBXGroup;
+			children = (
+				34AAB876189804FF0019860D /* DUREXAppDelegate.h */,
+				F98356D4192E835F00EA6821 /* InitialViewController.h */,
+				F98356DF192EC84700EA6821 /* MenuTableViewController.h */,
+				F98356D9192EAFD400EA6821 /* CommunicationProtocol.h */,
+				F9A8EF7A192FE201009E7532 /* Stack.h */,
+				F933F80119B6819400521B90 /* DatePickerViewController.h */,
+				F92F567619B75F5E00A1EACA /* PriceChangerViewController.h */,
+				F92F568D19B763FD00A1EACA /* NameChangerViewController.h */,
+			);
+			name = Headers;
+			sourceTree = "<group>";
+		};
+		F9ED745719B89EF000C7298D /* Images */ = {
+			isa = PBXGroup;
+			children = (
+				34AAB88C189805300019860D /* Images.xcassets */,
+				F97B90C919B859F500DDA9EF /* icon_checkmark.png */,
+				F97B90CA19B859F500DDA9EF /* icon_delete.png */,
+				F961D80E199A5F2D00E9282C /* back_arrow.png */,
+				F98356D7192E906600EA6821 /* bluetooth.png */,
+			);
+			name = Images;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
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 ff80eca..55262bd 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/FirstAppExample/Base.lproj/MainStoryboard.storyboard b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard
index 118268e..6353a0f 100644
--- a/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard
+++ b/DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard
@@ -197,8 +197,8 @@
                                     <action selector="connectPressed:" destination="fM1-5w-fRr" eventType="touchDown" id="yhT-cP-LLA"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Connect to Device" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oyW-sA-Lfb">
-                                <rect key="frame" x="86" y="356" width="149" height="21"/>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Connect to Device" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oyW-sA-Lfb">
+                                <rect key="frame" x="89" y="356" width="142" height="21"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
@@ -207,9 +207,9 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="oyW-sA-Lfb" firstAttribute="centerX" secondItem="bXZ-vt-REt" secondAttribute="centerX" constant="0.5" id="DNg-dX-pwk"/>
                             <constraint firstAttribute="centerY" secondItem="bXZ-vt-REt" secondAttribute="centerY" id="UT9-cH-z3k"/>
-                            <constraint firstItem="oyW-sA-Lfb" firstAttribute="top" secondItem="bXZ-vt-REt" secondAttribute="bottom" constant="8" id="i8M-sg-3Wz"/>
+                            <constraint firstItem="oyW-sA-Lfb" firstAttribute="top" secondItem="bXZ-vt-REt" secondAttribute="bottom" constant="8" id="fWB-WV-kqG"/>
+                            <constraint firstItem="bXZ-vt-REt" firstAttribute="centerX" secondItem="oyW-sA-Lfb" secondAttribute="centerX" constant="-0.5" id="gph-e5-nsJ"/>
                             <constraint firstAttribute="centerX" secondItem="bXZ-vt-REt" secondAttribute="centerX" id="mHc-1L-4hG"/>
                         </constraints>
                     </view>
diff --git a/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m b/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m
index f8fc8c6..53bdff0 100644
--- a/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m
+++ b/DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m
@@ -100,7 +100,7 @@
 
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    //[self performSegueWithIdentifier:@"ConnectionSegue" sender:self];
+    [self performSegueWithIdentifier:@"ConnectionSegue" sender:self];
     if(![[[[tableView cellForRowAtIndexPath:indexPath] textLabel] text] isEqualToString:NSLocalizedString(@"Searching for devices...",nil)])
     {
         [self _showConnectingView];
diff --git a/DUREX Vendor Control/FirstAppExample/es.lproj/MainStoryboard.strings b/DUREX Vendor Control/FirstAppExample/es.lproj/MainStoryboard.strings
index 6dbef47..c0e62f7 100644
--- a/DUREX Vendor Control/FirstAppExample/es.lproj/MainStoryboard.strings
+++ b/DUREX Vendor Control/FirstAppExample/es.lproj/MainStoryboard.strings
@@ -15,7 +15,7 @@
 "W3U-nk-SlV.text" = "Title";
 
 /* Class = "IBUINavigationItem"; title = "Select device"; ObjectID = "exc-MP-jDa"; */
-"exc-MP-jDa.title" = "Seleccione el dispsitivo";
+"exc-MP-jDa.title" = "Seleccione el dispositivo";
 
 /* Class = "IBUILabel"; text = "Title"; ObjectID = "iCG-eW-H8x"; */
 "iCG-eW-H8x.text" = "Title";
diff --git a/DUREX Vendor Control/MenuTableViewController.m b/DUREX Vendor Control/MenuTableViewController.m
index b0feea2..f2d4f0b 100644
--- a/DUREX Vendor Control/MenuTableViewController.m
+++ b/DUREX Vendor Control/MenuTableViewController.m
@@ -172,7 +172,7 @@
 
 - (void) backButtonPressed: (id) sender
 {
-    NSLog(@"[MenuTableViewController.m]: Navigation Stack has %d remaining levels",[[self parentLayout] count]);
+    NSLog(@"[MenuTableViewController.m]: Navigation Stack has %ld remaining levels",(long)[[self parentLayout] count]);
     if([[self parentLayout] count] > 0)
     {
         NSLog(@"[MenuTableViewController.m]: Falling to previous navigation level");
diff --git a/TODO b/TODO
index 12fc30e..1f2df49 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,20 @@
+BUGS:
 - messageAvailable checks and status checks NOT working (long operations)
-- pop to previous view on connect error NOT working
 - On date change, response is overwritten by previous query, trimming needed according to numBytes
 
-
-- Incident class
+TODO:
+- A4 command
 - Sale class
 - Sale parser
-- Incident parser
-- Popup view
 - A2 command
+- Implement sensor status logging and sending to remote server
+- Lewis infrastructure for data viewing (SQL, Webpage, CSV parser)
+- Incident class
+- Incident parser
 - A3 command
-- Redefine A4 command
-- A4 command
+- Batch command files, definition, parsing and pushing them to the app
+- Implement user auth. Server authenticates the app ONCE on install and allows to control ONE machine (key gets validated on server and then stored on app)
+- Implement master key.
+
+CHECK:
+- Layouts on another iPhone