diff --git a/TimeUse+/Screens/Base.lproj/Home.storyboard b/TimeUse+/Screens/Base.lproj/Home.storyboard
index eb13a50f2c35064d38cde841bb71f67bac893cfc..387f8e08a694366d6a4ee5f8b626834c2e17cd21 100644
--- a/TimeUse+/Screens/Base.lproj/Home.storyboard
+++ b/TimeUse+/Screens/Base.lproj/Home.storyboard
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="0De-JM-WLC">
-    <device id="retina5_9" orientation="portrait" appearance="light"/>
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
@@ -29,17 +29,17 @@
             <objects>
                 <viewController storyboardIdentifier="CalendarViewController" id="2N2-0S-aay" customClass="CalendarViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="pRQ-Ww-8AK">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UtG-dC-PIf" userLabel="navBar">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NCn-La-edk">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Events Calendar" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BId-kJ-tGt">
-                                                <rect key="frame" x="125" y="17.666666666666664" width="125" height="20"/>
+                                                <rect key="frame" x="98" y="16.5" width="124" height="22.5"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" name="dark"/>
                                                 <nil key="highlightedColor"/>
@@ -57,7 +57,7 @@
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vVu-Zs-P5G">
-                                                <rect key="frame" x="325" y="0.0" width="40" height="55"/>
+                                                <rect key="frame" x="270" y="0.0" width="40" height="55"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="40" id="pmL-Xg-RfH"/>
                                                 </constraints>
@@ -94,56 +94,56 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M4I-gg-fqO">
-                                <rect key="frame" x="0.0" y="99" width="375" height="33"/>
+                                <rect key="frame" x="0.0" y="55" width="320" height="33"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="16m-lR-eWE">
-                                        <rect key="frame" x="0.0" y="32" width="375" height="1"/>
+                                        <rect key="frame" x="0.0" y="32" width="320" height="1"/>
                                         <color key="backgroundColor" name="lightGrey"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="s8h-HY-lCi"/>
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="Shw-IV-hcE">
-                                        <rect key="frame" x="25" y="0.0" width="325" height="33"/>
+                                        <rect key="frame" x="25" y="0.0" width="270" height="33"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Mon" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c7V-X1-sD7">
-                                                <rect key="frame" x="0.0" y="0.0" width="33.666666666666664" height="33"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="25.5" height="33"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Tue" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w5h-Ua-EhF">
-                                                <rect key="frame" x="48.666666666666671" y="0.0" width="33.333333333333329" height="33"/>
+                                                <rect key="frame" x="40.5" y="0.0" width="26" height="33"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Wed" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b9E-r8-ahF">
-                                                <rect key="frame" x="97" y="0.0" width="33.666666666666657" height="33"/>
+                                                <rect key="frame" x="81.5" y="0.0" width="25.5" height="33"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="253" verticalHuggingPriority="251" text="Thu" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dtx-X6-VTh">
-                                                <rect key="frame" x="145.66666666666666" y="0.0" width="33.666666666666657" height="33"/>
+                                                <rect key="frame" x="122" y="0.0" width="26" height="33"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Fri" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7aB-NQ-lTb">
-                                                <rect key="frame" x="194.33333333333334" y="0.0" width="33.666666666666657" height="33"/>
+                                                <rect key="frame" x="163" y="0.0" width="25.5" height="33"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="253" verticalHuggingPriority="251" text="Sat" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2U0-eO-aro">
-                                                <rect key="frame" x="243.00000000000003" y="0.0" width="33.333333333333343" height="33"/>
+                                                <rect key="frame" x="203.5" y="0.0" width="26" height="33"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sun" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y5L-YL-97l">
-                                                <rect key="frame" x="291.33333333333331" y="0.0" width="33.666666666666686" height="33"/>
+                                                <rect key="frame" x="244.5" y="0.0" width="25.5" height="33"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
@@ -172,7 +172,7 @@
                                 </constraints>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="N9t-UF-DQ9" customClass="JTACMonthView" customModule="JTAppleCalendar">
-                                <rect key="frame" x="0.0" y="132" width="375" height="680"/>
+                                <rect key="frame" x="0.0" y="88" width="320" height="480"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="0.0" minimumInteritemSpacing="0.0" id="hmh-K1-ccs">
                                     <size key="itemSize" width="50" height="44"/>
@@ -189,7 +189,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kn1-GA-PmZ">
-                                                    <rect key="frame" x="4.6666666666666679" y="1.6666666666666679" width="41" height="41"/>
+                                                    <rect key="frame" x="4.5" y="1.5" width="41" height="41"/>
                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="41" id="6uj-0V-CCd"/>
@@ -197,7 +197,7 @@
                                                     </constraints>
                                                 </view>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a2j-bU-hBr">
-                                                    <rect key="frame" x="16.666666666666668" y="13.333333333333334" width="17.000000000000004" height="17.666666666666664"/>
+                                                    <rect key="frame" x="17.5" y="12" width="15" height="20"/>
                                                     <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                     <color key="textColor" name="dark"/>
                                                     <nil key="highlightedColor"/>
