diff --git a/KarhooUISDK/CommonUI/Views/EmptyDataSetView/View/KarhooEmptyDataSetView.xib b/KarhooUISDK/CommonUI/Views/EmptyDataSetView/View/KarhooEmptyDataSetView.xib
index 9d8fd608c..5e7ed9282 100644
--- a/KarhooUISDK/CommonUI/Views/EmptyDataSetView/View/KarhooEmptyDataSetView.xib
+++ b/KarhooUISDK/CommonUI/Views/EmptyDataSetView/View/KarhooEmptyDataSetView.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KarhooEmptyDataSetView" customModule="KarhooUISDK" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KarhooEmptyDataSetView" customModule="KarhooUISDK">
             <connections>
                 <outlet property="emptyMessageLabel" destination="8Rc-wT-y97" id="qz6-C9-nga"/>
             </connections>
@@ -18,7 +18,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fmg-K3-EUl" customClass="Attributes" customModule="KarhooUISDK" customModuleProvider="target">
+                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fmg-K3-EUl" customClass="Attributes" customModule="KarhooUISDK">
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <connections>
@@ -33,6 +33,7 @@
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <accessibility key="accessibilityConfiguration" identifier="empty-message-label">
                 <accessibilityTraits key="traits" staticText="YES"/>
@@ -42,7 +43,6 @@
                 <constraint firstItem="8Rc-wT-y97" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="JtC-gH-dYf"/>
                 <constraint firstItem="8Rc-wT-y97" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="Qnp-aG-kuM"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <point key="canvasLocation" x="130.40000000000001" y="152.47376311844079"/>
         </view>
     </objects>
diff --git a/KarhooUISDK/Screens/BookingScreen/AddressBar/PrebookField.xib b/KarhooUISDK/Screens/BookingScreen/AddressBar/PrebookField.xib
index 08fc631e9..9d5658202 100644
--- a/KarhooUISDK/Screens/BookingScreen/AddressBar/PrebookField.xib
+++ b/KarhooUISDK/Screens/BookingScreen/AddressBar/PrebookField.xib
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PrebookField" customModule="KarhooUISDK" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PrebookField" customModule="KarhooUISDK">
             <connections>
                 <outlet property="dateLabel" destination="FzH-D5-eFN" id="xlV-f6-bP3"/>
                 <outlet property="defaultView" destination="oJI-hC-aRV" id="tn5-o6-mcC"/>
@@ -20,7 +20,7 @@
             <rect key="frame" x="0.0" y="0.0" width="103" height="43"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fU8-jV-Ehu" customClass="Attributes" customModule="KarhooUISDK" customModuleProvider="target">
+                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fU8-jV-Ehu" customClass="Attributes" customModule="KarhooUISDK">
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <connections>
@@ -34,7 +34,7 @@
                         <outletCollection property="secondaryImageTint" destination="cR5-ZV-1Gq" collectionClass="NSMutableArray" id="VX9-F9-frg"/>
                     </connections>
                 </view>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MGi-54-i7e" customClass="NibStrings" customModule="KarhooUISDK" customModuleProvider="target">
+                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MGi-54-i7e" customClass="NibStrings" customModule="KarhooUISDK">
                     <rect key="frame" x="-69" y="-43" width="240" height="128"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -57,14 +57,14 @@
                             <rect key="frame" x="79" y="16" width="12" height="12"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         </imageView>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Thm-LB-Www">
+                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Thm-LB-Www">
                             <rect key="frame" x="74" y="0.0" width="29" height="43"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <connections>
                                 <action selector="clearPressed:" destination="-1" eventType="touchUpInside" id="YyJ-St-ovF"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6KM-wa-HE3">
+                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6KM-wa-HE3">
                             <rect key="frame" x="0.0" y="0.0" width="71" height="43"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <connections>
@@ -96,7 +96,7 @@
                             <rect key="frame" x="13.5" y="13.5" width="16" height="16"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         </imageView>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ALi-BK-Gie">
+                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ALi-BK-Gie">
                             <rect key="frame" x="0.0" y="0.0" width="103" height="43"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <connections>
diff --git a/KarhooUISDK/Screens/CheckoutScreen/Components/TimePrice/KarhooTimePriceView.xib b/KarhooUISDK/Screens/CheckoutScreen/Components/TimePrice/KarhooTimePriceView.xib
index fdc3de936..6aac4a93f 100644
--- a/KarhooUISDK/Screens/CheckoutScreen/Components/TimePrice/KarhooTimePriceView.xib
+++ b/KarhooUISDK/Screens/CheckoutScreen/Components/TimePrice/KarhooTimePriceView.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KarhooTimePriceView" customModule="KarhooUISDK" customModuleProvider="target"/>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KarhooTimePriceView" customModule="KarhooUISDK"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
             <rect key="frame" x="0.0" y="0.0" width="361" height="50"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="haK-rc-GDS" customClass="NibStrings" customModule="KarhooUISDK" customModuleProvider="target">
