diff --git a/Demos/App Demo for iOS Swift/App Demo for iOS Swift/Base.lproj/Main.storyboard b/Demos/App Demo for iOS Swift/App Demo for iOS Swift/Base.lproj/Main.storyboard
index 9faf1ea..3ed133c 100644
--- a/Demos/App Demo for iOS Swift/App Demo for iOS Swift/Base.lproj/Main.storyboard	
+++ b/Demos/App Demo for iOS Swift/App Demo for iOS Swift/Base.lproj/Main.storyboard	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14E17e" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
     </dependencies>
@@ -37,7 +37,7 @@
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES"/>
                             </textField>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Don't have an ACME account?" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KVH-91-167">
-                                <rect key="frame" x="198" y="341" width="205" height="21"/>
+                                <rect key="frame" x="198" y="311" width="205" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="205" id="QX0-jz-Vzi"/>
                                     <constraint firstAttribute="height" constant="21" id="uPK-It-d2H"/>
@@ -71,7 +71,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JAX-NX-Utp">
-                                <rect key="frame" x="247" y="370" width="109" height="34"/>
+                                <rect key="frame" x="247" y="334" width="109" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="109" id="6NE-L2-KPX"/>
                                 </constraints>
@@ -116,14 +116,14 @@
                             <constraint firstItem="4my-NG-1Ao" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" constant="106" id="9Ke-oV-8qg"/>
                             <constraint firstItem="Za2-pr-tWA" firstAttribute="trailing" secondItem="ZLv-94-XOA" secondAttribute="trailing" id="AoS-b4-gEh"/>
                             <constraint firstAttribute="centerX" secondItem="Fzs-00-LBD" secondAttribute="centerX" constant="-1" id="E3x-Og-o5i"/>
-                            <constraint firstItem="JAX-NX-Utp" firstAttribute="top" secondItem="KVH-91-167" secondAttribute="bottom" constant="8" symbolic="YES" id="H33-Xy-iKV"/>
+                            <constraint firstItem="JAX-NX-Utp" firstAttribute="top" secondItem="KVH-91-167" secondAttribute="bottom" constant="2" id="H33-Xy-iKV"/>
                             <constraint firstItem="4my-NG-1Ao" firstAttribute="leading" secondItem="Za2-pr-tWA" secondAttribute="leading" id="IDr-Qh-aBc"/>
                             <constraint firstItem="ZLv-94-XOA" firstAttribute="centerX" secondItem="Fzs-00-LBD" secondAttribute="centerX" constant="-1" id="IaI-RI-m2m"/>
                             <constraint firstItem="Za2-pr-tWA" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="JGc-lh-jaP"/>
                             <constraint firstItem="Fzs-00-LBD" firstAttribute="top" secondItem="3Ud-6a-a66" secondAttribute="bottom" constant="16" id="KiL-hi-Av7"/>
                             <constraint firstItem="cDc-DW-cLJ" firstAttribute="centerY" secondItem="ZLv-94-XOA" secondAttribute="centerY" id="P3e-4o-N0P"/>
                             <constraint firstItem="4my-NG-1Ao" firstAttribute="trailing" secondItem="Za2-pr-tWA" secondAttribute="trailing" id="SSC-xu-nUR"/>
-                            <constraint firstItem="KVH-91-167" firstAttribute="top" secondItem="Fzs-00-LBD" secondAttribute="bottom" constant="54" id="Xvd-r5-WED"/>
+                            <constraint firstItem="KVH-91-167" firstAttribute="top" secondItem="Fzs-00-LBD" secondAttribute="bottom" constant="24" id="Xvd-r5-WED"/>
                             <constraint firstItem="ZLv-94-XOA" firstAttribute="leading" secondItem="Za2-pr-tWA" secondAttribute="leading" id="ZjZ-UF-9wx"/>
                             <constraint firstItem="cDc-DW-cLJ" firstAttribute="leading" secondItem="ZLv-94-XOA" secondAttribute="trailing" id="adu-W9-0JV"/>
                             <constraint firstItem="Za2-pr-tWA" firstAttribute="top" secondItem="4my-NG-1Ao" secondAttribute="bottom" constant="8" symbolic="YES" id="m0x-iP-Tro"/>