@@ -229,11 +229,11 @@
                                     </collectionViewCell>
                                 </cells>
                                 <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" reuseIdentifier="DateHeader" id="rLa-Iq-5Ui" customClass="DateHeader" customModule="TimeUse" customModuleProvider="target">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="65"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="65"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="March 2020" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DOY-M5-L74">
-                                            <rect key="frame" x="5" y="16" width="112" height="41"/>
+                                            <rect key="frame" x="5" y="16" width="113.5" height="41"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="41" id="fDO-UP-RmW"/>
                                             </constraints>
@@ -258,22 +258,22 @@
                                 </connections>
                             </collectionView>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="qOn-ZV-95C">
-                                <rect key="frame" x="177.66666666666666" y="152" width="20" height="20"/>
+                                <rect key="frame" x="150" y="108" width="20" height="20"/>
                             </activityIndicatorView>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W2v-ua-PxH" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
-                                <rect key="frame" x="16" y="691" width="343" height="45"/>
+                                <rect key="frame" x="16" y="481" width="288" height="45"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YIa-Hh-fNW">
-                                        <rect key="frame" x="23" y="13.666666666666631" width="297" height="17.666666666666671"/>
+                                        <rect key="frame" x="15" y="12.5" width="258.5" height="20"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You have &lt;count&gt; of unvalidated events." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VNz-lc-5La">
-                                                <rect key="frame" x="24" y="0.0" width="273" height="17.666666666666668"/>
+                                                <rect key="frame" x="24" y="0.0" width="234.5" height="20"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" red="1" green="0.99999000000000005" blue="1" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="alert_small_icon" translatesAutoresizingMaskIntoConstraints="NO" id="952-5L-WqL">
-                                                <rect key="frame" x="0.0" y="1" width="16" height="16"/>
+                                                <rect key="frame" x="0.0" y="2" width="16" height="16"/>
                                                 <color key="backgroundColor" name="red"/>
                                                 <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
@@ -343,11 +343,11 @@
             <objects>
                 <viewController storyboardIdentifier="HomeViewController" id="0De-JM-WLC" customClass="HomeViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="0oy-XA-dUF">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HFO-Bb-LoG">
-                                <rect key="frame" x="0.0" y="44" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="50"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YoL-Eh-YJn">
                                         <rect key="frame" x="5" y="0.0" width="50" height="50"/>
@@ -360,7 +360,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q5d-D0-l0x">
-                                        <rect key="frame" x="320" y="0.0" width="50" height="50"/>
+                                        <rect key="frame" x="265" y="0.0" width="50" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="50" id="9Ll-Xk-Iqm"/>
                                         </constraints>
@@ -370,7 +370,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dH4-gd-d7y" customClass="ExtendedUIButton" customModule="TimeUse" customModuleProvider="target">
-                                        <rect key="frame" x="124" y="0.0" width="127" height="50"/>
+                                        <rect key="frame" x="96" y="0.0" width="128" height="50"/>
                                         <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                         <state key="normal" title="31 March 2020" image="down_arrow_icon">
                                             <color key="titleColor" name="dark"/>
@@ -401,7 +401,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="C55-wj-DpT" customClass="GMSMapView">
-                                <rect key="frame" x="0.0" y="94" width="375" height="380"/>
+                                <rect key="frame" x="0.0" y="50" width="320" height="300"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" priority="950" constant="380" id="o1i-gj-0GY"/>
@@ -434,23 +434,23 @@
             <objects>
                 <viewController storyboardIdentifier="EventDetailsViewController" id="wCw-g2-mLw" customClass="EventDetailsViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="bo4-v1-INg">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Umf-x9-S9y" userLabel="navBar">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="44I-4K-PQH">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Event Details" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="28O-GV-UHg">
-                                                <rect key="frame" x="138" y="5" width="99.333333333333314" height="45"/>
+                                                <rect key="frame" x="110" y="5" width="100" height="45"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hFD-zv-AWt">
-                                                <rect key="frame" x="16" y="0.0" width="47" height="55"/>
+                                                <rect key="frame" x="16" y="0.0" width="40" height="55"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                 <state key="normal" title="Cancel">
                                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -460,7 +460,7 @@
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="656-MF-a8U">
-                                                <rect key="frame" x="331" y="0.0" width="34" height="55"/>
+                                                <rect key="frame" x="280" y="0.0" width="30" height="55"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                 <state key="normal" title="Save">
                                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -470,7 +470,7 @@
                                                 </connections>
                                             </button>
                                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="jPY-X2-K0E">
-                                                <rect key="frame" x="303" y="17.666666666666664" width="20" height="20"/>
+                                                <rect key="frame" x="252" y="17.5" width="20" height="20"/>
                                             </activityIndicatorView>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -502,23 +502,23 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uW0-dg-sX3" customClass="GMSMapView">