+                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="haK-rc-GDS" customClass="NibStrings" customModule="KarhooUISDK">
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                 </view>
@@ -58,7 +58,7 @@
                             <rect key="frame" x="181" y="0.0" width="164" height="50"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="£13.030" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.55000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="Fq4-kh-UUw">
-                                    <rect key="frame" x="25" y="0.0" width="113.5" height="37"/>
+                                    <rect key="frame" x="25.5" y="0.0" width="112.5" height="37"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="30"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
@@ -87,7 +87,7 @@
                         <constraint firstItem="xOr-PE-AAY" firstAttribute="width" secondItem="PAJ-Gy-IHw" secondAttribute="width" id="G21-rv-g1M"/>
                     </constraints>
                 </stackView>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rz5-pA-IES">
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rz5-pA-IES">
                     <rect key="frame" x="197" y="0.0" width="164" height="50"/>
                 </button>
             </subviews>
diff --git a/KarhooUISDK/Screens/DatePickerScreen/View/DatePickerViewController.xib b/KarhooUISDK/Screens/DatePickerScreen/View/DatePickerViewController.xib
index 90f2df69e..df3a921c7 100644
--- a/KarhooUISDK/Screens/DatePickerScreen/View/DatePickerViewController.xib
+++ b/KarhooUISDK/Screens/DatePickerScreen/View/DatePickerViewController.xib
@@ -7,7 +7,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DatePickerViewController" customModule="Karhoo">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="DatePickerViewController" customModule="KarhooUISDK">
             <connections>
                 <outlet property="backgroundView" destination="QLv-ej-iNS" id="ckB-kx-G63"/>
                 <outlet property="datePicker" destination="q36-cc-70b" id="KqH-dn-Kh0"/>
diff --git a/KarhooUISDK/Screens/PopupDialog/PopupDialogViewController.xib b/KarhooUISDK/Screens/PopupDialog/PopupDialogViewController.xib
index aaf434164..6b886884f 100644
--- a/KarhooUISDK/Screens/PopupDialog/PopupDialogViewController.xib
+++ b/KarhooUISDK/Screens/PopupDialog/PopupDialogViewController.xib
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PopupDialogViewController" customModule="KarhooUISDK" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="PopupDialogViewController" customModule="KarhooUISDK">
             <connections>
                 <outlet property="blurView" destination="rcs-7a-6w4" id="KcP-z8-WgZ"/>
                 <outlet property="formButton" destination="FUq-5h-uCd" id="upL-Pt-wnQ"/>
@@ -34,7 +32,7 @@
                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="z9B-yt-17m">
                                 <rect key="frame" x="37.5" y="96" width="300" height="475"/>
                                 <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FUq-5h-uCd" customClass="FormButton" customModule="KarhooUISDK" customModuleProvider="target">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FUq-5h-uCd" customClass="FormButton" customModule="KarhooUISDK">
                                         <rect key="frame" x="0.0" y="431" width="300" height="44"/>
                                         <color key="backgroundColor" red="0.98039215690000003" green="0.0" blue="0.27450980390000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
@@ -104,6 +102,7 @@ tolls, taxes, and other charges.</string>
                     </connections>
                 </view>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="ZPM-tm-KeW"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
@@ -112,7 +111,7 @@ tolls, taxes, and other charges.</string>
                 <constraint firstItem="rcs-7a-6w4" firstAttribute="top" secondItem="ZAM-1Z-C69" secondAttribute="top" id="kaV-aL-wnn"/>
                 <constraint firstItem="rcs-7a-6w4" firstAttribute="bottom" secondItem="ZAM-1Z-C69" secondAttribute="bottom" id="q5f-mT-fDe"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="ZPM-tm-KeW"/>
+            <point key="canvasLocation" x="132" y="132"/>
         </view>
         <tapGestureRecognizer id="HKk-1d-ZNW">
             <connections>