diff --git a/Demos/App Demo for iOS/App Demo for iOS/Base.lproj/Main.storyboard b/Demos/App Demo for iOS/App Demo for iOS/Base.lproj/Main.storyboard
index 962ab87..0bb5afe 100644
--- a/Demos/App Demo for iOS/App Demo for iOS/Base.lproj/Main.storyboard	
+++ b/Demos/App Demo for iOS/App Demo for iOS/Base.lproj/Main.storyboard	
@@ -37,7 +37,7 @@
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no" secureTextEntry="YES"/>
                             </textField>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Don't have an ACME account?" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KVH-91-167">
-                                <rect key="frame" x="198" y="341" width="205" height="21"/>
+                                <rect key="frame" x="198" y="305" width="205" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="205" id="QX0-jz-Vzi"/>
                                     <constraint firstAttribute="height" constant="21" id="uPK-It-d2H"/>
@@ -71,7 +71,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JAX-NX-Utp">
-                                <rect key="frame" x="247" y="370" width="109" height="34"/>
+                                <rect key="frame" x="247" y="329" width="109" height="34"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="109" id="6NE-L2-KPX"/>
                                 </constraints>
@@ -116,14 +116,14 @@
                             <constraint firstItem="4my-NG-1Ao" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" constant="106" id="9Ke-oV-8qg"/>
                             <constraint firstItem="Za2-pr-tWA" firstAttribute="trailing" secondItem="ZLv-94-XOA" secondAttribute="trailing" id="AoS-b4-gEh"/>
                             <constraint firstAttribute="centerX" secondItem="Fzs-00-LBD" secondAttribute="centerX" constant="-1" id="E3x-Og-o5i"/>
-                            <constraint firstItem="JAX-NX-Utp" firstAttribute="top" secondItem="KVH-91-167" secondAttribute="bottom" constant="8" symbolic="YES" id="H33-Xy-iKV"/>
+                            <constraint firstItem="JAX-NX-Utp" firstAttribute="top" secondItem="KVH-91-167" secondAttribute="bottom" constant="3" id="H33-Xy-iKV"/>
                             <constraint firstItem="4my-NG-1Ao" firstAttribute="leading" secondItem="Za2-pr-tWA" secondAttribute="leading" id="IDr-Qh-aBc"/>
                             <constraint firstItem="ZLv-94-XOA" firstAttribute="centerX" secondItem="Fzs-00-LBD" secondAttribute="centerX" constant="-1" id="IaI-RI-m2m"/>
                             <constraint firstItem="Za2-pr-tWA" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="JGc-lh-jaP"/>
                             <constraint firstItem="Fzs-00-LBD" firstAttribute="top" secondItem="3Ud-6a-a66" secondAttribute="bottom" constant="16" id="KiL-hi-Av7"/>
                             <constraint firstItem="cDc-DW-cLJ" firstAttribute="centerY" secondItem="ZLv-94-XOA" secondAttribute="centerY" id="P3e-4o-N0P"/>
                             <constraint firstItem="4my-NG-1Ao" firstAttribute="trailing" secondItem="Za2-pr-tWA" secondAttribute="trailing" id="SSC-xu-nUR"/>
-                            <constraint firstItem="KVH-91-167" firstAttribute="top" secondItem="Fzs-00-LBD" secondAttribute="bottom" constant="54" id="Xvd-r5-WED"/>
+                            <constraint firstItem="KVH-91-167" firstAttribute="top" secondItem="Fzs-00-LBD" secondAttribute="bottom" constant="18" id="Xvd-r5-WED"/>
                             <constraint firstItem="ZLv-94-XOA" firstAttribute="leading" secondItem="Za2-pr-tWA" secondAttribute="leading" id="ZjZ-UF-9wx"/>
                             <constraint firstItem="cDc-DW-cLJ" firstAttribute="leading" secondItem="ZLv-94-XOA" secondAttribute="trailing" id="adu-W9-0JV"/>
                             <constraint firstItem="Za2-pr-tWA" firstAttribute="top" secondItem="4my-NG-1Ao" secondAttribute="bottom" constant="8" symbolic="YES" id="m0x-iP-Tro"/>