-                                <rect key="frame" x="0.0" y="99" width="375" height="160"/>
+                                <rect key="frame" x="0.0" y="55" width="320" height="160"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="160" id="iLO-99-Kwk"/>
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bEo-q9-eYc">
-                                <rect key="frame" x="0.0" y="259" width="375" height="114.66666666666669"/>
+                                <rect key="frame" x="0.0" y="215" width="320" height="121.5"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I8Y-Zi-5HZ">
-                                        <rect key="frame" x="0.0" y="0.0" width="64" height="76.666666666666671"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="64" height="81.5"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D8p-6M-nCf" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
-                                                <rect key="frame" x="16" y="14.333333333333314" width="48" height="48"/>
+                                                <rect key="frame" x="16" y="17" width="48" height="48"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="working_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Dw0-Ov-MmB">
-                                                        <rect key="frame" x="12" y="13.666666666666686" width="24" height="21"/>
+                                                        <rect key="frame" x="12" y="13.5" width="24" height="21"/>
                                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     </imageView>
                                                 </subviews>
@@ -551,25 +551,25 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CDR-7F-u4G">
-                                        <rect key="frame" x="63.999999999999993" y="0.0" width="115.33333333333331" height="76.666666666666671"/>
+                                        <rect key="frame" x="64" y="0.0" width="106" height="81.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Other other" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NId-cS-GHS">
-                                                <rect key="frame" x="15.999999999999993" y="18" width="99.333333333333314" height="20"/>
+                                                <rect key="frame" x="16" y="18" width="90" height="22.5"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" name="dark"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="00:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eLh-eU-CdK">
-                                                <rect key="frame" x="15.999999999999996" y="41" width="37.666666666666657" height="17.666666666666671"/>
+                                                <rect key="frame" x="16" y="43.5" width="33" height="20"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="time_arrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="3J2-3U-Cet">
-                                                <rect key="frame" x="59.666666666666671" y="47.333333333333314" width="12" height="5"/>
+                                                <rect key="frame" x="55" y="51" width="12" height="5"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalCompressionResistancePriority="749" text="07:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zIM-Qh-XdF">
-                                                <rect key="frame" x="77.666666666666657" y="41" width="37.666666666666657" height="17.666666666666671"/>
+                                                <rect key="frame" x="73" y="43.5" width="33" height="20"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                 <color key="textColor" name="darkGrey"/>
                                                 <nil key="highlightedColor"/>
@@ -591,7 +591,7 @@
                                         </constraints>
                                     </view>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gai-sR-iCX" customClass="ExtendedUIButton" customModule="TimeUse" customModuleProvider="target">
-                                        <rect key="frame" x="329" y="20.333333333333314" width="30" height="36"/>
+                                        <rect key="frame" x="274" y="23" width="30" height="36"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="36" id="Xh2-hM-Lhe"/>
@@ -616,7 +616,7 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5KO-zy-6jN" customClass="ExtendedUIButton" customModule="TimeUse" customModuleProvider="target">
-                                        <rect key="frame" x="16" y="76.666666666666686" width="343" height="30"/>
+                                        <rect key="frame" x="16" y="81.5" width="288" height="32"/>
                                         <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                         <state key="normal" title="Event did not happen/belongs to previous event">
                                             <color key="titleColor" name="darkGrey"/>
@@ -654,7 +654,7 @@
                                 </constraints>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="2HA-nf-Z5X">
-                                <rect key="frame" x="0.0" y="373.66666666666674" width="375" height="438.33333333333326"/>
+                                <rect key="frame" x="0.0" y="336.5" width="320" height="231.5"/>
                                 <color key="backgroundColor" name="ultraLightGrey"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="QhI-NF-Our">
                                     <size key="itemSize" width="128" height="128"/>
@@ -665,20 +665,20 @@
                                 <cells/>
                             </collectionView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No information about activity needed." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dfT-p3-BNk">
-                                <rect key="frame" x="30" y="573.66666666666663" width="315" height="51.333333333333371"/>
+                                <rect key="frame" x="30" y="486.5" width="260" height="58.5"/>
                                 <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="22"/>
                                 <color key="textColor" name="darkGrey"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="88Y-Cm-sqH">
-                                <rect key="frame" x="177.66666666666666" y="410.66666666666669" width="20" height="20"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="88Y-Cm-sqH">
+                                <rect key="frame" x="150" y="366.5" width="20" height="20"/>
                             </activityIndicatorView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="xoY-dU-Vhb"/>
                         <color key="backgroundColor" name="lightGrey"/>
                         <constraints>
                             <constraint firstItem="xoY-dU-Vhb" firstAttribute="trailing" secondItem="dfT-p3-BNk" secondAttribute="trailing" constant="30" id="3Mf-Wm-1j9"/>