diff --git a/KarhooUISDK/Screens/PrebookConfirmationScreen/KarhooPrebookConfirmationViewController.xib b/KarhooUISDK/Screens/PrebookConfirmationScreen/KarhooPrebookConfirmationViewController.xib
index d0a11bfaf..e83f9da5a 100644
--- a/KarhooUISDK/Screens/PrebookConfirmationScreen/KarhooPrebookConfirmationViewController.xib
+++ b/KarhooUISDK/Screens/PrebookConfirmationScreen/KarhooPrebookConfirmationViewController.xib
@@ -9,7 +9,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KarhooPrebookConfirmationViewController" customModule="KarhooUISDK" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KarhooPrebookConfirmationViewController" customModule="KarhooUISDK">
             <connections>
                 <outlet property="blurView" destination="alF-J0-vAo" id="C2t-Jl-UkY"/>
                 <outlet property="dateLabel" destination="jzd-bg-01K" id="jcb-ws-oSg"/>
@@ -65,7 +65,7 @@
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ojm-oL-O5G">
                                                         <rect key="frame" x="12" y="107" width="276" height="0.5"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g4a-US-3CQ" customClass="RoundedLabel" customModule="KarhooUISDK" customModuleProvider="target">
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g4a-US-3CQ" customClass="RoundedLabel" customModule="KarhooUISDK">
                                                                 <rect key="frame" x="122.5" y="-7" width="31" height="14.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -101,7 +101,7 @@
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t72-Qf-3XT">
                                                                 <rect key="frame" x="0.0" y="0.0" width="32" height="128"/>
                                                                 <subviews>
-                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oUz-Ht-GDF" customClass="PinView" customModule="KarhooUISDK" customModuleProvider="target">
+                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oUz-Ht-GDF" customClass="PinView" customModule="KarhooUISDK">
                                                                         <rect key="frame" x="12" y="49" width="8" height="70"/>
                                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
@@ -197,7 +197,7 @@
                                                 </subviews>
                                                 <edgeInsets key="layoutMargins" top="12" left="12" bottom="12" right="12"/>
                                             </stackView>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ngl-D0-YNy" customClass="FormButton" customModule="KarhooUISDK" customModuleProvider="target">
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ngl-D0-YNy" customClass="FormButton" customModule="KarhooUISDK">
                                                 <rect key="frame" x="0.0" y="361.5" width="300" height="44"/>
                                                 <color key="backgroundColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <constraints>
@@ -280,6 +280,7 @@
             <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
             <fontDescription key="fontDescription" type="system" pointSize="14"/>
             <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+            <point key="canvasLocation" x="-294" y="-614"/>
         </textView>
     </objects>
     <resources>
diff --git a/KarhooUISDK/Screens/Rides/UIPageControl/RidesViewController.xib b/KarhooUISDK/Screens/Rides/UIPageControl/RidesViewController.xib
index 4940f60f9..b20670c78 100644
--- a/KarhooUISDK/Screens/Rides/UIPageControl/RidesViewController.xib
+++ b/KarhooUISDK/Screens/Rides/UIPageControl/RidesViewController.xib
@@ -2,6 +2,7 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
diff --git a/KarhooUISDK/Screens/SideMenu/SideMenuContent/MenuContentViewController.xib b/KarhooUISDK/Screens/SideMenu/SideMenuContent/MenuContentViewController.xib
index 9ab5f13de..6b2ec677c 100644
--- a/KarhooUISDK/Screens/SideMenu/SideMenuContent/MenuContentViewController.xib
+++ b/KarhooUISDK/Screens/SideMenu/SideMenuContent/MenuContentViewController.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MenuContentViewController" customModule="KarhooUISDK" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MenuContentViewController" customModule="KarhooUISDK">
             <connections>
                 <outlet property="aboutImage" destination="Tni-rx-zrU" id="inC-q4-o5E"/>
                 <outlet property="helpImage" destination="vfO-ew-4Cj" id="iJO-JS-y3Q"/>
@@ -25,7 +25,7 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hcM-9N-W3l" customClass="NibStrings" customModule="KarhooUISDK" customModuleProvider="target">
+                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hcM-9N-W3l" customClass="NibStrings" customModule="KarhooUISDK">
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <connections>
diff --git a/KarhooUISDK/Screens/SideMenu/SideMenuViewController.xib b/KarhooUISDK/Screens/SideMenu/SideMenuViewController.xib
index 67c591672..c03dcb869 100644
--- a/KarhooUISDK/Screens/SideMenu/SideMenuViewController.xib
+++ b/KarhooUISDK/Screens/SideMenu/SideMenuViewController.xib
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SideMenuViewController" customModule="Karhoo" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SideMenuViewController" customModule="KarhooUISDK">
             <connections>
                 <outlet property="contentContainer" destination="DyY-va-1Ke" id="4vx-AR-mgl"/>
                 <outlet property="menuContainer" destination="OeQ-Xi-xfE" id="tO3-em-ixl"/>
