diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/Contents.json b/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/Contents.json
index fad7fad..d9b5c5f 100644
--- a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/Contents.json
+++ b/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/Contents.json
@@ -1,17 +1,15 @@
 {
   "images" : [
     {
-      "filename" : "icons8-ok 1.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "icons8-ok 1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icons8-ok 1@3x.png",
+      "filename" : "check.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/check.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/check.png
new file mode 100644
index 0000000..c16b9fd
Binary files /dev/null and b/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/check.png differ
diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1.png
deleted file mode 100644
index 302eac8..0000000
Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1.png and /dev/null differ
diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1@2x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1@2x.png
deleted file mode 100644
index 50c4ed1..0000000
Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1@2x.png and /dev/null differ
diff --git a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1@3x.png b/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1@3x.png
deleted file mode 100644
index 7912d2d..0000000
Binary files a/WOKA/Assets/Assets.xcassets/Home/Theme2/CheckMark.imageset/icons8-ok 1@3x.png and /dev/null differ
diff --git a/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard b/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard
index 996c0fc..48dcae8 100644
--- a/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard
+++ b/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_72" orientation="portrait" appearance="light"/>
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
@@ -29,42 +29,42 @@
             <objects>
                 <viewController storyboardIdentifier="EmailVC" id="Mch-YP-RvY" customClass="EmailVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="xyH-HB-PHf">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="8ZK-w6-Qrb">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="28f-Ou-tkU">
-                                <rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="137" y="50" width="140" height="52.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="28f-Ou-tkU" secondAttribute="height" multiplier="8:3" id="CRw-zp-zNS"/>
                                     <constraint firstAttribute="width" constant="140" id="ecb-Ds-0NZ"/>
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="wZZ-TW-F7M">
-                                <rect key="frame" x="20" y="172.66666666666663" width="390" height="203"/>
+                                <rect key="frame" x="20" y="172.5" width="374" height="202"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Let’s be Safe!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yPx-mT-kaf" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="10" y="0.0" width="370" height="33.666666666666664"/>
+                                        <rect key="frame" x="10" y="0.0" width="354" height="33"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="28"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="Q6Y-QG-Pbh">
-                                        <rect key="frame" x="10" y="103.66666666666666" width="370" height="99.333333333333343"/>
+                                        <rect key="frame" x="10" y="103" width="354" height="99"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="xww-d1-beY">
-                                                <rect key="frame" x="0.0" y="0.0" width="370" height="99.333333333333329"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="354" height="99"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CAN WE HAVE YOUR EMAIL?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="STc-F9-ORA">
-                                                        <rect key="frame" x="0.0" y="0.0" width="370" height="19.333333333333332"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="354" height="19"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your email" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DSB-Ge-wNO" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="34.333333333333371" width="370" height="50"/>
+                                                        <rect key="frame" x="0.0" y="34" width="354" height="50"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <constraints>
@@ -83,7 +83,7 @@
                                                         </userDefinedRuntimeAttributes>
                                                     </textField>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JHJ-Zh-JC5">
-                                                        <rect key="frame" x="0.0" y="99.333333333333371" width="370" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="99" width="354" height="0.0"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -91,16 +91,16 @@
                                                 </subviews>
                                             </stackView>
                                             <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="d6A-f4-E4U">
-                                                <rect key="frame" x="0.0" y="0.0" width="370" height="65"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="354" height="65"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SELECT USER TYPE" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cli-as-L7V" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="370" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="354" height="0.0"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Please select user type" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="aPP-h8-int" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="15" width="370" height="50"/>
+                                                        <rect key="frame" x="0.0" y="15" width="354" height="50"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <constraints>
@@ -126,16 +126,16 @@
                                 <edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="kWC-4v-p9x">
-                                <rect key="frame" x="30" y="776" width="370" height="102"/>
+                                <rect key="frame" x="30" y="740.5" width="354" height="101.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="We will send a verification code to their email" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lqT-ZV-x5p" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="370" height="17"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="354" height="16.5"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="14"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zNR-RE-Ax8" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="52" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="51.5" width="354" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="4eR-zk-hWT"/>
                                         </constraints>
@@ -190,24 +190,24 @@
             <objects>
                 <viewController storyboardIdentifier="OTPVC" id="Yeg-Vy-0ZA" customClass="OTPVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="xdz-zP-bYf">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="d15-AB-06K">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="kF6-ix-4nj">
-                                <rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="137" y="50" width="140" height="52.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="140" id="FC4-VF-29V"/>
                                     <constraint firstAttribute="width" secondItem="kF6-ix-4nj" secondAttribute="height" multiplier="8:3" id="Har-Qr-ggl"/>
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="mhH-Ov-1nU">
-                                <rect key="frame" x="20" y="172.66666666666663" width="390" height="281"/>
+                                <rect key="frame" x="20" y="172.5" width="374" height="278.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NYC-6J-drr" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="10" y="0.0" width="370" height="67.333333333333329"/>
+                                        <rect key="frame" x="10" y="0.0" width="354" height="65.5"/>
                                         <string key="text">Please Get the Code
 Sent to Your Parent’s Email</string>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="28"/>
@@ -215,40 +215,40 @@ Sent to Your Parent’s Email</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="dF8-rD-e8F">
-                                        <rect key="frame" x="10" y="137.33333333333337" width="370" height="143.66666666666663"/>
+                                        <rect key="frame" x="10" y="135.5" width="354" height="143"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PLEASE ENTER THE CODE" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tB6-Qz-8Ez" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="370" height="19.333333333333332"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="354" height="19"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="HGA-bw-mMW">
-                                                <rect key="frame" x="0.0" y="34.333333333333314" width="370" height="60"/>
+                                                <rect key="frame" x="0.0" y="34" width="354" height="60"/>
                                                 <subviews>
                                                     <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="*" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="81S-Fa-CiD" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="85" height="60"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="81" height="60"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Medium" family="Exo 2" pointSize="18"/>
                                                         <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                                                     </textField>
                                                     <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="*" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="42K-Uu-lPQ" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="95" y="0.0" width="85" height="60"/>
+                                                        <rect key="frame" x="91" y="0.0" width="81" height="60"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Medium" family="Exo 2" pointSize="18"/>
                                                         <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                                                     </textField>
                                                     <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="*" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Hcd-Mm-IxW" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="190" y="0.0" width="85" height="60"/>
+                                                        <rect key="frame" x="182" y="0.0" width="81" height="60"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Medium" family="Exo 2" pointSize="18"/>
                                                         <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                                                     </textField>
                                                     <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="*" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="MpT-bm-drv" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="285" y="0.0" width="85" height="60"/>
+                                                        <rect key="frame" x="273" y="0.0" width="81" height="60"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Medium" family="Exo 2" pointSize="18"/>
@@ -260,13 +260,13 @@ Sent to Your Parent’s Email</string>
                                                 </constraints>
                                             </stackView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="OTP is valid for 10:00 Min" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WcL-Rp-jOq" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="109.33333333333331" width="370" height="19.333333333333343"/>
+                                                <rect key="frame" x="0.0" y="109" width="354" height="19"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KX4-Ip-eii" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="136" width="370" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="135.5" width="354" height="0.0"/>
                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                 <state key="normal" title="Button"/>
                                                 <buttonConfiguration key="configuration" style="plain">
@@ -284,7 +284,7 @@ Sent to Your Parent’s Email</string>
                                                 </connections>
                                             </button>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dt3-hg-7T4" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="143.66666666666669" width="370" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="143" width="354" height="0.0"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -295,16 +295,16 @@ Sent to Your Parent’s Email</string>
                                 <edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="xga-nK-9qJ">
-                                <rect key="frame" x="30" y="759.33333333333337" width="370" height="118.66666666666663"/>
+                                <rect key="frame" x="30" y="724" width="354" height="118"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Request them for the verfication code to activate your account" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M3r-lS-DmW" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="370" height="33.666666666666664"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="354" height="33"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="14"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vVW-Kz-YaV" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="68.666666666666629" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="68" width="354" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="KmJ-vu-pxT"/>
                                         </constraints>
@@ -362,149 +362,24 @@ Sent to Your Parent’s Email</string>
             <objects>
                 <viewController storyboardIdentifier="UserDetailsRegisterVC" id="MyJ-bq-ekO" customClass="UserDetailsRegisterVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="VpN-eA-ll3">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="owo-BQ-q03">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="3uH-t8-hYF">
-                                <rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="137" y="50" width="140" height="52.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="140" id="MyE-Df-oTg"/>
                                     <constraint firstAttribute="width" secondItem="3uH-t8-hYF" secondAttribute="height" multiplier="8:3" id="PEA-Ql-z37"/>
                                 </constraints>
                             </imageView>
-                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="L80-bN-1T0">
-                                <rect key="frame" x="20" y="172.66666666666663" width="390" height="510"/>
-                                <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Great! Now Let’s Create Your WOKAccount" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3x2-kd-tL1" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="10" y="0.0" width="370" height="65"/>
-                                        <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="27"/>
-                                        <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="bJs-H6-708">
-                                        <rect key="frame" x="10" y="135" width="370" height="375"/>
-                                        <subviews>
-                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="LUQ-BX-nHw">
-                                                <rect key="frame" x="0.0" y="0.0" width="370" height="99.333333333333329"/>
-                                                <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SELECT USERNAME" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w7B-kJ-IgM" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="370" height="19.333333333333332"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
-                                                        <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="m50-FZ-yVO" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="34.333333333333314" width="370" height="50"/>
-                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <color key="tintColor" name="TextDarkBlue"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="50" id="s2f-b9-xgY"/>
-                                                        </constraints>
-                                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
-                                                        <textInputTraits key="textInputTraits" autocorrectionType="no" enablesReturnKeyAutomatically="YES" textContentType="username"/>
-                                                        <userDefinedRuntimeAttributes>
-                                                            <userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
-                                                                <real key="value" value="25"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                            <userDefinedRuntimeAttribute type="number" keyPath="paddingRightCustom">
-                                                                <real key="value" value="25"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                        </userDefinedRuntimeAttributes>
-                                                    </textField>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RuI-5z-pyW">
-                                                        <rect key="frame" x="0.0" y="99.333333333333314" width="370" height="0.0"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
-                                                        <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                </subviews>
-                                            </stackView>
-                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="qSD-g5-OZA">
-                                                <rect key="frame" x="0.0" y="129.33333333333331" width="370" height="99.333333333333314"/>
-                                                <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHAT’S YOUR NAME?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eZm-zl-55m" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="370" height="19.333333333333332"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
-                                                        <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your name" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-LH-XfR" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="34.333333333333314" width="370" height="50"/>
-                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <color key="tintColor" name="TextDarkBlue"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="50" id="XQt-fy-rey"/>
-                                                        </constraints>
-                                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
-                                                        <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" enablesReturnKeyAutomatically="YES" textContentType="name"/>
-                                                        <userDefinedRuntimeAttributes>
-                                                            <userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
-                                                                <real key="value" value="25"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                            <userDefinedRuntimeAttribute type="number" keyPath="paddingRightCustom">
-                                                                <real key="value" value="25"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                        </userDefinedRuntimeAttributes>
-                                                    </textField>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Y3K-h2-Gbg">
-                                                        <rect key="frame" x="0.0" y="99.333333333333371" width="370" height="0.0"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
-                                                        <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                </subviews>
-                                            </stackView>
-                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="hWX-C0-soL">
-                                                <rect key="frame" x="0.0" y="258.66666666666669" width="370" height="116.33333333333331"/>
-                                                <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CREATE YOUR PASSWORD" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fev-AX-lcQ" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="370" height="19.333333333333332"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
-                                                        <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4gw-z0-s4a" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="34.333333333333258" width="370" height="50"/>
-                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <color key="tintColor" name="TextDarkBlue"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="50" id="s5g-2j-BWF"/>
-                                                        </constraints>
-                                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
-                                                        <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress" enablesReturnKeyAutomatically="YES" secureTextEntry="YES" textContentType="email"/>
-                                                        <userDefinedRuntimeAttributes>
-                                                            <userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
-                                                                <real key="value" value="25"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                            <userDefinedRuntimeAttribute type="number" keyPath="paddingRightCustom">
-                                                                <real key="value" value="25"/>
-                                                            </userDefinedRuntimeAttribute>
-                                                        </userDefinedRuntimeAttributes>
-                                                    </textField>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Shh!! Don’t share your password with anyone." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3LF-iY-Hoi" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="99.333333333333258" width="370" height="17"/>
-                                                        <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="14"/>
-                                                        <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                </subviews>
-                                            </stackView>
-                                        </subviews>
-                                    </stackView>
-                                </subviews>
-                                <edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
-                            </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="EvA-Qj-QKv">
-                                <rect key="frame" x="30" y="828" width="370" height="50"/>
+                                <rect key="frame" x="30" y="792" width="354" height="50"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kqz-rN-BEF" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="354" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="VxZ-hu-QVD"/>
                                         </constraints>
@@ -520,69 +395,209 @@ Sent to Your Parent’s Email</string>
                                     </button>
                                 </subviews>
                             </stackView>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KLp-eQ-sLE">
+                                <rect key="frame" x="20" y="162.5" width="374" height="621.5"/>
+                                <subviews>
+                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="W6b-Tb-DFG">
+                                        <rect key="frame" x="0.0" y="0.0" width="374" height="506.5"/>
+                                        <subviews>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Great! Now Let’s Create Your WOKAccount" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LOm-pd-cdl" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                <rect key="frame" x="10" y="0.0" width="354" height="63"/>
+                                                <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="27"/>
+                                                <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="FJu-rQ-wC0">
+                                                <rect key="frame" x="10" y="133" width="354" height="373.5"/>
+                                                <subviews>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="aKp-hZ-d2B">
+                                                        <rect key="frame" x="0.0" y="0.0" width="354" height="99"/>
+                                                        <subviews>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SELECT USERNAME" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LmB-jW-Qjq" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="0.0" width="354" height="19"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
+                                                                <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fe6-VY-EXE" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="34" width="354" height="50"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="tintColor" name="TextDarkBlue"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="50" id="5bd-f0-GEc"/>
+                                                                </constraints>
+                                                                <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
+                                                                <textInputTraits key="textInputTraits" autocorrectionType="no" enablesReturnKeyAutomatically="YES" textContentType="username"/>
+                                                                <userDefinedRuntimeAttributes>
+                                                                    <userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
+                                                                        <real key="value" value="25"/>
+                                                                    </userDefinedRuntimeAttribute>
+                                                                    <userDefinedRuntimeAttribute type="number" keyPath="paddingRightCustom">
+                                                                        <real key="value" value="25"/>
+                                                                    </userDefinedRuntimeAttribute>
+                                                                </userDefinedRuntimeAttributes>
+                                                            </textField>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PFt-g5-vdj">
+                                                                <rect key="frame" x="0.0" y="99" width="354" height="0.0"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
+                                                                <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                        </subviews>
+                                                    </stackView>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="WWQ-u4-Qkd">
+                                                        <rect key="frame" x="0.0" y="129" width="354" height="99"/>
+                                                        <subviews>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHAT’S YOUR NAME?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="quC-IF-A02" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="0.0" width="354" height="19"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
+                                                                <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your name" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BUv-6a-Pym" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="34" width="354" height="50"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="tintColor" name="TextDarkBlue"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="50" id="95o-0S-cPC"/>
+                                                                </constraints>
+                                                                <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
+                                                                <textInputTraits key="textInputTraits" autocapitalizationType="words" autocorrectionType="no" enablesReturnKeyAutomatically="YES" textContentType="name"/>
+                                                                <userDefinedRuntimeAttributes>
+                                                                    <userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
+                                                                        <real key="value" value="25"/>
+                                                                    </userDefinedRuntimeAttribute>
+                                                                    <userDefinedRuntimeAttribute type="number" keyPath="paddingRightCustom">
+                                                                        <real key="value" value="25"/>
+                                                                    </userDefinedRuntimeAttribute>
+                                                                </userDefinedRuntimeAttributes>
+                                                            </textField>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8ZV-jW-hCo">
+                                                                <rect key="frame" x="0.0" y="99" width="354" height="0.0"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
+                                                                <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                        </subviews>
+                                                    </stackView>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="i2b-WA-SdY">
+                                                        <rect key="frame" x="0.0" y="258" width="354" height="115.5"/>
+                                                        <subviews>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CREATE YOUR PASSWORD" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EK9-7y-mnt" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="0.0" width="354" height="19"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
+                                                                <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mYu-X2-cm3" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="34" width="354" height="50"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="tintColor" name="TextDarkBlue"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="height" constant="50" id="hz5-M7-PZM"/>
+                                                                </constraints>
+                                                                <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="16"/>
+                                                                <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress" enablesReturnKeyAutomatically="YES" secureTextEntry="YES" textContentType="email"/>
+                                                                <userDefinedRuntimeAttributes>
+                                                                    <userDefinedRuntimeAttribute type="number" keyPath="paddingLeftCustom">
+                                                                        <real key="value" value="25"/>
+                                                                    </userDefinedRuntimeAttribute>
+                                                                    <userDefinedRuntimeAttribute type="number" keyPath="paddingRightCustom">
+                                                                        <real key="value" value="25"/>
+                                                                    </userDefinedRuntimeAttribute>
+                                                                </userDefinedRuntimeAttributes>
+                                                            </textField>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Shh!! Don’t share your password with anyone." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rje-ta-ChY" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                                <rect key="frame" x="0.0" y="99" width="354" height="16.5"/>
+                                                                <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="14"/>
+                                                                <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                        </subviews>
+                                                    </stackView>
+                                                </subviews>
+                                            </stackView>
+                                        </subviews>
+                                        <edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
+                                    </stackView>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="W6b-Tb-DFG" firstAttribute="leading" secondItem="4T0-TE-epf" secondAttribute="leading" id="9Bg-Vc-7av"/>
+                                    <constraint firstItem="W6b-Tb-DFG" firstAttribute="width" secondItem="gRW-ei-kz1" secondAttribute="width" id="D2f-DF-Ojx"/>
+                                    <constraint firstAttribute="bottom" secondItem="W6b-Tb-DFG" secondAttribute="bottom" constant="10.5" id="NN0-hq-PeI"/>
+                                    <constraint firstItem="4T0-TE-epf" firstAttribute="trailing" secondItem="W6b-Tb-DFG" secondAttribute="trailing" id="gvG-bF-3LA"/>
+                                    <constraint firstItem="W6b-Tb-DFG" firstAttribute="top" secondItem="KLp-eQ-sLE" secondAttribute="top" id="l96-6L-voO"/>
+                                </constraints>
+                                <viewLayoutGuide key="contentLayoutGuide" id="gRW-ei-kz1"/>
+                                <viewLayoutGuide key="frameLayoutGuide" id="4T0-TE-epf"/>
+                            </scrollView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="5pw-Iu-Wpd"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="5pw-Iu-Wpd" firstAttribute="trailing" secondItem="owo-BQ-q03" secondAttribute="trailing" id="4wW-gl-5z5"/>
                             <constraint firstItem="owo-BQ-q03" firstAttribute="leading" secondItem="5pw-Iu-Wpd" secondAttribute="leading" id="DuU-RI-0OW"/>
-                            <constraint firstItem="5pw-Iu-Wpd" firstAttribute="trailing" secondItem="L80-bN-1T0" secondAttribute="trailing" constant="20" id="SLL-hJ-Tq0"/>
+                            <constraint firstItem="KLp-eQ-sLE" firstAttribute="leading" secondItem="5pw-Iu-Wpd" secondAttribute="leading" constant="20" id="KWp-fM-8FG"/>
+                            <constraint firstItem="5pw-Iu-Wpd" firstAttribute="trailing" secondItem="KLp-eQ-sLE" secondAttribute="trailing" constant="20" id="Orf-SQ-dak"/>
                             <constraint firstItem="5pw-Iu-Wpd" firstAttribute="bottom" secondItem="EvA-Qj-QKv" secondAttribute="bottom" constant="20" id="SjJ-bu-ptM"/>
+                            <constraint firstItem="KLp-eQ-sLE" firstAttribute="top" secondItem="3uH-t8-hYF" secondAttribute="bottom" constant="60" id="ThV-hd-eCJ"/>
                             <constraint firstItem="EvA-Qj-QKv" firstAttribute="leading" secondItem="5pw-Iu-Wpd" secondAttribute="leading" constant="30" id="Tri-Ey-BJe"/>
                             <constraint firstItem="owo-BQ-q03" firstAttribute="top" secondItem="VpN-eA-ll3" secondAttribute="top" id="VbB-Vc-lO9"/>
                             <constraint firstItem="5pw-Iu-Wpd" firstAttribute="trailing" secondItem="EvA-Qj-QKv" secondAttribute="trailing" constant="30" id="Vzg-K8-35e"/>
-                            <constraint firstItem="L80-bN-1T0" firstAttribute="leading" secondItem="VpN-eA-ll3" secondAttribute="leading" constant="20" id="d1q-3N-6ue"/>
                             <constraint firstItem="3uH-t8-hYF" firstAttribute="centerX" secondItem="owo-BQ-q03" secondAttribute="centerX" id="hlr-Rg-23t"/>
                             <constraint firstAttribute="bottom" secondItem="owo-BQ-q03" secondAttribute="bottom" id="rba-mw-YXY"/>
-                            <constraint firstItem="L80-bN-1T0" firstAttribute="top" secondItem="3uH-t8-hYF" secondAttribute="bottom" constant="70" id="rik-Hy-wqV"/>
                             <constraint firstItem="3uH-t8-hYF" firstAttribute="top" secondItem="VpN-eA-ll3" secondAttribute="top" constant="50" id="s9Y-ki-uEK"/>
+                            <constraint firstItem="EvA-Qj-QKv" firstAttribute="top" secondItem="KLp-eQ-sLE" secondAttribute="bottom" constant="8" symbolic="YES" id="uei-0U-neF"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="as0-6B-j9I"/>
                     <connections>
-                        <outlet property="dontSharePassLabel" destination="3LF-iY-Hoi" id="fOm-ti-ZGs"/>
-                        <outlet property="enterNameTF" destination="tgW-LH-XfR" id="4Vt-ub-4z2"/>
-                        <outlet property="enterPasswordTF" destination="4gw-z0-s4a" id="0nn-80-Rli"/>
-                        <outlet property="enterUserNameTF" destination="m50-FZ-yVO" id="dNR-QE-LZs"/>
-                        <outlet property="nameTitleLabel" destination="eZm-zl-55m" id="xVL-61-28l"/>
+                        <outlet property="dontSharePassLabel" destination="rje-ta-ChY" id="wAG-fQ-tpo"/>
+                        <outlet property="enterNameTF" destination="BUv-6a-Pym" id="Vm0-2Q-qmg"/>
+                        <outlet property="enterPasswordTF" destination="mYu-X2-cm3" id="yl8-yM-fi0"/>
+                        <outlet property="enterUserNameTF" destination="fe6-VY-EXE" id="Xlg-rC-6OO"/>
+                        <outlet property="nameTitleLabel" destination="quC-IF-A02" id="akO-ao-EAS"/>
                         <outlet property="nextBtn" destination="Kqz-rN-BEF" id="Lyc-Tb-K5U"/>
-                        <outlet property="passTitleLabel" destination="Fev-AX-lcQ" id="Rmv-Rm-EKG"/>
-                        <outlet property="userNameTitleLabel" destination="w7B-kJ-IgM" id="tGa-Sl-ARi"/>
-                        <outlet property="viewTitleLabel" destination="3x2-kd-tL1" id="Nkb-9q-ssi"/>
+                        <outlet property="passTitleLabel" destination="EK9-7y-mnt" id="rVN-WZ-P0k"/>
+                        <outlet property="userNameTitleLabel" destination="LmB-jW-Qjq" id="wyJ-gW-bzP"/>
+                        <outlet property="viewTitleLabel" destination="LOm-pd-cdl" id="rVF-Gt-uw3"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Bow-7Q-7qp" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="799" y="-27"/>
+            <point key="canvasLocation" x="798.55072463768124" y="-27.455357142857142"/>
         </scene>
         <!--User IntrestVC-->
         <scene sceneID="T5g-K3-JbZ">
             <objects>
                 <viewController storyboardIdentifier="UserIntrestVC" id="cJN-jE-dFM" customClass="UserIntrestVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="cAe-Mf-lsK">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="YXE-BY-CLo">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tyX-OO-8o2">
-                                <rect key="frame" x="0.0" y="59" width="430" height="839"/>
+                                <rect key="frame" x="0.0" y="48" width="414" height="814"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="VdK-J5-rgR">
-                                        <rect key="frame" x="0.0" y="30" width="430" height="785"/>
+                                        <rect key="frame" x="0.0" y="30" width="414" height="786"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="03q-h4-3f0">
-                                                <rect key="frame" x="10" y="0.0" width="410" height="67.666666666666671"/>
+                                                <rect key="frame" x="10" y="0.0" width="394" height="68"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Nice to meet you," textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pix-7E-Qy7" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="410" height="31.333333333333332"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="394" height="31.5"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="26"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5fJ-Y1-sF5">
-                                                        <rect key="frame" x="0.0" y="36.333333333333329" width="410" height="31.333333333333329"/>
+                                                        <rect key="frame" x="0.0" y="36.5" width="394" height="31.5"/>
                                                         <attributedString key="attributedText">
                                                             <fragment content="Vijay">
                                                                 <attributes>
@@ -597,34 +612,34 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Can we know a bit more about you?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SDb-xl-JQx" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="10" y="102.66666666666666" width="410" height="26.666666666666657"/>
+                                                <rect key="frame" x="10" y="103" width="394" height="26.5"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="22"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="3iR-vv-IUk">
-                                                <rect key="frame" x="10" y="164.33333333333337" width="410" height="137.66666666666663"/>
+                                                <rect key="frame" x="10" y="164.5" width="394" height="138"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="YOUR GENDER" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GuV-CV-Huq" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="410" height="21.666666666666668"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="394" height="22"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="UBH-i2-Wx5">
-                                                        <rect key="frame" x="0.0" y="37.666666666666657" width="410" height="100"/>
+                                                        <rect key="frame" x="0.0" y="38" width="394" height="100"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vzD-bQ-1cP">
-                                                                <rect key="frame" x="30" y="0.0" width="145" height="100"/>
+                                                                <rect key="frame" x="30" y="0.0" width="137" height="100"/>
                                                                 <subviews>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="cMG-wb-u14">
-                                                                        <rect key="frame" x="47.666666666666671" y="10" width="49.666666666666671" height="76.666666666666671"/>
+                                                                        <rect key="frame" x="44" y="10" width="49.5" height="77"/>
                                                                         <subviews>
                                                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Boy" translatesAutoresizingMaskIntoConstraints="NO" id="tci-wS-ZxN">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="49.666666666666664" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="49.5" height="50"/>
                                                                             </imageView>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BOY" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nnY-MI-513">
-                                                                                <rect key="frame" x="0.0" y="54.999999999999993" width="49.666666666666664" height="21.666666666666664"/>
+                                                                                <rect key="frame" x="0.0" y="55" width="49.5" height="22"/>
                                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
@@ -639,16 +654,16 @@ Sent to Your Parent’s Email</string>
                                                                 </constraints>
                                                             </view>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Ik-wa-umx">
-                                                                <rect key="frame" x="235" y="0.0" width="145" height="100"/>
+                                                                <rect key="frame" x="227" y="0.0" width="137" height="100"/>
                                                                 <subviews>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="yXQ-aC-gR1">
-                                                                        <rect key="frame" x="48.333333333333314" y="10" width="48.666666666666657" height="76.666666666666671"/>
+                                                                        <rect key="frame" x="44.5" y="10" width="48.5" height="77"/>
                                                                         <subviews>
                                                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Girl" translatesAutoresizingMaskIntoConstraints="NO" id="Fqa-vi-auf">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="48.666666666666664" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="48.5" height="50"/>
                                                                             </imageView>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GIRL" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K9G-cT-fBK">
-                                                                                <rect key="frame" x="0.0" y="54.999999999999993" width="48.666666666666664" height="21.666666666666664"/>
+                                                                                <rect key="frame" x="0.0" y="55" width="48.5" height="22"/>
                                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
@@ -671,16 +686,16 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="713-kI-2TZ">
-                                                <rect key="frame" x="10" y="337" width="410" height="136.66666666666663"/>
+                                                <rect key="frame" x="10" y="337.5" width="394" height="137"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHEN IS YOUR BIRTHDAY?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J83-KL-Pex" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="410" height="21.666666666666668"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="394" height="22"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="date" style="wheels" translatesAutoresizingMaskIntoConstraints="NO" id="QrL-xJ-2yI">
-                                                        <rect key="frame" x="0.0" y="36.666666666666686" width="410" height="100"/>
+                                                        <rect key="frame" x="0.0" y="37" width="394" height="100"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="100" id="uDd-Ik-9bt"/>
                                                         </constraints>
@@ -688,16 +703,16 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="8nq-Pj-Asi">
-                                                <rect key="frame" x="10" y="508.66666666666669" width="410" height="221.66666666666669"/>
+                                                <rect key="frame" x="10" y="509.5" width="394" height="222"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WHEN ARE YOUR INTRESTS?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agP-Pb-cQD" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="410" height="21.666666666666668"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="394" height="22"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" scrollEnabled="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="s7g-G0-W2v">
-                                                        <rect key="frame" x="0.0" y="41.666666666666742" width="410" height="180"/>
+                                                        <rect key="frame" x="0.0" y="42" width="394" height="180"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="180" id="auZ-NR-TCk"/>
@@ -708,7 +723,7 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select as many as you want" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LYR-yD-QKs" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="10" y="765.33333333333337" width="410" height="19.666666666666629"/>
+                                                <rect key="frame" x="10" y="766.5" width="394" height="19.5"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="19.5" id="yPv-4R-Lm1"/>
                                                 </constraints>
@@ -731,7 +746,7 @@ Sent to Your Parent’s Email</string>
                                 <viewLayoutGuide key="frameLayoutGuide" id="mpe-FM-ECN"/>
                             </scrollView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hAv-PV-elG" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                <rect key="frame" x="30" y="848" width="370" height="50"/>
+                                <rect key="frame" x="30" y="812" width="354" height="50"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="3O5-pI-43j"/>
                                 </constraints>
@@ -788,14 +803,14 @@ Sent to Your Parent’s Email</string>
             <objects>
                 <viewController storyboardIdentifier="SelectAvatarVC" id="0J9-HF-tOK" customClass="SelectAvatarVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Owo-gU-Byc">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="fcq-fM-YqF">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="1uh-3v-vfA">
-                                <rect key="frame" x="35" y="89" width="360" height="749"/>
+                                <rect key="frame" x="35" y="78" width="344" height="724"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="lu2-FF-gHy">
                                     <size key="itemSize" width="128" height="128"/>
@@ -806,7 +821,7 @@ Sent to Your Parent’s Email</string>
                                 <cells/>
                             </collectionView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1hT-hu-cP2" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                <rect key="frame" x="30" y="848" width="370" height="50"/>
+                                <rect key="frame" x="30" y="812" width="354" height="50"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="50" id="dgi-gc-q54"/>
                                 </constraints>
@@ -853,52 +868,52 @@ Sent to Your Parent’s Email</string>
             <objects>
                 <viewController storyboardIdentifier="LoginVC" id="vuc-DA-J2M" customClass="LoginVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="IaD-iX-nYV">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="Cj9-TI-6RF">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="dYE-pF-NG5">
-                                <rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="137" y="50" width="140" height="52.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="140" id="E5x-0b-APB"/>
                                     <constraint firstAttribute="width" secondItem="dYE-pF-NG5" secondAttribute="height" multiplier="8:3" id="FBp-5c-Tze"/>
                                 </constraints>
                             </imageView>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M5Q-DD-j9X">
-                                <rect key="frame" x="0.0" y="107.66666666666669" width="430" height="790.33333333333326"/>
+                                <rect key="frame" x="0.0" y="107.5" width="414" height="754.5"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="aNK-S5-pik">
-                                        <rect key="frame" x="0.0" y="0.0" width="430" height="768.66666666666663"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="414" height="759"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Y9q-mR-AlW">
-                                                <rect key="frame" x="20" y="0.0" width="390" height="62.333333333333336"/>
+                                                <rect key="frame" x="20" y="0.0" width="374" height="60"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </view>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="Krs-Zs-R6t">
-                                                <rect key="frame" x="20" y="62.333333333333314" width="390" height="446"/>
+                                                <rect key="frame" x="20" y="60" width="374" height="444"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Login to WOKA" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1T4-5K-cXT" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="390" height="32.666666666666664"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="374" height="31.5"/>
                                                         <fontDescription key="fontDescription" name="Exo2-ExtraBold" family="Exo 2" pointSize="27"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="EhK-1C-Xey">
-                                                        <rect key="frame" x="0.0" y="102.66666666666671" width="390" height="343.33333333333326"/>
+                                                        <rect key="frame" x="0.0" y="101.5" width="374" height="342.5"/>
                                                         <subviews>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="krT-0d-tCQ">
-                                                                <rect key="frame" x="0.0" y="0.0" width="390" height="99.333333333333329"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="374" height="99"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="USERNAME" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Xc-wy-9mu" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="390" height="19.333333333333332"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="374" height="19"/>
                                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="68c-1b-KSI" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                                        <rect key="frame" x="0.0" y="34.333333333333314" width="390" height="50"/>
+                                                                        <rect key="frame" x="0.0" y="34" width="374" height="50"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                                         <constraints>
@@ -917,7 +932,7 @@ Sent to Your Parent’s Email</string>
                                                                         </userDefinedRuntimeAttributes>
                                                                     </textField>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JQm-yr-A2M">
-                                                                        <rect key="frame" x="0.0" y="99.333333333333314" width="390" height="0.0"/>
+                                                                        <rect key="frame" x="0.0" y="99" width="374" height="0.0"/>
                                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <nil key="highlightedColor"/>
@@ -925,19 +940,19 @@ Sent to Your Parent’s Email</string>
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="fVp-fO-1fH">
-                                                                <rect key="frame" x="0.0" y="129.33333333333331" width="390" height="134"/>
+                                                                <rect key="frame" x="0.0" y="129" width="374" height="133.5"/>
                                                                 <subviews>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="ebQ-va-83Q">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="390" height="99.333333333333329"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="374" height="99"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PASSWORD" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BcT-5f-ded" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="390" height="19.333333333333332"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="374" height="19"/>
                                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your password" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iJE-dm-qal" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                                                <rect key="frame" x="0.0" y="34.333333333333314" width="390" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="34" width="374" height="50"/>
                                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                                                 <constraints>
@@ -956,7 +971,7 @@ Sent to Your Parent’s Email</string>
                                                                                 </userDefinedRuntimeAttributes>
                                                                             </textField>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2YT-HL-ug7">
-                                                                                <rect key="frame" x="0.0" y="99.333333333333314" width="390" height="0.0"/>
+                                                                                <rect key="frame" x="0.0" y="99" width="374" height="0.0"/>
                                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
@@ -964,10 +979,10 @@ Sent to Your Parent’s Email</string>
                                                                         </subviews>
                                                                     </stackView>
                                                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="A4q-bi-Tuo">
-                                                                        <rect key="frame" x="0.0" y="104.33333333333331" width="390" height="29.666666666666657"/>
+                                                                        <rect key="frame" x="0.0" y="104" width="374" height="29.5"/>
                                                                         <subviews>
                                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9jK-cQ-yP9" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="132.66666666666666" height="29.666666666666668"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="132.5" height="29.5"/>
                                                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                                                 <state key="normal" title="Button"/>
                                                                                 <buttonConfiguration key="configuration" style="plain" title="Forgot Username?">
@@ -978,7 +993,7 @@ Sent to Your Parent’s Email</string>
                                                                                 </connections>
                                                                             </button>
                                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yp6-2q-OZC" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                                                                <rect key="frame" x="259" y="0.0" width="131" height="29.666666666666668"/>
+                                                                                <rect key="frame" x="243.5" y="0.0" width="130.5" height="29.5"/>
                                                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                                                 <state key="normal" title="Button"/>
                                                                                 <buttonConfiguration key="configuration" style="plain" title="Forgot Password?">
@@ -993,7 +1008,7 @@ Sent to Your Parent’s Email</string>
                                                                 </subviews>
                                                             </stackView>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OFt-kx-VfD" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                                                <rect key="frame" x="0.0" y="293.33333333333331" width="390" height="50"/>
+                                                                <rect key="frame" x="0.0" y="292.5" width="374" height="50"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="50" id="Tle-PZ-1B4"/>
                                                                 </constraints>
@@ -1012,14 +1027,14 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tOZ-1S-7K5">
-                                                <rect key="frame" x="20" y="508.33333333333331" width="390" height="124.66666666666669"/>
+                                                <rect key="frame" x="20" y="504" width="374" height="120"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </view>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="Nnb-iQ-OQs">
-                                                <rect key="frame" x="20" y="633" width="390" height="105.66666666666663"/>
+                                                <rect key="frame" x="20" y="624" width="374" height="105"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ly3-jW-G7X" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="0.0" width="390" height="35.666666666666664"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="374" height="35"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <state key="normal" title="Button"/>
                                                         <buttonConfiguration key="configuration" style="plain" title="Continue as a Guest">
@@ -1030,7 +1045,7 @@ Sent to Your Parent’s Email</string>
                                                         </connections>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TYc-dA-ZOV" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="55.666666666666742" width="390" height="50"/>
+                                                        <rect key="frame" x="0.0" y="55" width="374" height="50"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="50" id="sfz-a2-WZy"/>
                                                         </constraints>
@@ -1047,7 +1062,7 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sb4-yj-JJ2">
-                                                <rect key="frame" x="20" y="738.66666666666674" width="390" height="30"/>
+                                                <rect key="frame" x="20" y="729" width="374" height="30"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="30" id="RxX-pL-7Ux"/>
@@ -1102,39 +1117,39 @@ Sent to Your Parent’s Email</string>
             <objects>
                 <viewController storyboardIdentifier="ResetPassUserNameVC" id="zmU-4d-wMC" customClass="ResetPassUserNameVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Sgi-hQ-Gsy">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="aMz-cV-9jf">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="Uo0-KI-88t">
-                                <rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="137" y="50" width="140" height="52.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="140" id="Ea4-eb-ysK"/>
                                     <constraint firstAttribute="width" secondItem="Uo0-KI-88t" secondAttribute="height" multiplier="8:3" id="TXC-lz-9Jd"/>
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="Pjf-i3-BcY">
-                                <rect key="frame" x="20" y="172.66666666666663" width="390" height="203"/>
+                                <rect key="frame" x="20" y="172.5" width="374" height="202"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Forgot your Password?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i7M-Ob-pCE" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="10" y="0.0" width="370" height="33.666666666666664"/>
+                                        <rect key="frame" x="10" y="0.0" width="354" height="33"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="28"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="Jlq-Ct-Mrz">
-                                        <rect key="frame" x="10" y="103.66666666666666" width="370" height="99.333333333333343"/>
+                                        <rect key="frame" x="10" y="103" width="354" height="99"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PLEASE GIVE US YOUR USERNAME" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fCB-jL-yE4" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="370" height="19.333333333333332"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="354" height="19"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wy2-0C-rxG" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="34.333333333333371" width="370" height="50"/>
+                                                <rect key="frame" x="0.0" y="34" width="354" height="50"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                 <constraints>
@@ -1153,7 +1168,7 @@ Sent to Your Parent’s Email</string>
                                                 </userDefinedRuntimeAttributes>
                                             </textField>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0ps-Ku-87z">
-                                                <rect key="frame" x="0.0" y="99.333333333333371" width="370" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="99" width="354" height="0.0"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -1164,16 +1179,16 @@ Sent to Your Parent’s Email</string>
                                 <edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="NPA-IJ-SA5">
-                                <rect key="frame" x="30" y="776" width="370" height="102"/>
+                                <rect key="frame" x="30" y="740.5" width="354" height="101.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="We will send a reset code to email" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uv4-iY-Z87" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="370" height="17"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="354" height="16.5"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="14"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JJ0-wA-EP6" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="52" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="51.5" width="354" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="I7D-T4-sU1"/>
                                         </constraints>
@@ -1222,42 +1237,42 @@ Sent to Your Parent’s Email</string>
             <objects>
                 <viewController storyboardIdentifier="NewPasswordVC" id="1Pn-iP-PaH" customClass="NewPasswordVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="rCr-gA-4WT">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="GmS-tq-ip2">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="hZr-H0-7JS">
-                                <rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="137" y="50" width="140" height="52.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="hZr-H0-7JS" secondAttribute="height" multiplier="8:3" id="Qc1-Qm-zOF"/>
                                     <constraint firstAttribute="width" constant="140" id="xPX-2T-bLP"/>
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="ph5-wC-m3B">
-                                <rect key="frame" x="20" y="172.66666666666666" width="390" height="341.33333333333337"/>
+                                <rect key="frame" x="20" y="172.5" width="374" height="339.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Great! Select New Password" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QGk-Uc-mER" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="10" y="0.0" width="370" height="32.666666666666664"/>
+                                        <rect key="frame" x="10" y="0.0" width="354" height="31.5"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="27"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="qzU-f1-tq1">
-                                        <rect key="frame" x="10" y="102.66666666666667" width="370" height="238.66666666666663"/>
+                                        <rect key="frame" x="10" y="101.5" width="354" height="238"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="1na-3A-stg">
-                                                <rect key="frame" x="0.0" y="0.0" width="370" height="99.333333333333329"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="354" height="99"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CREATE YOUR PASSWORD" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hYw-Vc-C9h">
-                                                        <rect key="frame" x="0.0" y="0.0" width="370" height="19.333333333333332"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="354" height="19"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter new password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Skx-Ig-91N" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="34.333333333333371" width="370" height="50"/>
+                                                        <rect key="frame" x="0.0" y="34" width="354" height="50"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <constraints>
@@ -1276,7 +1291,7 @@ Sent to Your Parent’s Email</string>
                                                         </userDefinedRuntimeAttributes>
                                                     </textField>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ht0-v3-TeN">
-                                                        <rect key="frame" x="0.0" y="99.333333333333371" width="370" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="99" width="354" height="0.0"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -1284,16 +1299,16 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="Rwa-zV-eg9">
-                                                <rect key="frame" x="0.0" y="139.33333333333337" width="370" height="99.333333333333314"/>
+                                                <rect key="frame" x="0.0" y="139" width="354" height="99"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CONFIRM YOUR PASSWORD" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6LZ-Ed-gCK">
-                                                        <rect key="frame" x="0.0" y="0.0" width="370" height="19.333333333333332"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="354" height="19"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="confirm your password" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="JRR-Bk-5UP" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="34.333333333333314" width="370" height="50"/>
+                                                        <rect key="frame" x="0.0" y="34" width="354" height="50"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <constraints>
@@ -1312,7 +1327,7 @@ Sent to Your Parent’s Email</string>
                                                         </userDefinedRuntimeAttributes>
                                                     </textField>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B3H-EX-OA7">
-                                                        <rect key="frame" x="0.0" y="99.333333333333314" width="370" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="99" width="354" height="0.0"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                         <nil key="highlightedColor"/>
@@ -1325,10 +1340,10 @@ Sent to Your Parent’s Email</string>
                                 <edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="Ut5-b1-5tm">
-                                <rect key="frame" x="30" y="828" width="370" height="50"/>
+                                <rect key="frame" x="30" y="792" width="354" height="50"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ebp-9w-EVJ" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="354" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="7q3-na-OZp"/>
                                         </constraints>
@@ -1378,40 +1393,40 @@ Sent to Your Parent’s Email</string>
             <objects>
                 <viewController storyboardIdentifier="LinkedChildVC" id="WA5-Nv-4b4" customClass="LinkedChildVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="YKJ-1S-kas">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="kVU-tZ-Qxe">
-                                <rect key="frame" x="0.0" y="0.0" width="428" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="Ux8-r9-rZb">
-                                <rect key="frame" x="144" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="137" y="50" width="140" height="52.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Ux8-r9-rZb" secondAttribute="height" multiplier="8:3" id="3Bo-85-Opy"/>
                                     <constraint firstAttribute="width" constant="140" id="abR-fA-jTS"/>
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="OXs-y6-ZlP">
-                                <rect key="frame" x="34" y="132.66666666666669" width="374" height="675.33333333333326"/>
+                                <rect key="frame" x="20" y="132.5" width="374" height="639.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Email Looks Familiar!" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wlw-Ne-TMy" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="10" y="0.0" width="354" height="29"/>
+                                        <rect key="frame" x="10" y="0.0" width="354" height="27"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="24"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="v0K-Jg-3w3">
-                                        <rect key="frame" x="10" y="89" width="354" height="586.33333333333337"/>
+                                        <rect key="frame" x="10" y="87" width="354" height="552.5"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WE FOUND BELOW USERNAMES LINKED TO THIS EMAIL ADDRESS" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Z0p-jz-vVx" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="354" height="38.666666666666664"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="354" height="38.5"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="9Iy-Zh-d0U">
-                                                <rect key="frame" x="0.0" y="58.666666666666686" width="354" height="527.66666666666652"/>
+                                                <rect key="frame" x="0.0" y="58.5" width="354" height="494"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </tableView>
                                         </subviews>
@@ -1420,10 +1435,10 @@ Sent to Your Parent’s Email</string>
                                 <edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="xXI-1K-L56">
-                                <rect key="frame" x="30" y="828" width="368" height="50"/>
+                                <rect key="frame" x="30" y="792" width="354" height="50"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sli-1N-tGE" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="368" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="354" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="jaN-n0-fQU"/>
                                         </constraints>
@@ -1474,7 +1489,7 @@ Sent to Your Parent’s Email</string>
                 <navigationController storyboardIdentifier="LoginNavVC" automaticallyAdjustsScrollViewInsets="NO" id="bHr-RA-yCX" customClass="LoginNavVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="h7h-Q6-GoK">
-                        <rect key="frame" x="0.0" y="59" width="430" height="44"/>
+                        <rect key="frame" x="0.0" y="48" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </navigationBar>
@@ -1492,40 +1507,40 @@ Sent to Your Parent’s Email</string>
             <objects>
                 <viewController storyboardIdentifier="UsernameCheckVC" id="n2R-T8-I1b" customClass="UsernameCheckVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="4YA-Cd-JNy">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="XCD-Eq-dfg">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="hPv-w5-A5k">
-                                <rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="137" y="50" width="140" height="52.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="hPv-w5-A5k" secondAttribute="height" multiplier="8:3" id="3G1-6h-fef"/>
                                     <constraint firstAttribute="width" constant="140" id="Tgm-h7-QiJ"/>
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="60" translatesAutoresizingMaskIntoConstraints="NO" id="b6i-JR-2Em">
-                                <rect key="frame" x="36" y="132.66666666666669" width="374" height="675.33333333333326"/>
+                                <rect key="frame" x="20" y="132.5" width="374" height="639.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username Found" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sbg-9k-ezS" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="10" y="0.0" width="354" height="29"/>
+                                        <rect key="frame" x="10" y="0.0" width="354" height="27.5"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="24"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="J71-Ge-En8">
-                                        <rect key="frame" x="10" y="89" width="354" height="586.33333333333337"/>
+                                        <rect key="frame" x="10" y="87.5" width="354" height="552"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username linked to your account" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="963-dD-SFa" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="354" height="19.333333333333332"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="354" height="19.5"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="16"/>
                                                 <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="InZ-c5-sma">
-                                                <rect key="frame" x="0.0" y="39.333333333333371" width="354" height="547"/>
+                                                <rect key="frame" x="0.0" y="39.5" width="354" height="512.5"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </tableView>
                                         </subviews>
@@ -1534,10 +1549,10 @@ Sent to Your Parent’s Email</string>
                                 <edgeInsets key="layoutMargins" top="0.0" left="10" bottom="0.0" right="10"/>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="35" translatesAutoresizingMaskIntoConstraints="NO" id="KTf-VW-iuU">
-                                <rect key="frame" x="30" y="828" width="370" height="50"/>
+                                <rect key="frame" x="30" y="792" width="354" height="50"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pa7-nj-fa0" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="354" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="t2D-jB-n8u"/>
                                         </constraints>
@@ -1587,37 +1602,37 @@ Sent to Your Parent’s Email</string>
             <objects>
                 <viewController storyboardIdentifier="AppUpdateVC" id="HsX-KJ-i6z" customClass="AppUpdateVC" customModule="WOKA" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="FXE-GF-5rc">
-                        <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                        <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="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="BackgroundSplash" translatesAutoresizingMaskIntoConstraints="NO" id="Lbh-el-EkQ">
-                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="2dT-gF-4m0">
-                                <rect key="frame" x="15" y="79" width="400" height="632.66666666666663"/>
+                                <rect key="frame" x="15" y="68" width="384" height="618.5"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="VuJ-ZQ-RH9">
-                                        <rect key="frame" x="20" y="20" width="372" height="50"/>
+                                        <rect key="frame" x="20" y="20" width="356" height="48"/>
                                     </imageView>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Uue-Q9-Cnp">
-                                        <rect key="frame" x="20" y="90" width="372" height="10"/>
+                                        <rect key="frame" x="20" y="88" width="356" height="10"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="10" id="sLg-hK-SXM"/>
                                         </constraints>
                                     </view>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppUpdate" translatesAutoresizingMaskIntoConstraints="NO" id="xdr-vX-gJM">
-                                        <rect key="frame" x="20" y="120" width="372" height="330"/>
+                                        <rect key="frame" x="20" y="118" width="356" height="317.5"/>
                                     </imageView>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HKv-C9-6Db">
-                                        <rect key="frame" x="20" y="470" width="372" height="10"/>
+                                        <rect key="frame" x="20" y="455.5" width="356" height="10"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="10" id="LwC-is-uSK"/>
                                         </constraints>
                                     </view>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Hx-6L-TGB" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="500" width="372" height="29"/>
+                                        <rect key="frame" x="20" y="485.5" width="356" height="29"/>
                                         <attributedString key="attributedText">
                                             <fragment content="New update available">
                                                 <attributes>
@@ -1630,7 +1645,7 @@ Sent to Your Parent’s Email</string>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Unlock enhanced features and improved performance with our latest app update" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="VAi-9b-TRE" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="20" y="549" width="372" height="75.666666666666629"/>
+                                        <rect key="frame" x="20" y="534.5" width="356" height="76"/>
                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="21"/>
                                         <color key="textColor" red="0.035294117649999998" green="0.0" blue="0.36470588240000001" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -1639,10 +1654,10 @@ Sent to Your Parent’s Email</string>
                                 <edgeInsets key="layoutMargins" top="20" left="20" bottom="8" right="8"/>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="HzF-hE-J99">
-                                <rect key="frame" x="15" y="838" width="400" height="50"/>
+                                <rect key="frame" x="15" y="802" width="384" height="50"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lry-pO-xkV" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="192.66666666666666" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="184.5" height="50"/>
                                         <color key="backgroundColor" name="ImageDarkBlue"/>
                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1656,7 +1671,7 @@ Sent to Your Parent’s Email</string>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Mm6-A3-H8d" customClass="LocalisedElementsButton" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="207.66666666666663" y="0.0" width="192.33333333333337" height="50"/>
+                                        <rect key="frame" x="199.5" y="0.0" width="184.5" height="50"/>
                                         <color key="backgroundColor" name="ImageDarkBlue"/>
                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1706,54 +1721,54 @@ Sent to Your Parent’s Email</string>
     </scenes>
     <designables>
         <designable name="42K-Uu-lPQ">
-            <size key="intrinsicContentSize" width="8.3333333333333339" height="23.333333333333332"/>
-        </designable>
-        <designable name="4gw-z0-s4a">
-            <size key="intrinsicContentSize" width="200.66666666666666" height="20"/>
+            <size key="intrinsicContentSize" width="6.5" height="22.5"/>
         </designable>
         <designable name="68c-1b-KSI">
-            <size key="intrinsicContentSize" width="201.66666666666666" height="21"/>
+            <size key="intrinsicContentSize" width="199" height="20.5"/>
         </designable>
         <designable name="81S-Fa-CiD">
-            <size key="intrinsicContentSize" width="8.3333333333333339" height="23.333333333333332"/>
+            <size key="intrinsicContentSize" width="6.5" height="22.5"/>
+        </designable>
+        <designable name="BUv-6a-Pym">
+            <size key="intrinsicContentSize" width="168" height="20.5"/>
         </designable>
         <designable name="DSB-Ge-wNO">
-            <size key="intrinsicContentSize" width="169" height="21"/>
+            <size key="intrinsicContentSize" width="166" height="20.5"/>
         </designable>
         <designable name="Hcd-Mm-IxW">
-            <size key="intrinsicContentSize" width="8.3333333333333339" height="23.333333333333332"/>
+            <size key="intrinsicContentSize" width="6.5" height="22.5"/>
         </designable>
         <designable name="JRR-Bk-5UP">
-            <size key="intrinsicContentSize" width="217.66666666666666" height="20"/>
+            <size key="intrinsicContentSize" width="214.5" height="19"/>
         </designable>
         <designable name="MpT-bm-drv">
-            <size key="intrinsicContentSize" width="8.3333333333333339" height="23.333333333333332"/>
+            <size key="intrinsicContentSize" width="6.5" height="22.5"/>
         </designable>
         <designable name="Skx-Ig-91N">
-            <size key="intrinsicContentSize" width="199" height="20"/>
+            <size key="intrinsicContentSize" width="196.5" height="19"/>
         </designable>
         <designable name="aPP-h8-int">
-            <size key="intrinsicContentSize" width="217.33333333333334" height="21"/>
+            <size key="intrinsicContentSize" width="215.5" height="20.5"/>
+        </designable>
+        <designable name="fe6-VY-EXE">
+            <size key="intrinsicContentSize" width="199" height="20.5"/>
         </designable>
         <designable name="iJE-dm-qal">
-            <size key="intrinsicContentSize" width="200.66666666666666" height="20"/>
+            <size key="intrinsicContentSize" width="198" height="19"/>
         </designable>
-        <designable name="m50-FZ-yVO">
-            <size key="intrinsicContentSize" width="201.66666666666666" height="21"/>
-        </designable>
-        <designable name="tgW-LH-XfR">
-            <size key="intrinsicContentSize" width="169.33333333333334" height="21"/>
+        <designable name="mYu-X2-cm3">
+            <size key="intrinsicContentSize" width="198" height="19"/>
         </designable>
         <designable name="wy2-0C-rxG">
-            <size key="intrinsicContentSize" width="201.66666666666666" height="21"/>
+            <size key="intrinsicContentSize" width="199" height="20.5"/>
         </designable>
     </designables>
     <resources>
         <image name="AppUpdate" width="325.33334350585938" height="321.66665649414062"/>
         <image name="BackgroundSplash" width="428" height="926"/>
-        <image name="Boy" width="49.666667938232422" height="50"/>
-        <image name="Girl" width="48.666667938232422" height="50"/>
-        <image name="WokaLogo" width="2224" height="450.66665649414062"/>
+        <image name="Boy" width="49.5" height="50"/>
+        <image name="Girl" width="48.5" height="50"/>
+        <image name="WokaLogo" width="2224" height="450.5"/>
         <namedColor name="ImageDarkBlue">
             <color red="0.035000000149011612" green="0.0" blue="0.36500000953674316" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
diff --git a/WOKA/Authentication/Controller/LoginVC.swift b/WOKA/Authentication/Controller/LoginVC.swift
index 4fc884b..eef1151 100644
--- a/WOKA/Authentication/Controller/LoginVC.swift
+++ b/WOKA/Authentication/Controller/LoginVC.swift
@@ -32,11 +32,17 @@ class LoginVC: UIViewController {
     @IBAction func loginBtnTapped(_ sender: LocalisedElementsButton) {
         vm.hideErrors()
         PersistentStorage.shared.addOthersCount()
-        guard let userName = userNameTF.text?.trimmingCharacters(in: .whitespaces) , let pass = passwordTF.text else{return}
+        guard let userName = userNameTF.text?.trimmingCharacters(in: .whitespaces) , let pass = passwordTF.text?.trimmingCharacters(in: .whitespaces) else{return}
         
         /*
          Check for userName
          */
+        if userName.count == 0{
+            userNameTF.rightView?.isHidden = false
+            userNameTF.setError(K.ConstantString.enterUserName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
+            return
+        }
+        
         if userName.count < 2{
             userNameTF.rightView?.isHidden = false
             userNameTF.setError("Username is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
@@ -46,6 +52,20 @@ class LoginVC: UIViewController {
         /*
          Check for password
          */
+        if pass.count == 0{
+            let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
+            let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
+            
+            vcPush.contentLabel = "Enter your password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            vcPush.mainTitleText = "Password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            
+//                vcPush.onDoneBlock = { isDone in }
+            vcPush.modalPresentationStyle = .overCurrentContext
+            vcPush.modalTransitionStyle = .crossDissolve
+            self.present(vcPush, animated: true)
+            return
+        }
+        
         if pass.count < 6{
             let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
             let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
diff --git a/WOKA/Authentication/Controller/NewPasswordVC.swift b/WOKA/Authentication/Controller/NewPasswordVC.swift
index 9684f7a..4645512 100644
--- a/WOKA/Authentication/Controller/NewPasswordVC.swift
+++ b/WOKA/Authentication/Controller/NewPasswordVC.swift
@@ -39,17 +39,30 @@ class NewPasswordVC: UIViewController {
         
     @IBAction func nextBtnTapped(_ sender: LocalisedElementsButton) {
         PersistentStorage.shared.addOthersCount()
-        guard let pass = enterNewPasswordTF.text , let confirmPass = confirmPassTF.text else{return}
+        guard let pass = enterNewPasswordTF.text?.trimmingCharacters(in: .whitespaces) , let confirmPass = confirmPassTF.text?.trimmingCharacters(in: .whitespaces) else{return}
 
         /*
          Check for password
          */
+        if pass.count == 0 || confirmPass.count == 0{
+            let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
+            let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
+            
+            vcPush.contentLabel = "Enter your password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            vcPush.mainTitleText = "Password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+//                vcPush.onDoneBlock = { isDone in }
+            vcPush.modalPresentationStyle = .overCurrentContext
+            vcPush.modalTransitionStyle = .crossDissolve
+            self.present(vcPush, animated: true)
+            return
+        }
+        
         if pass.count < 6 || confirmPass.count < 6{
             let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
             let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
             
-            vcPush.contentLabel = "Password is too short."
-            vcPush.mainTitleText = "Error"
+            vcPush.contentLabel = "Password is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            vcPush.mainTitleText = "Password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
 //                vcPush.onDoneBlock = { isDone in }
             vcPush.modalPresentationStyle = .overCurrentContext
             vcPush.modalTransitionStyle = .crossDissolve
@@ -64,8 +77,8 @@ class NewPasswordVC: UIViewController {
             let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
             let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
             
-            vcPush.contentLabel = "Password doesn't match"
-            vcPush.mainTitleText = "Error"
+            vcPush.contentLabel = "Password doesn't match".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            vcPush.mainTitleText = "Password".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
 //                vcPush.onDoneBlock = { isDone in }
             vcPush.modalPresentationStyle = .overCurrentContext
             vcPush.modalTransitionStyle = .crossDissolve
diff --git a/WOKA/Authentication/Controller/UserDetailsRegisterVC.swift b/WOKA/Authentication/Controller/UserDetailsRegisterVC.swift
index 0ca8f34..26077ae 100644
--- a/WOKA/Authentication/Controller/UserDetailsRegisterVC.swift
+++ b/WOKA/Authentication/Controller/UserDetailsRegisterVC.swift
@@ -37,6 +37,9 @@ class UserDetailsRegisterVC : UIViewController{
         super.viewWillDisappear(animated)
         navigationController?.setNavigationBarHidden(true, animated: animated)
         
+        enterNameTF.hideError()
+        enterUserNameTF.hideError()
+        
         if self.isMovingFromParent {
             // Back button was pressed
             PersistentStorage.shared.addOthersCount()
@@ -47,11 +50,17 @@ class UserDetailsRegisterVC : UIViewController{
     
     @IBAction func nextBtnTapped(_ sender: LocalisedElementsButton) {
         PersistentStorage.shared.addOthersCount()
-        guard let name = enterNameTF.text ,let userName = enterUserNameTF.text , let pass = enterPasswordTF.text else{return}
+        guard let name = enterNameTF.text?.trimmingCharacters(in: .whitespaces) ,let userName = enterUserNameTF.text?.trimmingCharacters(in: .whitespaces) , let pass = enterPasswordTF.text?.trimmingCharacters(in: .whitespaces) else{return}
         
         /*
          Check for username, minimum 3 letters required
          */
+        if userName.count == 0{
+            enterUserNameTF.rightView?.isHidden = false
+            enterUserNameTF.setError(K.ConstantString.enterUserName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
+            return
+        }
+        
         if userName.count < 3{
             enterUserNameTF.rightView?.isHidden = false
             enterUserNameTF.setError(K.ConstantString.shortUsername.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
@@ -61,6 +70,12 @@ class UserDetailsRegisterVC : UIViewController{
         /*
          Check for name
          */
+        if name.count == 0{
+            enterNameTF.rightView?.isHidden = false
+            enterNameTF.setError(K.ConstantString.enterName.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue) , show: true)
+            return
+        }
+        
         if name.count < 2{
             enterNameTF.rightView?.isHidden = false
             enterNameTF.setError("Name is too short.".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue) , show: true)
diff --git a/WOKA/Constants K/ConstantString.swift b/WOKA/Constants K/ConstantString.swift
index 70a1bc3..18a5230 100644
--- a/WOKA/Constants K/ConstantString.swift	
+++ b/WOKA/Constants K/ConstantString.swift	
@@ -24,6 +24,11 @@ extension K{
         static let shortPass = "Password is too short."
         static let shortUsername = "Username is too short."
         static let shortName = "Name is too short."
+        
+        static let required = "Required."
+        static let enterUserName = "Enter your username."
+        static let enterName = "Enter your Name."
+        static let enterPass = "Enter your password"
         static let userNameVerify = "Verifying Username"
         static let intrest = "Please select intrest"
         static let avatar = "Please select avatar"
diff --git a/WOKA/Home/Home.storyboard b/WOKA/Home/Home.storyboard
index 11b810f..f44dac1 100644
--- a/WOKA/Home/Home.storyboard
+++ b/WOKA/Home/Home.storyboard
@@ -1625,7 +1625,7 @@
         <image name="AudioBookIcon" width="33.666667938232422" height="30.333333969116211"/>
         <image name="BackArrow" width="21.333333969116211" height="21.333333969116211"/>
         <image name="BlogsIcon" width="33.333332061767578" height="33.333332061767578"/>
-        <image name="CheckMark" width="48" height="48"/>
+        <image name="CheckMark" width="10.666666984558105" height="10.666666984558105"/>
         <image name="CloseIcon" width="61.333332061767578" height="61.333332061767578"/>
         <image name="ExploreWoka" width="36.666667938232422" height="25"/>
         <image name="GamesIcon" width="33.666667938232422" height="30"/>
diff --git a/WOKA/Localized Module/hi.lproj/Localizable.strings b/WOKA/Localized Module/hi.lproj/Localizable.strings
index a503abb..b90fdc4 100644
--- a/WOKA/Localized Module/hi.lproj/Localizable.strings	
+++ b/WOKA/Localized Module/hi.lproj/Localizable.strings	
@@ -11,6 +11,7 @@
 "Please wait..." = "कृपया प्रतीक्षा करें";
 "Activate WOKA Account" = "WOKA खाता सक्रिय करें";
 "Would you like to reactivate your account?" = "क्या आप अपना खाता पुनः सक्रिय करना चाहेंगे?रें";
+"Password doesn't match" = "पासवर्ड मेल नहीं खाता";
 
 /*
  Login VC
@@ -44,6 +45,16 @@
 "Enter your password" = "अपना पासवर्ड दर्ज करें";
 "Confirm your password" = "अपने पासवर्ड की पुष्टि करें";
 
+/*
+ Support VC
+ */
+"Message" = "संदेश";
+"Subject" = "विषय";
+"Please select subject" = "कृपया विषय चुनें";
+"Message is too short" = "संदेश बहुत छोटा है";
+"Password" = "पासवर्ड";
+"Enter your Name." = "अपना नाम दर्ज करें।";
+
 /*
  Carousel Text
  */
@@ -258,3 +269,5 @@
  */
 "SING ALONG & DANCE" = "साथ गायें और नाचें";
 "SING NOW" = "अभी गायें";
+"Enter your username." = "अपना उपयोगकर्ता नाम दर्ज करें";
+"Required." = "कृपया दर्ज करे";
diff --git a/WOKA/Shop/Controller/ShopProductsVC.swift b/WOKA/Shop/Controller/ShopProductsVC.swift
index ded3411..45c2458 100644
--- a/WOKA/Shop/Controller/ShopProductsVC.swift
+++ b/WOKA/Shop/Controller/ShopProductsVC.swift
@@ -116,6 +116,7 @@ extension ShopProductsVC : CollectionViewSRC{
                 Utilities.startProgressHUD()
                 vm.pageNo = 0
                 vm.getShopProducts(subCategoryID: selectedSubCategory)
+                productCV.setContentOffset(CGPoint(x: 0, y: 0), animated: true)
             }
         default:
             break
diff --git a/WOKA/SideBarNav/Controller/ContactSupportVC.swift b/WOKA/SideBarNav/Controller/ContactSupportVC.swift
index d0daee7..2aab200 100644
--- a/WOKA/SideBarNav/Controller/ContactSupportVC.swift
+++ b/WOKA/SideBarNav/Controller/ContactSupportVC.swift
@@ -48,6 +48,15 @@ class ContactSupportVC: UIViewController {
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         navigationController?.setNavigationBarHidden(true, animated: animated)
+        
+        if let errorView = errorViews.object(forKey: emailTF) {
+            errorView.isHidden = true
+        }
+        
+        if let errorView = errorViews.object(forKey: nameTF) {
+            errorView.isHidden = true
+        }
+        
         if self.isMovingFromParent {
             // Back button was pressed
             PersistentStorage.shared.addOthersCount()
@@ -61,10 +70,11 @@ class ContactSupportVC: UIViewController {
         /*
          if user is guest check for name and email
          */
+        guard let email = emailTF.text?.trimmingCharacters(in: .whitespaces), let name = nameTF.text?.trimmingCharacters(in: .whitespaces), let message = messageTextView.text?.trimmingCharacters(in: .whitespaces) else{return}
         if AuthFunc.shareInstance.getUserType() == 3{
             if emailTF.text != nil{
                 //validate email fiirst
-                let emailValidate = EmailValidation(email: emailTF.text!).validate()
+                let emailValidate = EmailValidation(email: email).validate()
                 if  emailValidate != .isCorrect{
                     emailTF.rightView?.isHidden = false
                     emailTF.setError(emailValidate.rawValue.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
@@ -72,7 +82,16 @@ class ContactSupportVC: UIViewController {
                 }
             }
             
-            if nameTF.text!.count < 3{
+            if name.count == 0{
+                /*
+                 Check for username
+                 */
+                nameTF.rightView?.isHidden = false
+                nameTF.setError(K.ConstantString.required.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue), show: true)
+                return
+            }
+            
+            if name.count < 3{
                 /*
                  Check for username
                  */
@@ -87,18 +106,29 @@ class ContactSupportVC: UIViewController {
             let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
             
             vcPush.contentLabel = "Please select subject".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
-            vcPush.mainTitleText = "Error".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            vcPush.mainTitleText = "Subject".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
             vcPush.modalPresentationStyle = .overCurrentContext
             vcPush.modalTransitionStyle = .crossDissolve
             self.present(vcPush, animated: true)
             return
         }
         
-        if messageTextView.text.count < 3 || messageTextView.text == nil{
+        if message.count == 0{
+            let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
+            let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
+            vcPush.contentLabel = K.ConstantString.required.localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            vcPush.mainTitleText = "Message".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            vcPush.modalPresentationStyle = .overCurrentContext
+            vcPush.modalTransitionStyle = .crossDissolve
+            self.present(vcPush, animated: true)
+            return
+        }
+        
+        if message.count < 3{
             let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
             let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.alertCustomVC) as! AlertCustomVC
             vcPush.contentLabel = "Message is too short".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
-            vcPush.mainTitleText = "Error".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
+            vcPush.mainTitleText = "Message".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
             vcPush.modalPresentationStyle = .overCurrentContext
             vcPush.modalTransitionStyle = .crossDissolve
             self.present(vcPush, animated: true)
diff --git a/WOKA/SideBarNav/SideBarNav.storyboard b/WOKA/SideBarNav/SideBarNav.storyboard
index 27edcdf..917f769 100644
--- a/WOKA/SideBarNav/SideBarNav.storyboard
+++ b/WOKA/SideBarNav/SideBarNav.storyboard
@@ -167,7 +167,7 @@
                                             <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="vjt-jD-4f3" userLabel="Email Stack">
                                                 <rect key="frame" x="15" y="253.5" width="384" height="55"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="E-Mail" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ma-au-unt">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="E-Mail" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ma-au-unt" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="384" height="0.0"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -197,7 +197,7 @@
                                             <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="2qP-Pd-7IW" userLabel="Name">
                                                 <rect key="frame" x="15" y="253.5" width="384" height="55"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9nm-R6-MHb">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9nm-R6-MHb" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="384" height="0.0"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -227,7 +227,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="SlR-If-pxh" userLabel="Subject">
                                                 <rect key="frame" x="15" y="278" width="384" height="77"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subject" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k7q-3i-LMr">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Subject" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k7q-3i-LMr" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="384" height="22"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -261,7 +261,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="gXQ-Yb-IGC" userLabel="Message">
                                                 <rect key="frame" x="15" y="404" width="384" height="155"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="csz-ff-Kvd">
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Message" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="csz-ff-Kvd" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="384" height="22"/>
                                                         <fontDescription key="fontDescription" name="Exo2-Regular" family="Exo 2" pointSize="18"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -864,16 +864,16 @@ Retry after some time</string>
     </scenes>
     <designables>
         <designable name="arD-av-w7V">
-            <size key="intrinsicContentSize" width="119.5" height="21"/>
+            <size key="intrinsicContentSize" width="169.5" height="21"/>
         </designable>
         <designable name="fZS-d6-t0h">
-            <size key="intrinsicContentSize" width="119" height="21"/>
+            <size key="intrinsicContentSize" width="169" height="21"/>
         </designable>
         <designable name="fiK-Gg-JDj">
-            <size key="intrinsicContentSize" width="119.5" height="21"/>
+            <size key="intrinsicContentSize" width="169.5" height="21"/>
         </designable>
         <designable name="zMI-2r-pRQ">
-            <size key="intrinsicContentSize" width="119" height="21"/>
+            <size key="intrinsicContentSize" width="169" height="21"/>
         </designable>
     </designables>
     <resources>
diff --git a/WOKA/SideBarNav/ViewModel/ProfileVM.swift b/WOKA/SideBarNav/ViewModel/ProfileVM.swift
index 9a5bba6..65c7ea9 100644
--- a/WOKA/SideBarNav/ViewModel/ProfileVM.swift
+++ b/WOKA/SideBarNav/ViewModel/ProfileVM.swift
@@ -66,17 +66,17 @@ class ProfileVM{
             } else{
                 enableDisableNextBtn(enable: false)
             }
-        }
-        
-        if let genderData = data.genderData ,let id = genderData.id {
-            if gender == id{
-                enableDisableNextBtn(enable: false)
+        }else{
+            if let genderData = data.genderData ,let id = genderData.id {
+                if gender == id{
+                    enableDisableNextBtn(enable: false)
+                }else{
+                    enableDisableNextBtn(enable: true)
+                }
             }else{
                 enableDisableNextBtn(enable: true)
             }
-        }else{
-            enableDisableNextBtn(enable: true)
-        }
+        }        
     }
     
     private func enableDisableNextBtn(enable : Bool){
diff --git a/WOKA/Theme/Controller/PlayerVC.swift b/WOKA/Theme/Controller/PlayerVC.swift
index 19c33af..cc11a0a 100644
--- a/WOKA/Theme/Controller/PlayerVC.swift
+++ b/WOKA/Theme/Controller/PlayerVC.swift
@@ -223,6 +223,14 @@ class PlayerVC: JWPlayerViewController, JWPlayerViewControllerDelegate{
         super.jwplayer(player, didLoadPlaylistItem: item, at: index)
         print("didLoadPlaylistItem ", index)
         
+        // if currentplaylist index is not set, and the video index that we got from back screen check with the load index
+        if contentType == .webSeries{
+            if let videoIndex,vm.currentPlayingIndex == -1 && (index != videoIndex){
+                return
+            }
+        }
+        
+        
         if vm.currentPlayingIndex != -1 && vm.currentPlayingIndex != index{
             // so update the loaded index and increase the current playing index
             vm.updateUserView()
diff --git a/WOKA/Theme/Controller/ThemeOneVC.swift b/WOKA/Theme/Controller/ThemeOneVC.swift
index c36177c..a0965b9 100644
--- a/WOKA/Theme/Controller/ThemeOneVC.swift
+++ b/WOKA/Theme/Controller/ThemeOneVC.swift
@@ -110,7 +110,9 @@ class ThemeOneVC: UIViewController {
     }
     
     override func viewDidLayoutSubviews() {
-        vm.playerLayer.frame = self.liveTvPlayer.bounds
+        if vm.playerLayer != nil{
+            vm.playerLayer.frame = self.liveTvPlayer.bounds
+        }
     }
     
     // Define a function to customize tab bar item icon size