+                            <constraint firstItem="88Y-Cm-sqH" firstAttribute="centerX" secondItem="2HA-nf-Z5X" secondAttribute="centerX" id="5RF-Fp-l8Z"/>
                             <constraint firstItem="uW0-dg-sX3" firstAttribute="leading" secondItem="xoY-dU-Vhb" secondAttribute="leading" id="66k-On-5hx"/>
                             <constraint firstItem="xoY-dU-Vhb" firstAttribute="top" secondItem="44I-4K-PQH" secondAttribute="top" id="6g2-6n-C13"/>
                             <constraint firstItem="bEo-q9-eYc" firstAttribute="top" secondItem="uW0-dg-sX3" secondAttribute="bottom" id="8zv-6B-aH5"/>
@@ -687,13 +687,14 @@
                             <constraint firstAttribute="bottom" secondItem="2HA-nf-Z5X" secondAttribute="bottom" id="EyV-oa-u0j"/>
                             <constraint firstItem="2HA-nf-Z5X" firstAttribute="leading" secondItem="xoY-dU-Vhb" secondAttribute="leading" id="FCL-zj-xdJ"/>
                             <constraint firstItem="xoY-dU-Vhb" firstAttribute="trailing" secondItem="uW0-dg-sX3" secondAttribute="trailing" id="H4z-se-hwp"/>
+                            <constraint firstItem="88Y-Cm-sqH" firstAttribute="top" secondItem="bEo-q9-eYc" secondAttribute="bottom" constant="30" id="IQt-Wx-qmk"/>
                             <constraint firstItem="xoY-dU-Vhb" firstAttribute="trailing" secondItem="2HA-nf-Z5X" secondAttribute="trailing" id="J6c-tA-LsA"/>
                             <constraint firstItem="dfT-p3-BNk" firstAttribute="leading" secondItem="xoY-dU-Vhb" secondAttribute="leading" constant="30" id="RXc-Ur-wII"/>
                             <constraint firstItem="2HA-nf-Z5X" firstAttribute="top" secondItem="bEo-q9-eYc" secondAttribute="bottom" id="UOH-bn-Vgk"/>
                             <constraint firstItem="Umf-x9-S9y" firstAttribute="top" secondItem="bo4-v1-INg" secondAttribute="top" id="WO0-t9-srJ"/>
                             <constraint firstItem="Umf-x9-S9y" firstAttribute="trailing" secondItem="xoY-dU-Vhb" secondAttribute="trailing" id="d1D-2Q-6Ld"/>
                             <constraint firstItem="bEo-q9-eYc" firstAttribute="leading" secondItem="xoY-dU-Vhb" secondAttribute="leading" id="xal-0O-sBl"/>
-                            <constraint firstItem="dfT-p3-BNk" firstAttribute="top" secondItem="bEo-q9-eYc" secondAttribute="bottom" constant="200" id="xm3-RY-VMF"/>
+                            <constraint firstItem="dfT-p3-BNk" firstAttribute="top" secondItem="bEo-q9-eYc" secondAttribute="bottom" constant="150" id="xm3-RY-VMF"/>
                             <constraint firstItem="bEo-q9-eYc" firstAttribute="trailing" secondItem="xoY-dU-Vhb" secondAttribute="trailing" id="zti-xW-594"/>
                         </constraints>
                     </view>
@@ -723,20 +724,20 @@
             <objects>
                 <viewController storyboardIdentifier="EventTypeViewController" id="q7F-d8-g4L" customClass="EventTypeViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ssf-zO-CtJ">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tx8-Fo-Sdz" userLabel="navBar">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sIz-Ze-wRS">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O1g-Mk-DmH" customClass="UIControl">
-                                                <rect key="frame" x="15.000000000000004" y="7.6666666666666643" width="46.333333333333343" height="40"/>
+                                                <rect key="frame" x="15" y="7.5" width="41" height="40"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bN5-gO-ilW">
-                                                        <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="40"/>
+                                                        <rect key="frame" x="12" y="0.0" width="29" height="40"/>
                                                         <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
@@ -764,7 +765,7 @@
                                                 </connections>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Event Type" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wPF-tv-JPB">
-                                                <rect key="frame" x="146" y="17.666666666666664" width="83.333333333333314" height="20"/>
+                                                <rect key="frame" x="118.5" y="16.5" width="83.5" height="22.5"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
@@ -790,7 +791,7 @@
                                 </constraints>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="TlI-Nr-n5N">
-                                <rect key="frame" x="0.0" y="99" width="375" height="713"/>
+                                <rect key="frame" x="0.0" y="55" width="320" height="513"/>
                                 <color key="backgroundColor" name="ultraLightGrey"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="sFz-51-YWV">
                                     <size key="itemSize" width="128" height="128"/>
@@ -828,23 +829,23 @@
             <objects>
                 <viewController storyboardIdentifier="UntrackedEventTypeViewController" id="uQ9-WE-Y3N" customClass="UntrackedEventTypeViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="idJ-O9-Ocg">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ks3-vM-xFA" userLabel="navBar">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GYV-x9-j4w">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="Select Event Type" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vgK-h5-DSQ">