diff --git a/KarhooUISDK/Screens/TripSummaryScreen/Header/TripSummaryHeaderView.xib b/KarhooUISDK/Screens/TripSummaryScreen/Header/TripSummaryHeaderView.xib
index bd9ef919f..e12ac48e6 100644
--- a/KarhooUISDK/Screens/TripSummaryScreen/Header/TripSummaryHeaderView.xib
+++ b/KarhooUISDK/Screens/TripSummaryScreen/Header/TripSummaryHeaderView.xib
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TripSummaryHeaderView" customModule="KarhooUISDK" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TripSummaryHeaderView" customModule="KarhooUISDK">
             <connections>
                 <outlet property="headerLabel" destination="Z2d-cW-YCf" id="Avv-Hz-wcH"/>
             </connections>
diff --git a/KarhooUISDK/Screens/TripSummaryScreen/TripSummaryInfo/KarhooTripSummaryInfoView.xib b/KarhooUISDK/Screens/TripSummaryScreen/TripSummaryInfo/KarhooTripSummaryInfoView.xib
index 710a7414c..5c002c646 100644
--- a/KarhooUISDK/Screens/TripSummaryScreen/TripSummaryInfo/KarhooTripSummaryInfoView.xib
+++ b/KarhooUISDK/Screens/TripSummaryScreen/TripSummaryInfo/KarhooTripSummaryInfoView.xib
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -60,7 +62,7 @@
                     </connections>
                 </view>
                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aTa-Qo-xeT">
-                    <rect key="frame" x="74" y="21" width="158" height="23"/>
+                    <rect key="frame" x="74" y="65" width="158" height="23"/>
                     <accessibility key="accessibilityConfiguration" identifier="summary-logo">
                         <bool key="isElement" value="YES"/>
                     </accessibility>
@@ -70,21 +72,21 @@
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U3G-aI-eWF" customClass="PinView" customModule="KarhooUISDK">
-                    <rect key="frame" x="10" y="127.5" width="8" height="26"/>
+                    <rect key="frame" x="10" y="171.5" width="8" height="26"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="8" id="MuM-9U-bOR"/>
                     </constraints>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8WF-1y-INF" customClass="TripSummaryHeaderView" customModule="KarhooUISDK">
-                    <rect key="frame" x="10" y="89" width="286" height="15"/>
+                    <rect key="frame" x="10" y="133" width="286" height="15"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="mrm-eE-tJp"/>
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="some origin some origin some origin some origin some origin" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Shl-R4-rWZ">
-                    <rect key="frame" x="34" y="119" width="267" height="17"/>
+                    <rect key="frame" x="34" y="163" width="267" height="17"/>
                     <accessibility key="accessibilityConfiguration" identifier="origin-summary"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="17" id="YuQ-ds-fr6"/>
@@ -94,7 +96,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="some destination" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uCa-O2-IWD">
-                    <rect key="frame" x="34" y="145" width="267" height="17"/>
+                    <rect key="frame" x="34" y="189" width="267" height="17"/>
                     <accessibility key="accessibilityConfiguration" identifier="destination-summary"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="17" id="gIF-1x-2xV"/>
@@ -103,28 +105,28 @@
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QAa-ff-vbI">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" ambiguous="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QAa-ff-vbI">
                     <rect key="frame" x="87" y="170" width="185" height="18"/>
                     <accessibility key="accessibilityConfiguration" identifier="supplier-summary"/>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Fleet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z82-Kc-mYx">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Fleet" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z82-Kc-mYx">
                     <rect key="frame" x="34" y="170" width="34" height="18"/>
                     <accessibility key="accessibilityConfiguration" identifier="fleet-summary"/>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FPe-IP-Tuf">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" ambiguous="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FPe-IP-Tuf">
                     <rect key="frame" x="92" y="196" width="180" height="18"/>
                     <accessibility key="accessibilityConfiguration" identifier="vehicle-description-summary"/>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Vehicle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Or6-rC-l4t">
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Vehicle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Or6-rC-l4t">
                     <rect key="frame" x="34" y="196" width="50" height="18"/>
                     <accessibility key="accessibilityConfiguration" identifier="vehicle-summary"/>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
