From 664e42dc2f23a9cf1cd7ceba09bfaefb66218694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Sch=C3=BCtz?= <ivanschuetz@gmail.com>
Date: Mon, 8 Jun 2020 21:45:50 +0200
Subject: [PATCH] Autolayout fixes (#240)

* Fix splash background

* Fix symptom flow headers autolayout
---
 .../Background_purple.imageset/Contents.json  |  45 +++++++++++++++---
 .../HeaderLabel.imageset/Contents.json        |  21 --------
 .../HeaderLabel.imageset/HeaderLabel.pdf      | Bin 878 -> 0 bytes
 .../CoEpiLaunchScreen.storyboard              |  18 +++----
 .../Breathless/BreathlessViewController.xib   |  20 ++++----
 .../Cough/CoughDaysViewController.xib         |  10 ++--
 .../FollowUp/Cough/CoughHowViewController.xib |  10 ++--
 .../Cough/CoughTypeViewController.xib         |  24 +++++-----
 .../Fever/FeverDaysViewController.xib         |  10 ++--
 .../Fever/FeverTempViewController.xib         |  10 ++--
 .../Fever/FeverTodayViewController.xib        |  18 ++++---
 .../Fever/FeverWhereViewController.xib        |  10 ++--
 .../Fever/FeverWhereViewControllerOther.xib   |  15 +++---
 .../SymptomStartDaysViewController.xib        |  10 ++--
 14 files changed, 121 insertions(+), 100 deletions(-)
 delete mode 100644 CoEpi/Assets.xcassets/HeaderLabel.imageset/Contents.json
 delete mode 100644 CoEpi/Assets.xcassets/HeaderLabel.imageset/HeaderLabel.pdf

diff --git a/CoEpi/Assets.xcassets/Background_purple.imageset/Contents.json b/CoEpi/Assets.xcassets/Background_purple.imageset/Contents.json
index 10929a9..f68b6ab 100644
--- a/CoEpi/Assets.xcassets/Background_purple.imageset/Contents.json
+++ b/CoEpi/Assets.xcassets/Background_purple.imageset/Contents.json
@@ -1,23 +1,56 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "Background.png",
+      "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 0,
+          "right" : 0
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 375
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "Background@2x.png",
+      "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 0,
+          "right" : 0
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 750
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "Background@3x.png",
+      "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "left" : 0,
+          "right" : 0
+        },
+        "center" : {
+          "mode" : "tile",
+          "width" : 1125
+        },
+        "mode" : "3-part-horizontal"
+      },
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/CoEpi/Assets.xcassets/HeaderLabel.imageset/Contents.json b/CoEpi/Assets.xcassets/HeaderLabel.imageset/Contents.json
deleted file mode 100644
index 9d8d957..0000000
--- a/CoEpi/Assets.xcassets/HeaderLabel.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "HeaderLabel.pdf",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/CoEpi/Assets.xcassets/HeaderLabel.imageset/HeaderLabel.pdf b/CoEpi/Assets.xcassets/HeaderLabel.imageset/HeaderLabel.pdf
deleted file mode 100644
index bb5d128847a23df896ef3d8b4d371238f6d8ea5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 878
zcmZvbO>e?542JLi6}}+Bfqtc-AR(jyW16;Utn7w%=-L3CpxK%-vHkiv{i3Y+P&rRx
z$9|o5mh(m5Haq|uEtKycfH)rGWC9|I^b(vVHy=f^&34EL`udd0QV|@$oQv-`6#m^5
zXRGEaRPY71VdaKa<@9T>y;pCA2e1t8j9i;)ph$1%(!Iuz+00|8!i2WV#I`l6+ygL=
zSBnPUH+dbnKj*l{F5-8vfdpPaOH=k;iKO)?#B-QeOXt><BsFi6L}m)tZzM69`TFxI
z&|C&vQGzEC#lcjbaD5i4F6w$yRW4sBc}zp0P><0s6V7CkiG=RdGpyh;NQogYQDf2?
z)i1z&h$AW%bq_vP_sryxV(nH3ibx~V;38Ae=q$*Bz1)_ex@~o>h*K&yV4(-aWc3#Z
zoHLGuOS3J^J){><8lyV3oe^`q7IH`b5qDaFd^D_2WoZ!aMGAU;_j8h?tK>oSup39c
iLKM@NGDF>PF0i?Ze+5;a{~AG><?Rf(2c6FC^WqQ3%Exa2

diff --git a/CoEpi/ui/launch screen/CoEpiLaunchScreen.storyboard b/CoEpi/ui/launch screen/CoEpiLaunchScreen.storyboard
index a0c499a..6bbc34e 100644
--- a/CoEpi/ui/launch screen/CoEpiLaunchScreen.storyboard	
+++ b/CoEpi/ui/launch screen/CoEpiLaunchScreen.storyboard	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_5" orientation="portrait" appearance="light"/>
+    <device id="ipad11_0rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
@@ -13,22 +13,21 @@
             <objects>
                 <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                     <view key="view" userInteractionEnabled="NO" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Background_purple" translatesAutoresizingMaskIntoConstraints="NO" id="fWF-iZ-XHk">
-                                <rect key="frame" x="-30" y="0.0" width="523" height="896"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Background_purple" translatesAutoresizingMaskIntoConstraints="NO" id="fWF-iZ-XHk">
+                                <rect key="frame" x="0.0" y="0.0" width="834" height="1194"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="coepi_family" translatesAutoresizingMaskIntoConstraints="NO" id="Irt-Qq-2mX">
-                                <rect key="frame" x="158" y="372" width="98" height="152"/>
+                                <rect key="frame" x="368" y="521" width="98" height="152"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="152" id="QUo-0U-PaC"/>
                                     <constraint firstAttribute="width" constant="98" id="gXM-zx-Cuo"/>
                                 </constraints>
                             </imageView>
                             <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2020 CoEpi. See MIT License." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="Q9x-95-YRB">
-                                <rect key="frame" x="20" y="824" width="374" height="18"/>
+                                <rect key="frame" x="20" y="1136" width="794" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
@@ -36,11 +35,14 @@
                         </subviews>
                         <color key="backgroundColor" name="CoEpiPurple"/>
                         <constraints>
-                            <constraint firstItem="Irt-Qq-2mX" firstAttribute="top" secondItem="Bcu-3y-fUS" secondAttribute="bottom" constant="-490" id="AWN-rx-g4f"/>
+                            <constraint firstItem="fWF-iZ-XHk" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="23q-ll-Os1"/>
+                            <constraint firstAttribute="trailing" secondItem="fWF-iZ-XHk" secondAttribute="trailing" id="79c-Va-N7g"/>
+                            <constraint firstAttribute="bottom" secondItem="fWF-iZ-XHk" secondAttribute="bottom" id="KDq-hv-dVM"/>
                             <constraint firstItem="Bcu-3y-fUS" firstAttribute="bottom" secondItem="Q9x-95-YRB" secondAttribute="bottom" constant="20" id="QV1-Iq-HEY"/>
                             <constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="Q9x-95-YRB" secondAttribute="trailing" constant="20" id="YFx-0W-Tab"/>
                             <constraint firstItem="Irt-Qq-2mX" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="ZcN-eT-edw"/>
                             <constraint firstItem="Q9x-95-YRB" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" id="bpo-2q-1wf"/>
+                            <constraint firstItem="fWF-iZ-XHk" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="dW4-wm-ayt"/>
                             <constraint firstItem="Irt-Qq-2mX" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="pJJ-y1-n7c"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
diff --git a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib
index 400edec..62d3c15 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Breathless/BreathlessViewController.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,10 +22,11 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="vst-Vo-bEA">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="vst-Vo-bEA">
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
+                    <color key="backgroundColor" name="CoEpiPurple"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="vst-Vo-bEA" secondAttribute="height" multiplier="15:8" id="keY-4P-7m9"/>
+                        <constraint firstAttribute="height" constant="130" id="wwU-cI-g5U"/>
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uCG-ck-F1L">
@@ -40,7 +42,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="G7E-9C-4qw">
-                    <rect key="frame" x="20" y="235" width="374" height="557"/>
+                    <rect key="frame" x="20" y="194" width="374" height="598"/>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                 </tableView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pqb-G8-7Wf">
@@ -62,7 +64,7 @@
                 <constraint firstItem="G7E-9C-4qw" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="20" id="KEP-Az-Gwb"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="vst-Vo-bEA" secondAttribute="trailing" id="RPs-4w-u87"/>
                 <constraint firstItem="uCG-ck-F1L" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="20" id="e0z-fY-njF"/>
-                <constraint firstItem="vst-Vo-bEA" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="-50" id="e2m-Xi-1oh"/>
+                <constraint firstItem="vst-Vo-bEA" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="e2m-Xi-1oh"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="G7E-9C-4qw" secondAttribute="trailing" constant="20" id="fAS-Eq-BvI"/>
                 <constraint firstItem="vst-Vo-bEA" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="iyN-d5-m7y"/>
                 <constraint firstItem="G7E-9C-4qw" firstAttribute="top" secondItem="vst-Vo-bEA" secondAttribute="bottom" constant="20" id="qpl-BV-GdI"/>
@@ -76,6 +78,8 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
+        <namedColor name="CoEpiPurple">
+            <color red="0.52899998426437378" green="0.0080000003799796104" blue="0.83099997043609619" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+        </namedColor>
     </resources>
 </document>
diff --git a/CoEpi/ui/symptomReport/FollowUp/Cough/CoughDaysViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Cough/CoughDaysViewController.xib
index 783d53d..b3f07f7 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Cough/CoughDaysViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Cough/CoughDaysViewController.xib
@@ -24,10 +24,11 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="A8h-nP-Yxg">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="A8h-nP-Yxg">
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
+                    <color key="backgroundColor" name="CoEpiPurple"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="A8h-nP-Yxg" secondAttribute="height" multiplier="15:8" id="up9-bw-Q27"/>
+                        <constraint firstAttribute="height" constant="130" id="sfQ-9J-8Bt"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="50" translatesAutoresizingMaskIntoConstraints="NO" id="0Bb-Lr-D2i">
@@ -115,7 +116,7 @@
                 <constraint firstItem="0Bb-Lr-D2i" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="6dD-Tf-hTj"/>
                 <constraint firstItem="fY1-7k-Cio" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="50" id="7bS-wE-4TJ"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="A8h-nP-Yxg" secondAttribute="trailing" id="Byc-SZ-97M"/>
-                <constraint firstItem="A8h-nP-Yxg" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="-50" id="CIR-Td-LVm"/>
+                <constraint firstItem="A8h-nP-Yxg" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="CIR-Td-LVm"/>
                 <constraint firstItem="cdI-6i-dZV" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="20" id="Cla-fH-twc"/>
                 <constraint firstItem="0Bb-Lr-D2i" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="Day-94-aex"/>
                 <constraint firstItem="fY1-7k-Cio" firstAttribute="top" secondItem="0Bb-Lr-D2i" secondAttribute="bottom" constant="50" id="KDX-yu-U5n"/>
@@ -130,7 +131,6 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
         <namedColor name="CoEpiPurple">
             <color red="0.52899998426437378" green="0.0080000003799796104" blue="0.83099997043609619" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
         </namedColor>
diff --git a/CoEpi/ui/symptomReport/FollowUp/Cough/CoughHowViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Cough/CoughHowViewController.xib
index 1acced0..4ee907a 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Cough/CoughHowViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Cough/CoughHowViewController.xib
@@ -24,10 +24,11 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="gWz-1A-4PQ">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gWz-1A-4PQ">
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
+                    <color key="backgroundColor" name="CoEpiPurple"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="gWz-1A-4PQ" secondAttribute="height" multiplier="15:8" id="Vwn-TQ-3jd"/>
+                        <constraint firstAttribute="height" constant="130" id="0hC-yg-rnx"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="25" translatesAutoresizingMaskIntoConstraints="NO" id="Jh3-AA-7SI">
@@ -115,7 +116,7 @@
                 <constraint firstItem="JeL-hi-Tam" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="20" id="UkY-Rs-swo"/>
                 <constraint firstItem="487-Y9-TrA" firstAttribute="top" secondItem="Jh3-AA-7SI" secondAttribute="bottom" constant="50" id="Xyz-sX-NtB"/>
                 <constraint firstItem="487-Y9-TrA" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="50" id="acw-NU-Okx"/>
-                <constraint firstItem="gWz-1A-4PQ" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="-50" id="bRI-he-WJC"/>
+                <constraint firstItem="gWz-1A-4PQ" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="bRI-he-WJC"/>
                 <constraint firstItem="Jh3-AA-7SI" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="epm-en-9hg"/>
                 <constraint firstItem="Jh3-AA-7SI" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="50" id="gsb-x5-5HF"/>
                 <constraint firstItem="JeL-hi-Tam" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="20" id="iRo-cO-4kD"/>
@@ -127,7 +128,6 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
         <image name="largeOvalButton_Selected" width="294" height="54"/>
         <namedColor name="CoEpiPurple">
             <color red="0.52899998426437378" green="0.0080000003799796104" blue="0.83099997043609619" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
diff --git a/CoEpi/ui/symptomReport/FollowUp/Cough/CoughTypeViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Cough/CoughTypeViewController.xib
index a9e88eb..4241636 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Cough/CoughTypeViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Cough/CoughTypeViewController.xib
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <device id="ipad10_2" orientation="portrait" layout="fullscreen" appearance="light"/>
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
@@ -19,20 +19,21 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <rect key="frame" x="0.0" y="0.0" width="810" height="1080"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="SHr-aV-qih">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="SHr-aV-qih">
+                    <rect key="frame" x="0.0" y="0.0" width="810" height="130"/>
+                    <color key="backgroundColor" name="CoEpiPurple"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="SHr-aV-qih" secondAttribute="height" multiplier="15:8" id="U5H-rx-049"/>
+                        <constraint firstAttribute="height" constant="130" id="Ohn-mc-3my"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="fXT-mT-QUf">
-                    <rect key="frame" x="10" y="352" width="394" height="192"/>
+                    <rect key="frame" x="10" y="345" width="790" height="390"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="vWJ-zu-T6f">
-                            <rect key="frame" x="0.0" y="0.0" width="192" height="192"/>
+                            <rect key="frame" x="0.0" y="0.0" width="390" height="390"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="vWJ-zu-T6f" secondAttribute="height" multiplier="1:1" id="sGK-i3-X48"/>
                             </constraints>
@@ -43,7 +44,7 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="T6Z-Nt-KHf">
-                            <rect key="frame" x="202" y="0.0" width="192" height="192"/>
+                            <rect key="frame" x="400" y="0.0" width="390" height="390"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="T6Z-Nt-KHf" secondAttribute="height" multiplier="1:1" id="jqL-9D-EYG"/>
                             </constraints>
@@ -61,7 +62,7 @@
                     </subviews>
                 </stackView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mJP-Vj-rgk">
-                    <rect key="frame" x="50" y="594" width="30" height="30"/>
+                    <rect key="frame" x="50" y="785" width="30" height="30"/>
                     <state key="normal" title="Skip">
                         <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </state>
@@ -70,7 +71,7 @@
                     </connections>
                 </button>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zzc-XR-oVc">
-                    <rect key="frame" x="20" y="74" width="374" height="29"/>
+                    <rect key="frame" x="20" y="30" width="770" height="29"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
@@ -88,7 +89,7 @@
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="zzc-XR-oVc" secondAttribute="trailing" constant="20" id="g6a-VS-wNA"/>
                 <constraint firstItem="fXT-mT-QUf" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="10" id="ih6-6t-y75"/>
                 <constraint firstItem="zzc-XR-oVc" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="20" id="mhx-Ws-Sqz"/>
-                <constraint firstItem="SHr-aV-qih" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="-50" id="xeF-NV-SKK"/>
+                <constraint firstItem="SHr-aV-qih" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="xeF-NV-SKK"/>
                 <constraint firstItem="fXT-mT-QUf" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="yHB-R8-2j6"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
@@ -96,7 +97,6 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
         <image name="largeCircleButton" width="159" height="159"/>
         <image name="largeCircleButton_Selected" width="159" height="159"/>
         <namedColor name="CoEpiPurple">
diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverDaysViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverDaysViewController.xib
index ed5918b..e1589a8 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverDaysViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverDaysViewController.xib
@@ -24,10 +24,11 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="WkJ-iw-oPc">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WkJ-iw-oPc">
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
+                    <color key="backgroundColor" name="CoEpiPurple"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="WkJ-iw-oPc" secondAttribute="height" multiplier="15:8" id="5bl-ow-snQ"/>
+                        <constraint firstAttribute="height" constant="130" id="TDS-6s-PbM"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="50" translatesAutoresizingMaskIntoConstraints="NO" id="ySF-OM-roc">
@@ -122,7 +123,7 @@
                 <constraint firstItem="1xW-wJ-kXm" firstAttribute="top" secondItem="ySF-OM-roc" secondAttribute="bottom" constant="50" id="VD7-qv-LQv"/>
                 <constraint firstItem="ySF-OM-roc" firstAttribute="centerY" secondItem="x2Q-N6-Xmw" secondAttribute="centerY" id="kbO-5s-LAc"/>
                 <constraint firstItem="WkJ-iw-oPc" firstAttribute="leading" secondItem="ie5-DX-0Rw" secondAttribute="leading" id="q4W-5g-qJf"/>
-                <constraint firstItem="WkJ-iw-oPc" firstAttribute="top" secondItem="ie5-DX-0Rw" secondAttribute="top" constant="-50" id="rtg-SW-qeX"/>
+                <constraint firstItem="WkJ-iw-oPc" firstAttribute="top" secondItem="ie5-DX-0Rw" secondAttribute="top" id="rtg-SW-qeX"/>
                 <constraint firstItem="ie5-DX-0Rw" firstAttribute="trailing" secondItem="cHm-tT-CuT" secondAttribute="trailing" constant="20" id="wuX-At-ePd"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="ie5-DX-0Rw"/>
@@ -130,7 +131,6 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
         <namedColor name="CoEpiPurple">
             <color red="0.52899998426437378" green="0.0080000003799796104" blue="0.83099997043609619" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
         </namedColor>
diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTempViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTempViewController.xib
index 402259d..2b22cfc 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTempViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTempViewController.xib
@@ -24,10 +24,11 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="OSw-q9-ned">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="OSw-q9-ned">
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
+                    <color key="backgroundColor" name="CoEpiPurple"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="OSw-q9-ned" secondAttribute="height" multiplier="15:8" id="qNc-Ph-mYE"/>
+                        <constraint firstAttribute="height" constant="130" id="YdX-Ko-HMD"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="50" translatesAutoresizingMaskIntoConstraints="NO" id="2bj-IZ-Bes">
@@ -122,7 +123,7 @@
                 <constraint firstItem="OSw-q9-ned" firstAttribute="leading" secondItem="c89-m1-m5s" secondAttribute="leading" id="KgN-aG-bMU"/>
                 <constraint firstItem="2bj-IZ-Bes" firstAttribute="leading" secondItem="c89-m1-m5s" secondAttribute="leading" constant="50" id="L8B-iB-IJT"/>
                 <constraint firstItem="Qbd-WU-dpa" firstAttribute="top" secondItem="c89-m1-m5s" secondAttribute="top" constant="30" id="TqD-xa-C8K"/>
-                <constraint firstItem="OSw-q9-ned" firstAttribute="top" secondItem="c89-m1-m5s" secondAttribute="top" constant="-50" id="ZYQ-rI-x6N"/>
+                <constraint firstItem="OSw-q9-ned" firstAttribute="top" secondItem="c89-m1-m5s" secondAttribute="top" id="ZYQ-rI-x6N"/>
                 <constraint firstItem="c89-m1-m5s" firstAttribute="trailing" secondItem="Qbd-WU-dpa" secondAttribute="trailing" constant="20" id="epI-c4-a6C"/>
                 <constraint firstItem="HGK-F4-EBs" firstAttribute="top" secondItem="2bj-IZ-Bes" secondAttribute="bottom" constant="50" id="nD3-Xx-h1x"/>
             </constraints>
@@ -131,7 +132,6 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
         <namedColor name="CoEpiPurple">
             <color red="0.52899998426437378" green="0.0080000003799796104" blue="0.83099997043609619" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
         </namedColor>
diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTodayViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTodayViewController.xib
index 7b7b588..ad5932c 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTodayViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverTodayViewController.xib
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,10 +22,11 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="nUQ-XD-nKz">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="nUQ-XD-nKz">
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
+                    <color key="backgroundColor" name="CoEpiPurple"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="nUQ-XD-nKz" secondAttribute="height" multiplier="15:8" id="4sP-kt-za4"/>
+                        <constraint firstAttribute="height" constant="130" id="jdq-xW-Dp5"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="254-kF-X3f">
@@ -84,7 +86,7 @@
             <constraints>
                 <constraint firstItem="xbg-nd-3lC" firstAttribute="top" secondItem="qJd-k4-NRR" secondAttribute="top" constant="30" id="0Fe-pT-njI"/>
                 <constraint firstItem="qJd-k4-NRR" firstAttribute="trailing" secondItem="254-kF-X3f" secondAttribute="trailing" constant="10" id="B4n-Rj-e9t"/>
-                <constraint firstItem="nUQ-XD-nKz" firstAttribute="top" secondItem="qJd-k4-NRR" secondAttribute="top" constant="-50" id="Qc3-W0-cbL"/>
+                <constraint firstItem="nUQ-XD-nKz" firstAttribute="top" secondItem="qJd-k4-NRR" secondAttribute="top" id="Qc3-W0-cbL"/>
                 <constraint firstItem="nUQ-XD-nKz" firstAttribute="leading" secondItem="qJd-k4-NRR" secondAttribute="leading" id="Tgr-Qu-B3i"/>
                 <constraint firstItem="qJd-k4-NRR" firstAttribute="trailing" secondItem="nUQ-XD-nKz" secondAttribute="trailing" id="Vh7-u8-Fmx"/>
                 <constraint firstItem="771-7N-LM0" firstAttribute="leading" secondItem="qJd-k4-NRR" secondAttribute="leading" constant="50" id="bgb-6z-Boi"/>
@@ -100,8 +102,10 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
         <image name="largeCircleButton" width="159" height="159"/>
         <image name="largeCircleButton_Selected" width="159" height="159"/>
+        <namedColor name="CoEpiPurple">
+            <color red="0.52899998426437378" green="0.0080000003799796104" blue="0.83099997043609619" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+        </namedColor>
     </resources>
 </document>
diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewController.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewController.xib
index 7154331..384de3b 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -24,9 +24,9 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="9ol-aO-EcB">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="9ol-aO-EcB" secondAttribute="height" multiplier="414:221" id="065-rM-Pxm"/>
+                        <constraint firstAttribute="height" constant="130" id="eoh-8k-xn6"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="4S4-cy-maM">
@@ -112,7 +112,7 @@
                 <constraint firstItem="TmR-mL-KlN" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="20" id="JSv-r8-4Mi"/>
                 <constraint firstItem="9ol-aO-EcB" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="Nuv-G5-886"/>
                 <constraint firstItem="08N-4L-XSL" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="50" id="VZp-jk-99N"/>
-                <constraint firstItem="9ol-aO-EcB" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="-50" id="ang-uy-FLG"/>
+                <constraint firstItem="9ol-aO-EcB" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" id="ang-uy-FLG"/>
                 <constraint firstItem="TmR-mL-KlN" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="30" id="g9a-MR-AqY"/>
                 <constraint firstItem="4S4-cy-maM" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="ir5-GN-hUr"/>
                 <constraint firstItem="4S4-cy-maM" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="jDk-iN-zch"/>
diff --git a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewControllerOther.xib b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewControllerOther.xib
index 9545854..8b61e73 100644
--- a/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewControllerOther.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/Fever/FeverWhereViewControllerOther.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,10 +21,10 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="shF-Yl-DlS">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="shF-Yl-DlS">
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="shF-Yl-DlS" secondAttribute="height" multiplier="15:8" id="hJL-qw-2Cq"/>
+                        <constraint firstAttribute="height" constant="130" id="e7P-gz-IMD"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="50" translatesAutoresizingMaskIntoConstraints="NO" id="zNx-pq-IEA">
@@ -51,7 +51,7 @@
                                             <fragment content="Skip">
                                                 <attributes>
                                                     <color key="NSColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                    <font key="NSFont" size="15" name=".AppleSystemUIFont"/>
+                                                    <font key="NSFont" metaFont="system" size="15"/>
                                                     <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
                                                 </attributes>
                                             </fragment>
@@ -95,7 +95,7 @@
             <constraints>
                 <constraint firstItem="bLy-2N-ji7" firstAttribute="trailing" secondItem="zNx-pq-IEA" secondAttribute="trailing" constant="50" id="1WG-l6-FdN"/>
                 <constraint firstItem="bLy-2N-ji7" firstAttribute="trailing" secondItem="shF-Yl-DlS" secondAttribute="trailing" id="3iO-qz-t9b"/>
-                <constraint firstItem="shF-Yl-DlS" firstAttribute="top" secondItem="bLy-2N-ji7" secondAttribute="top" constant="-50" id="7jw-YZ-EgZ"/>
+                <constraint firstItem="shF-Yl-DlS" firstAttribute="top" secondItem="bLy-2N-ji7" secondAttribute="top" id="7jw-YZ-EgZ"/>
                 <constraint firstItem="shF-Yl-DlS" firstAttribute="leading" secondItem="bLy-2N-ji7" secondAttribute="leading" id="I8e-r3-sR7"/>
                 <constraint firstItem="bLy-2N-ji7" firstAttribute="trailing" secondItem="I8k-Kb-dMZ" secondAttribute="trailing" constant="20" id="Kwe-2Q-CdP"/>
                 <constraint firstItem="zNx-pq-IEA" firstAttribute="leading" secondItem="bLy-2N-ji7" secondAttribute="leading" constant="50" id="Ndk-cb-HTq"/>
@@ -109,7 +109,6 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
         <image name="SubmitButton_Selected" width="106" height="26"/>
     </resources>
 </document>
diff --git a/CoEpi/ui/symptomReport/FollowUp/SymptomStartDaysViewController.xib b/CoEpi/ui/symptomReport/FollowUp/SymptomStartDaysViewController.xib
index d666bda..7a2946c 100644
--- a/CoEpi/ui/symptomReport/FollowUp/SymptomStartDaysViewController.xib
+++ b/CoEpi/ui/symptomReport/FollowUp/SymptomStartDaysViewController.xib
@@ -24,10 +24,11 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HeaderLabel" translatesAutoresizingMaskIntoConstraints="NO" id="ZKO-eq-kPq">
-                    <rect key="frame" x="0.0" y="-6" width="414" height="221"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZKO-eq-kPq">
+                    <rect key="frame" x="0.0" y="44" width="414" height="130"/>
+                    <color key="backgroundColor" name="CoEpiPurple"/>
                     <constraints>
-                        <constraint firstAttribute="width" secondItem="ZKO-eq-kPq" secondAttribute="height" multiplier="15:8" id="fyG-Vd-K1y"/>
+                        <constraint firstAttribute="height" constant="130" id="ETl-I4-A6I"/>
                     </constraints>
                 </imageView>
                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="50" translatesAutoresizingMaskIntoConstraints="NO" id="zD6-EK-daS">
@@ -116,7 +117,7 @@
                 <constraint firstItem="cHj-sf-pC7" firstAttribute="leading" secondItem="JOH-1S-udu" secondAttribute="leading" constant="50" id="DnG-LX-Z1V"/>
                 <constraint firstItem="zD6-EK-daS" firstAttribute="centerY" secondItem="Vxu-4b-axa" secondAttribute="centerY" id="K5t-y5-Nva"/>
                 <constraint firstItem="zD6-EK-daS" firstAttribute="centerX" secondItem="Vxu-4b-axa" secondAttribute="centerX" id="KWZ-Vb-TRs"/>
-                <constraint firstItem="ZKO-eq-kPq" firstAttribute="top" secondItem="JOH-1S-udu" secondAttribute="top" constant="-50" id="LVb-ri-9eD"/>
+                <constraint firstItem="ZKO-eq-kPq" firstAttribute="top" secondItem="JOH-1S-udu" secondAttribute="top" id="LVb-ri-9eD"/>
                 <constraint firstItem="ZKO-eq-kPq" firstAttribute="leading" secondItem="JOH-1S-udu" secondAttribute="leading" id="LiG-8R-mx4"/>
                 <constraint firstItem="a5u-Ye-Mi1" firstAttribute="leading" secondItem="JOH-1S-udu" secondAttribute="leading" constant="20" id="Sdo-YV-5wI"/>
                 <constraint firstItem="zD6-EK-daS" firstAttribute="leading" secondItem="JOH-1S-udu" secondAttribute="leading" constant="50" id="ei5-Hy-f80"/>
@@ -130,7 +131,6 @@
         </view>
     </objects>
     <resources>
-        <image name="HeaderLabel" width="375" height="109"/>
         <namedColor name="CoEpiPurple">
             <color red="0.52899998426437378" green="0.0080000003799796104" blue="0.83099997043609619" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
         </namedColor>