-                                                <rect key="frame" x="119.66666666666667" y="5" width="135.66666666666663" height="45"/>
+                                                <rect key="frame" x="92.5" y="5" width="135.5" height="45"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O0w-Xn-fuc">
-                                                <rect key="frame" x="16" y="0.0" width="47" height="55"/>
+                                                <rect key="frame" x="16" y="0.0" width="40" height="55"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                 <state key="normal" title="Cancel">
                                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -854,7 +855,7 @@
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B1u-zY-Hgm">
-                                                <rect key="frame" x="331" y="0.0" width="34" height="55"/>
+                                                <rect key="frame" x="280" y="0.0" width="30" height="55"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                 <state key="normal" title="Save">
                                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -864,7 +865,7 @@
                                                 </connections>
                                             </button>
                                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="i5K-Rp-Lau">
-                                                <rect key="frame" x="303" y="17.666666666666664" width="20" height="20"/>
+                                                <rect key="frame" x="252" y="17.5" width="20" height="20"/>
                                             </activityIndicatorView>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -872,9 +873,8 @@
                                             <constraint firstItem="B1u-zY-Hgm" firstAttribute="top" secondItem="GYV-x9-j4w" secondAttribute="top" id="3ex-lz-bHz"/>
                                             <constraint firstItem="O0w-Xn-fuc" firstAttribute="leading" secondItem="GYV-x9-j4w" secondAttribute="leading" constant="16" id="50t-g6-00u"/>
                                             <constraint firstAttribute="trailing" secondItem="B1u-zY-Hgm" secondAttribute="trailing" constant="10" id="5Ps-nE-ZoW"/>
-                                            <constraint firstAttribute="height" constant="55" id="AkX-ck-uR4"/>
+                                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="55" id="AkX-ck-uR4"/>
                                             <constraint firstItem="B1u-zY-Hgm" firstAttribute="leading" secondItem="i5K-Rp-Lau" secondAttribute="trailing" constant="8" id="BEj-Cr-KSH"/>
-                                            <constraint firstItem="O0w-Xn-fuc" firstAttribute="centerY" secondItem="vgK-h5-DSQ" secondAttribute="centerY" id="K0b-l0-yk2"/>
                                             <constraint firstItem="i5K-Rp-Lau" firstAttribute="centerY" secondItem="B1u-zY-Hgm" secondAttribute="centerY" id="Rcf-Wo-N6l"/>
                                             <constraint firstItem="O0w-Xn-fuc" firstAttribute="top" secondItem="GYV-x9-j4w" secondAttribute="top" id="Wl3-2h-1Pn"/>
                                             <constraint firstAttribute="bottom" secondItem="O0w-Xn-fuc" secondAttribute="bottom" id="ecE-ey-afn"/>
@@ -883,7 +883,6 @@
                                             <constraint firstItem="vgK-h5-DSQ" firstAttribute="centerX" secondItem="GYV-x9-j4w" secondAttribute="centerX" id="rAz-kD-FE5"/>
                                             <constraint firstAttribute="bottom" secondItem="vgK-h5-DSQ" secondAttribute="bottom" constant="5" id="rI6-xT-Ow1"/>
                                             <constraint firstAttribute="bottom" secondItem="B1u-zY-Hgm" secondAttribute="bottom" id="tqT-QG-FA3"/>
-                                            <constraint firstItem="B1u-zY-Hgm" firstAttribute="centerY" secondItem="vgK-h5-DSQ" secondAttribute="centerY" id="wka-70-SNm"/>
                                             <constraint firstItem="vgK-h5-DSQ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="O0w-Xn-fuc" secondAttribute="trailing" constant="10" id="ylR-HV-oSk"/>
                                         </constraints>
                                     </view>
@@ -896,7 +895,7 @@
                                 </constraints>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="sp1-6v-a5K">
-                                <rect key="frame" x="0.0" y="99" width="375" height="713"/>
+                                <rect key="frame" x="0.0" y="55" width="320" height="513"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="HcF-SD-xO5">
                                     <size key="itemSize" width="128" height="128"/>
@@ -935,23 +934,23 @@
             <objects>
                 <viewController storyboardIdentifier="AddActivitiesViewController" id="ebD-6J-AJp" customClass="AddActivitiesViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Xap-Ut-zLa">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hGB-Jf-vzZ" userLabel="navBar">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Wf-mC-rFU">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="50K-ct-xtk">
-                                                <rect key="frame" x="173.66666666666666" y="5" width="27.666666666666657" height="45"/>
+                                                <rect key="frame" x="145" y="5" width="30" height="45"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" name="dark"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NTj-x1-cEY">
-                                                <rect key="frame" x="16" y="0.0" width="47" height="55"/>
+                                                <rect key="frame" x="16" y="0.0" width="40" height="55"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                 <state key="normal" title="Cancel">
                                                     <color key="titleColor" name="darkGrey"/>