@@ -132,7 +134,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kvg-6q-Hrk" customClass="TripSummaryHeaderView" customModule="KarhooUISDK">
-                    <rect key="frame" x="10" y="233" width="286" height="15"/>
+                    <rect key="frame" x="10" y="249" width="286" height="15"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="15" id="1EO-zX-3Mh"/>
@@ -153,7 +155,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Fri 2 May 2018" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dbk-cX-F58" userLabel="Date Label">
-                    <rect key="frame" x="102.5" y="51" width="101" height="23"/>
+                    <rect key="frame" x="102.5" y="95" width="101" height="23"/>
                     <accessibility key="accessibilityConfiguration" identifier="date-summary"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="23" id="AfX-aa-hmF"/>
diff --git a/KarhooUISDK/Screens/TripSummaryScreen/TripSummaryViewController.xib b/KarhooUISDK/Screens/TripSummaryScreen/TripSummaryViewController.xib
index 864fd5e7e..0ad2a4521 100644
--- a/KarhooUISDK/Screens/TripSummaryScreen/TripSummaryViewController.xib
+++ b/KarhooUISDK/Screens/TripSummaryScreen/TripSummaryViewController.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TripSummaryViewController" customModule="KarhooUISDK" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TripSummaryViewController" customModule="KarhooUISDK">
             <connections>
                 <outlet property="tripSummaryInfoView" destination="yVa-u7-ri9" id="9YA-sX-DQn"/>
                 <outlet property="view" destination="YMP-g0-f7r" id="WIB-C7-bQg"/>
diff --git a/KarhooUISDK/UIComponents/AddressBarMVP/PrebookFieldMVP/KarhooPrebookFieldView.xib b/KarhooUISDK/UIComponents/AddressBarMVP/PrebookFieldMVP/KarhooPrebookFieldView.xib
index 60ab5a69c..9ef4c41cb 100644
--- a/KarhooUISDK/UIComponents/AddressBarMVP/PrebookFieldMVP/KarhooPrebookFieldView.xib
+++ b/KarhooUISDK/UIComponents/AddressBarMVP/PrebookFieldMVP/KarhooPrebookFieldView.xib
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KarhooPrebookFieldView" customModule="KarhooUISDK" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="KarhooPrebookFieldView" customModule="KarhooUISDK">
             <connections>
                 <outlet property="defaultView" destination="oJI-hC-aRV" id="tn5-o6-mcC"/>
                 <outlet property="timeDateView" destination="kFv-SR-CGp" id="ceh-uP-m9p"/>
@@ -18,7 +18,7 @@
             <rect key="frame" x="0.0" y="0.0" width="146" height="43"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fU8-jV-Ehu" customClass="Attributes" customModule="KarhooUISDK" customModuleProvider="target">
+                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fU8-jV-Ehu" customClass="Attributes" customModule="KarhooUISDK">
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <connections>
@@ -26,7 +26,7 @@
                         <outletCollection property="secondaryImageTint" destination="mkj-g0-rDw" collectionClass="NSMutableArray" id="Rxh-FF-Mck"/>
                     </connections>
                 </view>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MGi-54-i7e" customClass="NibStrings" customModule="KarhooUISDK" customModuleProvider="target">
+                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MGi-54-i7e" customClass="NibStrings" customModule="KarhooUISDK">
                     <rect key="frame" x="-69" y="-43" width="240" height="128"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -63,7 +63,7 @@
                                                     </subviews>
                                                     <edgeInsets key="layoutMargins" top="6" left="4" bottom="6" right="4"/>
                                                 </stackView>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6KM-wa-HE3">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6KM-wa-HE3">
                                                     <rect key="frame" x="0.0" y="0.0" width="74" height="43"/>
                                                     <accessibility key="accessibilityConfiguration" identifier="prebook-date-time-view-button"/>
                                                     <connections>
@@ -93,7 +93,7 @@
                                                         <constraint firstAttribute="height" constant="12" id="3cT-Dw-LXv"/>
                                                     </constraints>
                                                 </imageView>
-                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Thm-LB-Www">
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Thm-LB-Www">
                                                     <rect key="frame" x="0.0" y="0.0" width="29" height="43"/>
                                                     <accessibility key="accessibilityConfiguration" identifier="prebook-dismiss-button"/>
                                                     <connections>
@@ -137,7 +137,7 @@
                                         <constraint firstAttribute="width" constant="16" id="EG3-sQ-qwp"/>
                                     </constraints>
                                 </imageView>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ALi-BK-Gie">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ALi-BK-Gie">
                                     <rect key="frame" x="0.0" y="0.0" width="43" height="43"/>
                                     <connections>
                                         <action selector="prebookPressed:" destination="-1" eventType="touchUpInside" id="we2-hX-nAC"/>