@@ -961,7 +960,7 @@
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="119-Y3-95o">
-                                                <rect key="frame" x="331" y="0.0" width="34" height="55"/>
+                                                <rect key="frame" x="280" y="0.0" width="30" height="55"/>
                                                 <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                 <state key="normal" title="Save">
                                                     <color key="titleColor" name="blue"/>
@@ -990,7 +989,7 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rBr-4J-SYB">
-                                        <rect key="frame" x="0.0" y="98" width="375" height="1"/>
+                                        <rect key="frame" x="0.0" y="54" width="320" height="1"/>
                                         <color key="backgroundColor" name="lightGrey"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="gtq-n5-wDE"/>
@@ -1008,7 +1007,7 @@
                                 </constraints>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="Sjs-AF-h1P">
-                                <rect key="frame" x="0.0" y="99" width="375" height="713"/>
+                                <rect key="frame" x="0.0" y="55" width="320" height="513"/>
                                 <color key="backgroundColor" name="ultraLightGrey"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="Dcw-9Y-oaQ">
                                     <size key="itemSize" width="128" height="128"/>
@@ -1047,24 +1046,24 @@
             <objects>
                 <viewController storyboardIdentifier="SettingsViewController" id="TBn-f6-umc" customClass="SettingsViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="TIt-8Y-Jju">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nkj-Mz-3zB" userLabel="navBar">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lat-i4-ymn">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dAQ-YQ-1lM" customClass="UIControl">
-                                                <rect key="frame" x="15.000000000000004" y="7.6666666666666643" width="46.333333333333343" height="40"/>
+                                                <rect key="frame" x="15" y="7.5" width="41" height="40"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_icon" translatesAutoresizingMaskIntoConstraints="NO" id="T1l-5i-cN2">
                                                         <rect key="frame" x="0.0" y="0.0" width="7" height="40"/>
                                                         <color key="tintColor" name="blue"/>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1kO-GE-cTx">
-                                                        <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="40"/>
+                                                        <rect key="frame" x="12" y="0.0" width="29" height="40"/>
                                                         <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                         <color key="textColor" name="blue"/>
                                                         <nil key="highlightedColor"/>
@@ -1086,7 +1085,7 @@
                                                 </connections>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Settings" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xc9-ig-Ukw">
-                                                <rect key="frame" x="156.33333333333334" y="17.666666666666664" width="62.666666666666657" height="20"/>
+                                                <rect key="frame" x="128" y="16.5" width="64.5" height="22.5"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" name="dark"/>
                                                 <nil key="highlightedColor"/>
@@ -1102,7 +1101,7 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7VZ-hD-Kp2">
-                                        <rect key="frame" x="0.0" y="98" width="375" height="1"/>
+                                        <rect key="frame" x="0.0" y="54" width="320" height="1"/>
                                         <color key="backgroundColor" name="lightGrey"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="Fu3-6V-tQb"/>
@@ -1120,7 +1119,7 @@
                                 </constraints>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="3VG-WW-sV1">
-                                <rect key="frame" x="0.0" y="99" width="375" height="713"/>
+                                <rect key="frame" x="0.0" y="55" width="320" height="513"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="OLN-Dy-ubN">
                                     <size key="itemSize" width="128" height="128"/>
@@ -1131,7 +1130,7 @@
                                 <cells/>
                             </collectionView>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="ywj-4a-cyg">
-                                <rect key="frame" x="177.66666666666666" y="119" width="20" height="20"/>
+                                <rect key="frame" x="150" y="75" width="20" height="20"/>
                             </activityIndicatorView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="se8-je-EIy"/>
@@ -1163,24 +1162,24 @@
             <objects>
                 <viewController storyboardIdentifier="FAQViewController" id="Rre-Uz-kUn" customClass="FAQViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="NPP-3U-0NY">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i5Q-Bo-LsH">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="99"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TiX-mk-oho">
-                                        <rect key="frame" x="0.0" y="44" width="375" height="55"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="55"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pLR-WV-h2m" customClass="UIControl">
-                                                <rect key="frame" x="15.000000000000004" y="7.6666666666666643" width="46.333333333333343" height="40"/>
+                                                <rect key="frame" x="15" y="7.5" width="41" height="40"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_icon" translatesAutoresizingMaskIntoConstraints="NO" id="8nj-JY-JS3">
                                                         <rect key="frame" x="0.0" y="0.0" width="7" height="40"/>
                                                         <color key="tintColor" name="blue"/>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xkX-9D-U2G">
-                                                        <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="40"/>
+                                                        <rect key="frame" x="12" y="0.0" width="29" height="40"/>
                                                         <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                         <color key="textColor" name="blue"/>
                                                         <nil key="highlightedColor"/>
@@ -1202,7 +1201,7 @@
                                                 </connections>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FAQ" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Opp-6p-ZQz">
-                                                <rect key="frame" x="171" y="17.666666666666664" width="33" height="20"/>
+                                                <rect key="frame" x="144" y="16.5" width="32" height="22.5"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" name="dark"/>
                                                 <nil key="highlightedColor"/>
@@ -1218,7 +1217,7 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="njV-H2-Zeb">
-                                        <rect key="frame" x="0.0" y="98" width="375" height="1"/>
+                                        <rect key="frame" x="0.0" y="54" width="320" height="1"/>
                                         <color key="backgroundColor" name="lightGrey"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="2sZ-mk-Ub8"/>
@@ -1236,7 +1235,7 @@
                                 </constraints>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="CAx-5n-PCn">
-                                <rect key="frame" x="0.0" y="99" width="375" height="713"/>
+                                <rect key="frame" x="0.0" y="55" width="320" height="513"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="3Eo-9p-O6F">
                                     <size key="itemSize" width="128" height="128"/>
@@ -1247,7 +1246,7 @@
                                 <cells/>
                             </collectionView>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="lna-nX-hQC">
-                                <rect key="frame" x="177.66666666666666" y="119" width="20" height="20"/>
+                                <rect key="frame" x="150" y="75" width="20" height="20"/>
                             </activityIndicatorView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="cpe-fr-JIg"/>
@@ -1279,24 +1278,24 @@
             <objects>
                 <viewController storyboardIdentifier="FAQDetailsViewController" id="k4Z-3l-7RX" customClass="FAQDetailsViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="H5X-yK-nnK">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1jF-hf-gVn">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="113.66666666666667"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ifn-pu-3cR">
-                                        <rect key="frame" x="0.0" y="44.000000000000007" width="375" height="69.666666666666686"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="100"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ND3-K7-pou" customClass="UIControl">
-                                                <rect key="frame" x="15.000000000000004" y="0.0" width="46.333333333333343" height="69.666666666666671"/>
+                                                <rect key="frame" x="15" y="0.0" width="41" height="100"/>
                                                 <subviews>
                                                     <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" image="back_icon" translatesAutoresizingMaskIntoConstraints="NO" id="P8q-L5-5KJ">
-                                                        <rect key="frame" x="0.0" y="0.0" width="7" height="69.666666666666671"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="7" height="100"/>
                                                         <color key="tintColor" name="blue"/>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Back" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agh-YH-Voj">
-                                                        <rect key="frame" x="12" y="0.0" width="34.333333333333336" height="69.666666666666671"/>
+                                                        <rect key="frame" x="12" y="0.0" width="29" height="100"/>
                                                         <fontDescription key="fontDescription" name="RobotoCondensed-Bold" family="Roboto Condensed" pointSize="15"/>
                                                         <color key="textColor" name="blue"/>
                                                         <nil key="highlightedColor"/>
@@ -1317,7 +1316,7 @@
                                                 </connections>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Where do I see my deleted events that are deleted from the list?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y6s-Bd-eTb">
-                                                <rect key="frame" x="83.666666666666686" y="4.9999999999999964" width="208" height="59.666666666666657"/>
+                                                <rect key="frame" x="81" y="5" width="158.5" height="90"/>
                                                 <fontDescription key="fontDescription" name="Roboto-Medium" family="Roboto" pointSize="17"/>
                                                 <color key="textColor" name="dark"/>
                                                 <nil key="highlightedColor"/>
@@ -1338,7 +1337,7 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ant-BF-sXo">
-                                        <rect key="frame" x="0.0" y="112.66666666666667" width="375" height="1"/>
+                                        <rect key="frame" x="0.0" y="99" width="320" height="1"/>
                                         <color key="backgroundColor" name="lightGrey"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="mkl-2S-3Ia"/>
@@ -1356,7 +1355,7 @@
                                 </constraints>
                             </view>
                             <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MBJ-R4-WDB">
-                                <rect key="frame" x="0.0" y="113.66666666666669" width="375" height="698.33333333333326"/>
+                                <rect key="frame" x="0.0" y="100" width="320" height="468"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <wkWebViewConfiguration key="configuration">
                                     <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/>
@@ -1391,20 +1390,20 @@
             <objects>
                 <viewController storyboardIdentifier="ChangePasswordViewController" id="b1l-qd-QLz" customClass="ChangePasswordViewController" customModule="TimeUse" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="hKl-Pv-Se3">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gCO-wJ-enL" userLabel="headerView">
-                                <rect key="frame" x="0.0" y="44" width="375" height="48"/>
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Change Password" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lh3-78-m1v">
-                                        <rect key="frame" x="102.66666666666667" y="20" width="169.66666666666663" height="28"/>
+                                        <rect key="frame" x="75" y="20" width="170" height="28"/>
                                         <fontDescription key="fontDescription" name="Roboto-Bold" family="Roboto" pointSize="21"/>
                                         <color key="textColor" red="0.094119999999999995" green="0.094119999999999995" blue="0.094119999999999995" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VDK-mv-Vna">
-                                        <rect key="frame" x="335" y="16.666666666666664" width="35" height="35"/>
+                                        <rect key="frame" x="280" y="16.5" width="35" height="35"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="35" id="bNj-iF-T9Z"/>
                                             <constraint firstAttribute="height" constant="35" id="sgk-9o-iE8"/>
@@ -1427,16 +1426,16 @@
                                 </constraints>
                             </view>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7ec-BI-L60">
-                                <rect key="frame" x="0.0" y="124" width="375" height="567"/>
+                                <rect key="frame" x="0.0" y="80" width="320" height="401"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T0X-Un-hqz" userLabel="formView">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="112"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="320" height="112"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mc1-gg-EgZ" userLabel="currentPasswordView" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
-                                                <rect key="frame" x="40" y="0.0" width="295" height="52"/>
+                                                <rect key="frame" x="40" y="0.0" width="240" height="52"/>
                                                 <subviews>
                                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7bw-tK-moj" customClass="SkyFloatingLabelTextField" customModule="SkyFloatingLabelTextField">
-                                                        <rect key="frame" x="16" y="6" width="263" height="46"/>
+                                                        <rect key="frame" x="16" y="6" width="208" height="46"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="46" id="btS-aa-AZk"/>
                                                         </constraints>
@@ -1471,13 +1470,13 @@
                                                         </connections>
                                                     </textField>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Old Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yso-KF-uMO">
-                                                        <rect key="frame" x="16" y="16" width="79.666666666666671" height="20"/>
+                                                        <rect key="frame" x="16" y="16" width="79.5" height="20"/>
                                                         <fontDescription key="fontDescription" name="RobotoCondensed-Regular" family="Roboto Condensed" pointSize="15"/>
                                                         <color key="textColor" name="darkGrey"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ihi-z4-7gT">
-                                                        <rect key="frame" x="255" y="11" width="30" height="30"/>
+                                                        <rect key="frame" x="200" y="11" width="30" height="30"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="AXU-a3-NMV"/>
                                                             <constraint firstAttribute="width" constant="30" id="Rl4-zZ-hsC"/>
@@ -1514,10 +1513,10 @@
                                                 </userDefinedRuntimeAttributes>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5MS-Oa-6sD" userLabel="newPasswordView" customClass="ExtendedUIView" customModule="TimeUse" customModuleProvider="target">
-                                                <rect key="frame" x="40" y="60" width="295" height="52"/>
+                                                <rect key="frame" x="40" y="60" width="240" height="52"/>
                                                 <subviews>
                                                     <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="22g-61-Gzz" customClass="SkyFloatingLabelTextField" customModule="SkyFloatingLabelTextField">
-                                                        <rect key="frame" x="16" y="6" width="263" height="46"/>
+                                                        <rect key="frame" x="16" y="6" width="208" height="46"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="46" id="I5f-aq-QO4"/>
                                                         </constraints>
@@ -1558,7 +1557,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yhz-NY-3QL">
-                                                        <rect key="frame" x="255" y="11" width="30" height="30"/>
+                                                        <rect key="frame" x="200" y="11" width="30" height="30"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="30" id="0qY-UT-CeW"/>
                                                             <constraint firstAttribute="height" constant="30" id="f75-bH-9B7"/>
@@ -1618,10 +1617,10 @@
                                 <viewLayoutGuide key="frameLayoutGuide" id="3vE-rt-O8g"/>
                             </scrollView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hWC-Tx-2gn" userLabel="signInView">
-                                <rect key="frame" x="0.0" y="691" width="375" height="55"/>
+                                <rect key="frame" x="0.0" y="481" width="320" height="55"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jip-xh-dfv" customClass="ExtendedUIButton" customModule="TimeUse" customModuleProvider="target">
-                                        <rect key="frame" x="32" y="0.0" width="311" height="55"/>
+                                        <rect key="frame" x="32" y="0.0" width="256" height="55"/>
                                         <color key="backgroundColor" name="blue"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="55" id="eaL-v6-kct"/>
@@ -1640,7 +1639,7 @@
                                         </connections>
                                     </button>
                                     <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="Sc4-es-iLU">
-                                        <rect key="frame" x="308" y="17.666666666666629" width="20" height="20"/>
+                                        <rect key="frame" x="253" y="17.5" width="20" height="20"/>
                                         <color key="color" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </activityIndicatorView>
                                 </subviews>
@@ -1655,7 +1654,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e5t-Jv-bCI" customClass="KeyboardAvoidingView" customModule="TimeUse" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="778" width="375" height="0.0"/>
+                                <rect key="frame" x="0.0" y="568" width="320" height="0.0"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="height" id="0pL-ZQ-cxA"/>
@@ -1707,10 +1706,10 @@
     </scenes>
     <designables>
         <designable name="22g-61-Gzz">
-            <size key="intrinsicContentSize" width="4" height="20"/>
+            <size key="intrinsicContentSize" width="208" height="42.29638671875"/>
         </designable>
         <designable name="7bw-tK-moj">
-            <size key="intrinsicContentSize" width="4" height="20"/>
+            <size key="intrinsicContentSize" width="208" height="42.29638671875"/>
         </designable>
     </designables>
     <resources>