diff --git a/WOKA.xcodeproj/project.pbxproj b/WOKA.xcodeproj/project.pbxproj
index d446b77..b605ed5 100644
--- a/WOKA.xcodeproj/project.pbxproj
+++ b/WOKA.xcodeproj/project.pbxproj
@@ -148,6 +148,7 @@
 		52A6DCC92C4F906900F63C51 /* CartListingDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A6DCC82C4F906900F63C51 /* CartListingDM.swift */; };
 		52A6DCCC2C4F929B00F63C51 /* CartListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A6DCCA2C4F929B00F63C51 /* CartListCell.swift */; };
 		52A6DCCD2C4F929B00F63C51 /* CartListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 52A6DCCB2C4F929B00F63C51 /* CartListCell.xib */; };
+		52A8C9902C75B91F00AAE156 /* WOKA.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 52A8C98E2C75B91F00AAE156 /* WOKA.xcdatamodeld */; };
 		52A981CE2C1AFE66000E0BEC /* FavouriteListingDM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A981CD2C1AFE66000E0BEC /* FavouriteListingDM.swift */; };
 		52A981D02C1AFEE8000E0BEC /* MyListVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A981CF2C1AFEE8000E0BEC /* MyListVM.swift */; };
 		52A981D72C1B0E27000E0BEC /* FavouriteCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52A981D52C1B0E27000E0BEC /* FavouriteCell.swift */; };
@@ -321,7 +322,6 @@
 		9C9BEEC72BEE1BBF004ECC2F /* CollectionViewCenteredFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C9BEEC62BEE1BBF004ECC2F /* CollectionViewCenteredFlowLayout.swift */; };
 		9CA7C6C02C1093E500D73742 /* ProfileVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CA7C6BF2C1093E500D73742 /* ProfileVC.swift */; };
 		9CA7C6C22C1095B600D73742 /* ProfileVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CA7C6C12C1095B600D73742 /* ProfileVM.swift */; };
-		9CB06D2C2C7506B500B82096 /* WOKA.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9CB06D2A2C7506B500B82096 /* WOKA.xcdatamodeld */; };
 		9CB3D0852C37BA530062869D /* Karaoke.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9CB3D0842C37BA530062869D /* Karaoke.storyboard */; };
 		9CB3D08B2C37BBA50062869D /* KaraokeListingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CB3D08A2C37BBA50062869D /* KaraokeListingVC.swift */; };
 		9CB3D08D2C37CDD60062869D /* KaraokeListingVM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CB3D08C2C37CDD50062869D /* KaraokeListingVM.swift */; };
@@ -545,6 +545,7 @@
 		52A6DCC82C4F906900F63C51 /* CartListingDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartListingDM.swift; sourceTree = "<group>"; };
 		52A6DCCA2C4F929B00F63C51 /* CartListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CartListCell.swift; sourceTree = "<group>"; };
 		52A6DCCB2C4F929B00F63C51 /* CartListCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CartListCell.xib; sourceTree = "<group>"; };
+		52A8C98F2C75B91F00AAE156 /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = "<group>"; };
 		52A981CD2C1AFE66000E0BEC /* FavouriteListingDM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavouriteListingDM.swift; sourceTree = "<group>"; };
 		52A981CF2C1AFEE8000E0BEC /* MyListVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyListVM.swift; sourceTree = "<group>"; };
 		52A981D52C1B0E27000E0BEC /* FavouriteCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavouriteCell.swift; sourceTree = "<group>"; };
@@ -708,7 +709,6 @@
 		9C9BEEC62BEE1BBF004ECC2F /* CollectionViewCenteredFlowLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CollectionViewCenteredFlowLayout.swift; sourceTree = "<group>"; };
 		9CA7C6BF2C1093E500D73742 /* ProfileVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileVC.swift; sourceTree = "<group>"; };
 		9CA7C6C12C1095B600D73742 /* ProfileVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileVM.swift; sourceTree = "<group>"; };
-		9CB06D2B2C7506B500B82096 /* WOKA.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WOKA.xcdatamodel; sourceTree = "<group>"; };
 		9CB3D0842C37BA530062869D /* Karaoke.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Karaoke.storyboard; sourceTree = "<group>"; };
 		9CB3D08A2C37BBA50062869D /* KaraokeListingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KaraokeListingVC.swift; sourceTree = "<group>"; };
 		9CB3D08C2C37CDD50062869D /* KaraokeListingVM.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KaraokeListingVM.swift; sourceTree = "<group>"; };
@@ -944,7 +944,7 @@
 				9C535DC82C00C34000DA6DCD /* Theme */,
 				52DAC6462C21761700E2F85B /* WebSeries */,
 				9C834ED92C1C20EC00B29A9C /* WOKA.entitlements */,
-				9CB06D2A2C7506B500B82096 /* WOKA.xcdatamodeld */,
+				52A8C98E2C75B91F00AAE156 /* WOKA.xcdatamodeld */,
 				52ACC1292C610EC900791528 /* PersistentStorage.swift */,
 			);
 			path = WOKA;
@@ -2460,7 +2460,7 @@
 				52ACC1262C610CBC00791528 /* UserClicks+CoreDataProperties.swift in Sources */,
 				9CBCB29D2BE4D6BB007D7934 /* LoginVM.swift in Sources */,
 				52BBFCB42C5275E100F7D0D1 /* AddressListVM.swift in Sources */,
-				9CB06D2C2C7506B500B82096 /* WOKA.xcdatamodeld in Sources */,
+				52A8C9902C75B91F00AAE156 /* WOKA.xcdatamodeld in Sources */,
 				524C42312C0499560016A11C /* NotificationCenterReloads.swift in Sources */,
 				9C8C4FAE2C1315410017DD3B /* WebViewVC.swift in Sources */,
 				52BBFCB62C52764B00F7D0D1 /* AddressListDM.swift in Sources */,
@@ -3022,8 +3022,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/jwplayer/JWPlayerKit-package.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 4.19.1;
+				kind = exactVersion;
+				version = 4.19.1;
 			};
 		};
 		528F26EC2C6B7BD1003E4D99 /* XCRemoteSwiftPackageReference "OneSignal-XCFramework" */ = {
@@ -3096,14 +3096,14 @@
 /* End XCSwiftPackageProductDependency section */
 
 /* Begin XCVersionGroup section */
-		9CB06D2A2C7506B500B82096 /* WOKA.xcdatamodeld */ = {
+		52A8C98E2C75B91F00AAE156 /* WOKA.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				9CB06D2B2C7506B500B82096 /* WOKA.xcdatamodel */,
+				52A8C98F2C75B91F00AAE156 /* WOKA.xcdatamodel */,
 			);
-			currentVersion = 9CB06D2B2C7506B500B82096 /* WOKA.xcdatamodel */;
+			currentVersion = 52A8C98F2C75B91F00AAE156 /* WOKA.xcdatamodel */;
 			name = WOKA.xcdatamodeld;
-			path = /Users/bilal/Desktop/woka_native_ios_swift/WOKA/WOKA.xcdatamodeld;
+			path = /Users/macbookpro/Desktop/WOKA/WOKA/WOKA.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
 		};
diff --git a/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard b/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard
index 740d9a1..996c0fc 100644
--- a/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard
+++ b/WOKA/Authentication/Base.lproj/AuthenticationSB.storyboard
@@ -43,28 +43,28 @@
                                 </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="201.33333333333337"/>
+                                <rect key="frame" x="20" y="172.66666666666663" width="390" height="203"/>
                                 <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="32.666666666666664"/>
+                                        <rect key="frame" x="10" y="0.0" width="370" height="33.666666666666664"/>
                                         <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="102.66666666666666" width="370" height="98.666666666666657"/>
+                                        <rect key="frame" x="10" y="103.66666666666666" width="370" height="99.333333333333343"/>
                                         <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="98.666666666666671"/>
+                                                <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="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="18.666666666666668"/>
+                                                        <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 email" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DSB-Ge-wNO" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="33.666666666666686" width="370" height="50"/>
+                                                        <rect key="frame" x="0.0" y="34.333333333333371" width="370" 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="98.666666666666686" width="370" height="0.0"/>
+                                                        <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"/>
@@ -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.66666666666663" width="370" height="101.33333333333337"/>
+                                <rect key="frame" x="30" y="776" width="370" height="102"/>
                                 <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="16.333333333333332"/>
+                                        <rect key="frame" x="0.0" y="0.0" 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>
                                     <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="51.333333333333371" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="52" width="370" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="4eR-zk-hWT"/>
                                         </constraints>
@@ -204,10 +204,10 @@
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="mhH-Ov-1nU">
-                                <rect key="frame" x="20" y="172.66666666666666" width="390" height="277.66666666666674"/>
+                                <rect key="frame" x="20" y="172.66666666666663" width="390" height="281"/>
                                 <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="65.333333333333329"/>
+                                        <rect key="frame" x="10" y="0.0" width="370" height="67.333333333333329"/>
                                         <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,16 +215,16 @@ 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="135.33333333333331" width="370" height="142.33333333333331"/>
+                                        <rect key="frame" x="10" y="137.33333333333337" width="370" height="143.66666666666663"/>
                                         <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="18.666666666666668"/>
+                                                <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>
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="HGA-bw-mMW">
-                                                <rect key="frame" x="0.0" y="33.666666666666686" width="370" height="60"/>
+                                                <rect key="frame" x="0.0" y="34.333333333333314" width="370" 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"/>
@@ -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="108.66666666666669" width="370" height="18.666666666666671"/>
+                                                <rect key="frame" x="0.0" y="109.33333333333331" width="370" height="19.333333333333343"/>
                                                 <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="134.66666666666669" width="370" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="136" width="370" 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="142.33333333333331" width="370" height="0.0"/>
+                                                <rect key="frame" x="0.0" y="143.66666666666669" 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"/>
@@ -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="760.33333333333337" width="370" height="117.66666666666663"/>
+                                <rect key="frame" x="30" y="759.33333333333337" width="370" height="118.66666666666663"/>
                                 <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="32.666666666666664"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="370" height="33.666666666666664"/>
                                         <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="67.666666666666629" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="68.666666666666629" width="370" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="KmJ-vu-pxT"/>
                                         </constraints>
@@ -376,28 +376,28 @@ Sent to Your Parent’s Email</string>
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="L80-bN-1T0">
-                                <rect key="frame" x="20" y="172.66666666666666" width="390" height="505.33333333333337"/>
+                                <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="63"/>
+                                        <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="133.00000000000003" width="370" height="372.33333333333337"/>
+                                        <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="98.666666666666671"/>
+                                                <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="18.666666666666668"/>
+                                                        <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="33.666666666666629" width="370" height="50"/>
+                                                        <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>
@@ -416,7 +416,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="RuI-5z-pyW">
-                                                        <rect key="frame" x="0.0" y="98.666666666666629" width="370" height="0.0"/>
+                                                        <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"/>
@@ -424,16 +424,16 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="qSD-g5-OZA">
-                                                <rect key="frame" x="0.0" y="128.66666666666663" width="370" height="98.666666666666686"/>
+                                                <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="18.666666666666668"/>
+                                                        <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="33.666666666666686" width="370" height="50"/>
+                                                        <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>
@@ -452,7 +452,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="Y3K-h2-Gbg">
-                                                        <rect key="frame" x="0.0" y="98.666666666666686" width="370" height="0.0"/>
+                                                        <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"/>
@@ -460,16 +460,16 @@ Sent to Your Parent’s Email</string>
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="hWX-C0-soL">
-                                                <rect key="frame" x="0.0" y="257.33333333333331" width="370" height="115"/>
+                                                <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="18.666666666666668"/>
+                                                        <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="33.666666666666629" width="370" height="50"/>
+                                                        <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>
@@ -488,7 +488,7 @@ Sent to Your Parent’s Email</string>
                                                         </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="98.666666666666629" width="370" height="16.333333333333329"/>
+                                                        <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"/>
@@ -870,35 +870,35 @@ Sent to Your Parent’s Email</string>
                                 <rect key="frame" x="0.0" y="107.66666666666669" width="430" height="790.33333333333326"/>
                                 <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="765.33333333333337"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="430" height="768.66666666666663"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Y9q-mR-AlW">
                                                 <rect key="frame" x="20" y="0.0" width="390" height="62.333333333333336"/>
                                                 <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.333333333333343" width="390" height="443.33333333333326"/>
+                                                <rect key="frame" x="20" y="62.333333333333314" width="390" height="446"/>
                                                 <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="31.666666666666668"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="390" height="32.666666666666664"/>
                                                         <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="101.66666666666666" width="390" height="341.66666666666674"/>
+                                                        <rect key="frame" x="0.0" y="102.66666666666671" width="390" height="343.33333333333326"/>
                                                         <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="98.666666666666671"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="390" height="99.333333333333329"/>
                                                                 <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="18.666666666666668"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="390" 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" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="68c-1b-KSI" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                                        <rect key="frame" x="0.0" y="33.666666666666629" width="390" height="50"/>
+                                                                        <rect key="frame" x="0.0" y="34.333333333333314" width="390" height="50"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                                         <constraints>
@@ -917,7 +917,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="98.666666666666629" width="390" height="0.0"/>
+                                                                        <rect key="frame" x="0.0" y="99.333333333333314" width="390" 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 +925,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="128.66666666666663" width="390" height="133"/>
+                                                                <rect key="frame" x="0.0" y="129.33333333333331" width="390" height="134"/>
                                                                 <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="98.666666666666671"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="390" height="99.333333333333329"/>
                                                                         <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="18.666666666666668"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="390" 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" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iJE-dm-qal" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                                                <rect key="frame" x="0.0" y="33.666666666666686" width="390" height="50"/>
+                                                                                <rect key="frame" x="0.0" y="34.333333333333314" width="390" height="50"/>
                                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                                                 <constraints>
@@ -956,7 +956,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="98.666666666666686" width="390" height="0.0"/>
+                                                                                <rect key="frame" x="0.0" y="99.333333333333314" width="390" 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 +964,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="103.66666666666669" width="390" height="29.333333333333343"/>
+                                                                        <rect key="frame" x="0.0" y="104.33333333333331" width="390" height="29.666666666666657"/>
                                                                         <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.333333333333332"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="132.66666666666666" height="29.666666666666668"/>
                                                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                                                 <state key="normal" title="Button"/>
                                                                                 <buttonConfiguration key="configuration" style="plain" title="Forgot Username?">
@@ -978,7 +978,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.66666666666669" y="0.0" width="130.33333333333331" height="29.333333333333332"/>
+                                                                                <rect key="frame" x="259" y="0.0" width="131" height="29.666666666666668"/>
                                                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                                                 <state key="normal" title="Button"/>
                                                                                 <buttonConfiguration key="configuration" style="plain" title="Forgot Password?">
@@ -993,7 +993,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="291.66666666666669" width="390" height="50"/>
+                                                                <rect key="frame" x="0.0" y="293.33333333333331" width="390" height="50"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="50" id="Tle-PZ-1B4"/>
                                                                 </constraints>
@@ -1012,14 +1012,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="505.66666666666669" width="390" height="124.66666666666669"/>
+                                                <rect key="frame" x="20" y="508.33333333333331" width="390" height="124.66666666666669"/>
                                                 <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="630.33333333333337" width="390" height="105"/>
+                                                <rect key="frame" x="20" y="633" width="390" height="105.66666666666663"/>
                                                 <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"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="390" height="35.666666666666664"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <state key="normal" title="Button"/>
                                                         <buttonConfiguration key="configuration" style="plain" title="Continue as a Guest">
@@ -1030,7 +1030,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" width="390" height="50"/>
+                                                        <rect key="frame" x="0.0" y="55.666666666666742" width="390" height="50"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="50" id="sfz-a2-WZy"/>
                                                         </constraints>
@@ -1047,7 +1047,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="735.33333333333337" width="390" height="30"/>
+                                                <rect key="frame" x="20" y="738.66666666666674" width="390" 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"/>
@@ -1116,25 +1116,25 @@ Sent to Your Parent’s Email</string>
                                 </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="201.33333333333337"/>
+                                <rect key="frame" x="20" y="172.66666666666663" width="390" height="203"/>
                                 <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="32.666666666666664"/>
+                                        <rect key="frame" x="10" y="0.0" width="370" height="33.666666666666664"/>
                                         <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="102.66666666666666" width="370" height="98.666666666666657"/>
+                                        <rect key="frame" x="10" y="103.66666666666666" width="370" height="99.333333333333343"/>
                                         <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="18.666666666666668"/>
+                                                <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="wy2-0C-rxG" customClass="TextFieldShadow" customModule="WOKA" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="33.666666666666686" width="370" height="50"/>
+                                                <rect key="frame" x="0.0" y="34.333333333333371" width="370" height="50"/>
                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <color key="tintColor" name="TextDarkBlue"/>
                                                 <constraints>
@@ -1153,7 +1153,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="98.666666666666686" width="370" height="0.0"/>
+                                                <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"/>
@@ -1164,16 +1164,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.66666666666663" width="370" height="101.33333333333337"/>
+                                <rect key="frame" x="30" y="776" width="370" height="102"/>
                                 <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="16.333333333333332"/>
+                                        <rect key="frame" x="0.0" y="0.0" 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>
                                     <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="51.333333333333371" width="370" height="50"/>
+                                        <rect key="frame" x="0.0" y="52" width="370" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="I7D-T4-sU1"/>
                                         </constraints>
@@ -1236,28 +1236,28 @@ Sent to Your Parent’s Email</string>
                                 </constraints>
                             </imageView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="70" translatesAutoresizingMaskIntoConstraints="NO" id="ph5-wC-m3B">
-                                <rect key="frame" x="20" y="172.66666666666663" width="390" height="339"/>
+                                <rect key="frame" x="20" y="172.66666666666666" width="390" height="341.33333333333337"/>
                                 <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="31.666666666666668"/>
+                                        <rect key="frame" x="10" y="0.0" width="370" height="32.666666666666664"/>
                                         <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="101.66666666666664" width="370" height="237.33333333333337"/>
+                                        <rect key="frame" x="10" y="102.66666666666667" width="370" height="238.66666666666663"/>
                                         <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="98.666666666666671"/>
+                                                <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="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="18.666666666666668"/>
+                                                        <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 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="33.666666666666686" width="370" height="50"/>
+                                                        <rect key="frame" x="0.0" y="34.333333333333371" width="370" height="50"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <color key="tintColor" name="TextDarkBlue"/>
                                                         <constraints>
@@ -1276,7 +1276,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="98.666666666666686" width="370" height="0.0"/>
+                                                        <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"/>
@@ -1284,16 +1284,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="138.66666666666669" width="370" height="98.666666666666686"/>
+                                                <rect key="frame" x="0.0" y="139.33333333333337" width="370" height="99.333333333333314"/>
                                                 <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="18.666666666666668"/>
+                                                        <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="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="33.666666666666686" width="370" height="50"/>
+                                                        <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>
@@ -1312,7 +1312,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="98.666666666666686" width="370" height="0.0"/>
+                                                        <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"/>
@@ -1496,17 +1496,17 @@ Sent to Your Parent’s Email</string>
                         <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="428" height="932"/>
+                                <rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
                             </imageView>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="WokaLogo" translatesAutoresizingMaskIntoConstraints="NO" id="hPv-w5-A5k">
-                                <rect key="frame" x="144" y="50" width="140" height="52.666666666666657"/>
+                                <rect key="frame" x="145" y="50" width="140" height="52.666666666666657"/>
                                 <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="34" y="132.66666666666669" width="374" height="675.33333333333326"/>
+                                <rect key="frame" x="36" y="132.66666666666669" width="374" height="675.33333333333326"/>
                                 <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"/>
@@ -1534,10 +1534,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="368" height="50"/>
+                                <rect key="frame" x="30" y="828" width="370" 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="368" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="370" height="50"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="50" id="t2D-jB-n8u"/>
                                         </constraints>
@@ -1706,46 +1706,46 @@ Sent to Your Parent’s Email</string>
     </scenes>
     <designables>
         <designable name="42K-Uu-lPQ">
-            <size key="intrinsicContentSize" width="6.666666666666667" height="22.666666666666668"/>
+            <size key="intrinsicContentSize" width="8.3333333333333339" height="23.333333333333332"/>
         </designable>
         <designable name="4gw-z0-s4a">
-            <size key="intrinsicContentSize" width="198" height="19"/>
+            <size key="intrinsicContentSize" width="200.66666666666666" height="20"/>
         </designable>
         <designable name="68c-1b-KSI">
-            <size key="intrinsicContentSize" width="199" height="20.333333333333332"/>
+            <size key="intrinsicContentSize" width="201.66666666666666" height="21"/>
         </designable>
         <designable name="81S-Fa-CiD">
-            <size key="intrinsicContentSize" width="6.666666666666667" height="22.666666666666668"/>
+            <size key="intrinsicContentSize" width="8.3333333333333339" height="23.333333333333332"/>
         </designable>
         <designable name="DSB-Ge-wNO">
-            <size key="intrinsicContentSize" width="166" height="20.666666666666668"/>
+            <size key="intrinsicContentSize" width="169" height="21"/>
         </designable>
         <designable name="Hcd-Mm-IxW">
-            <size key="intrinsicContentSize" width="6.666666666666667" height="22.666666666666668"/>
+            <size key="intrinsicContentSize" width="8.3333333333333339" height="23.333333333333332"/>
         </designable>
         <designable name="JRR-Bk-5UP">
-            <size key="intrinsicContentSize" width="214.33333333333334" height="19"/>
+            <size key="intrinsicContentSize" width="217.66666666666666" height="20"/>
         </designable>
         <designable name="MpT-bm-drv">
-            <size key="intrinsicContentSize" width="6.666666666666667" height="22.666666666666668"/>
+            <size key="intrinsicContentSize" width="8.3333333333333339" height="23.333333333333332"/>
         </designable>
         <designable name="Skx-Ig-91N">
-            <size key="intrinsicContentSize" width="196.33333333333334" height="19"/>
+            <size key="intrinsicContentSize" width="199" height="20"/>
         </designable>
         <designable name="aPP-h8-int">
-            <size key="intrinsicContentSize" width="215.66666666666666" height="20.666666666666668"/>
+            <size key="intrinsicContentSize" width="217.33333333333334" height="21"/>
         </designable>
         <designable name="iJE-dm-qal">
-            <size key="intrinsicContentSize" width="198" height="19"/>
+            <size key="intrinsicContentSize" width="200.66666666666666" height="20"/>
         </designable>
         <designable name="m50-FZ-yVO">
-            <size key="intrinsicContentSize" width="199" height="20.666666666666668"/>
+            <size key="intrinsicContentSize" width="201.66666666666666" height="21"/>
         </designable>
         <designable name="tgW-LH-XfR">
-            <size key="intrinsicContentSize" width="168" height="20.666666666666668"/>
+            <size key="intrinsicContentSize" width="169.33333333333334" height="21"/>
         </designable>
         <designable name="wy2-0C-rxG">
-            <size key="intrinsicContentSize" width="199" height="20.666666666666668"/>
+            <size key="intrinsicContentSize" width="201.66666666666666" height="21"/>
         </designable>
     </designables>
     <resources>
diff --git a/WOKA/Authentication/Controller/EmailVC.swift b/WOKA/Authentication/Controller/EmailVC.swift
index a8c1983..5eb4ca0 100644
--- a/WOKA/Authentication/Controller/EmailVC.swift
+++ b/WOKA/Authentication/Controller/EmailVC.swift
@@ -42,6 +42,8 @@ class EmailVC: UIViewController {
             // Back button was pressed
             PersistentStorage.shared.addOthersCount()
         }
+        
+        enterEmailTF.hideError()
     }
     
     @IBAction func nextBtnTapped(_ sender: LocalisedElementsButton) {
diff --git a/WOKA/Authentication/Controller/LoginVC.swift b/WOKA/Authentication/Controller/LoginVC.swift
index 7d92387..4fc884b 100644
--- a/WOKA/Authentication/Controller/LoginVC.swift
+++ b/WOKA/Authentication/Controller/LoginVC.swift
@@ -32,7 +32,7 @@ class LoginVC: UIViewController {
     @IBAction func loginBtnTapped(_ sender: LocalisedElementsButton) {
         vm.hideErrors()
         PersistentStorage.shared.addOthersCount()
-        guard let userName = userNameTF.text , let pass = passwordTF.text else{return}
+        guard let userName = userNameTF.text?.trimmingCharacters(in: .whitespaces) , let pass = passwordTF.text else{return}
         
         /*
          Check for userName
diff --git a/WOKA/Home/Home.storyboard b/WOKA/Home/Home.storyboard
index ecdb5d9..11b810f 100644
--- a/WOKA/Home/Home.storyboard
+++ b/WOKA/Home/Home.storyboard
@@ -1083,7 +1083,7 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="i8e-Ix-aOR">
                                                         <rect key="frame" x="0.0" y="0.0" width="430" height="31"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WebSeries (English)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xht-7u-pAV" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WEBSERIES (ENGLISH)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xht-7u-pAV" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                                 <rect key="frame" x="10" y="0.0" width="410" height="31"/>
                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                                 <color key="textColor" name="TextDarkBlue"/>
@@ -1135,7 +1135,7 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5FA-pO-H2O">
                                                         <rect key="frame" x="0.0" y="0.0" width="430" height="31"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WebSeries (Hindi)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UTS-hr-ix6" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WEBSERIES (HINDI)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UTS-hr-ix6" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                                 <rect key="frame" x="10" y="0.0" width="410" height="31"/>
                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                                 <color key="textColor" name="TextDarkBlue"/>
@@ -1187,7 +1187,7 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xQU-Hb-duc">
                                                         <rect key="frame" x="0.0" y="0.0" width="430" height="31"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Audio Books" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uOV-bc-Z6x" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AUDIO BOOKS" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uOV-bc-Z6x" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                                 <rect key="frame" x="10" y="0.0" width="410" height="31"/>
                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                                 <color key="textColor" name="TextDarkBlue"/>
@@ -1239,7 +1239,7 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YGM-QR-sbm">
                                                         <rect key="frame" x="0.0" y="0.0" width="430" height="31"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Karaoke" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JBX-qP-uJM" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="KARAOKE" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JBX-qP-uJM" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                                 <rect key="frame" x="10" y="0.0" width="410" height="31"/>
                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                                 <color key="textColor" name="TextDarkBlue"/>
@@ -1291,7 +1291,7 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="V6u-Uf-Yc7">
                                                         <rect key="frame" x="0.0" y="0.0" width="430" height="31"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Games" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qph-Fh-w3E" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="GAMES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qph-Fh-w3E" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
                                                                 <rect key="frame" x="10" y="0.0" width="410" height="31"/>
                                                                 <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="18"/>
                                                                 <color key="textColor" name="TextDarkBlue"/>
diff --git a/WOKA/Home/ViewModel/MyListVM.swift b/WOKA/Home/ViewModel/MyListVM.swift
index 49fa971..fc57bad 100644
--- a/WOKA/Home/ViewModel/MyListVM.swift
+++ b/WOKA/Home/ViewModel/MyListVM.swift
@@ -32,6 +32,8 @@ class MyListVM{
             vc.guestLoginView.isHidden = false
             vc.guestLoginStack.isHidden = false
             vc.scrollView.isHidden = true
+            startShimmer(load: false)
+
             return
         }
         
diff --git a/WOKA/Karaoke/Controller/JWKaraokePlayerVC.swift b/WOKA/Karaoke/Controller/JWKaraokePlayerVC.swift
index 357dd44..ef368bb 100644
--- a/WOKA/Karaoke/Controller/JWKaraokePlayerVC.swift
+++ b/WOKA/Karaoke/Controller/JWKaraokePlayerVC.swift
@@ -72,7 +72,7 @@ class JWKaraokePlayerVC: JWPlayerViewController, JWPlayerViewControllerDelegate
             PersistentStorage.shared.addKaraokeCount(postID: postID)
         }
 
-        if AuthFunc.shareInstance.guestUserLoginPopUp() { return}
+//        if AuthFunc.shareInstance.guestUserLoginPopUp() { return}
 
         self.playBtn.isEnabled = false
         if isRecording {
diff --git a/WOKA/Karaoke/Controller/KaraokeListingVC.swift b/WOKA/Karaoke/Controller/KaraokeListingVC.swift
index 080a43d..169d0ce 100644
--- a/WOKA/Karaoke/Controller/KaraokeListingVC.swift
+++ b/WOKA/Karaoke/Controller/KaraokeListingVC.swift
@@ -34,7 +34,6 @@ class KaraokeListingVC: UIViewController {
         vm.initView()
         navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default)
         navigationController?.navigationBar.shadowImage = UIImage()
-        
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -84,6 +83,14 @@ class KaraokeListingVC: UIViewController {
         if let id = vm.headerData?.id{
             PersistentStorage.shared.addKaraokeCount(postID: id)
         }
+        
+        let sb = UIStoryboard(name: K.StoryBoard.Karaoke, bundle: nil)
+        let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.Karaoke.karaokeDetailsVC) as! KaraokeDetailsVC
+        vcPush.modalPresentationStyle = .overCurrentContext
+        vcPush.modalTransitionStyle = .crossDissolve
+        vcPush.karaokeData = vm.headerData
+        vcPush.delegate = self
+        self.present(vcPush, animated: true)
     }
 }
 
diff --git a/WOKA/Localized Module/en.lproj/Localizable.strings b/WOKA/Localized Module/en.lproj/Localizable.strings
index 9ed8065..75faedc 100644
--- a/WOKA/Localized Module/en.lproj/Localizable.strings	
+++ b/WOKA/Localized Module/en.lproj/Localizable.strings	
@@ -47,11 +47,13 @@
  My List
  */
 
-"वेबसीरीज (अंग्रेजी)" = "WebSeries (English)";
-"वेबसीरीज (हिंदी)" = "WebSeries (Hindi)";
-"ऑडियो पुस्तकें" = "Audio Books";
-"कराओके" = "Karaoke";
-"खेल" = "Games";
+"वेबसीरीज (अंग्रेजी)" = "WEBSERIES (ENGLISH)";
+"वेबसीरीज (हिंदी)" = "WEBSERIES (HINDI)";
+//"ऑडियो पुस्तकें" = "Audio Books";
+//"कराओके" = "Karaoke";
+//"खेल" = "Games";
 "फ्री साइन इन" = "Free Sign In";
 "कृपया अधिक रोमांच और सुविधाओ के लिए साइन इन करे..." = "To continue, please sign in for more adventures and features...";
 "WOKA से जुड़े रहे" = "Continue to WOKA";
+
+ "क्या आप Woka ऐप से लॉग आउट करना चाहते हैं?" = "Do you want to LOGOUT from the WOKA APP";
diff --git a/WOKA/Localized Module/hi.lproj/Localizable.strings b/WOKA/Localized Module/hi.lproj/Localizable.strings
index 253cf01..a503abb 100644
--- a/WOKA/Localized Module/hi.lproj/Localizable.strings	
+++ b/WOKA/Localized Module/hi.lproj/Localizable.strings	
@@ -182,7 +182,7 @@
 "Enter your child name" = "अपने बच्चे का नाम दर्ज करें";
 "Deactivate WOKA Account" = "WOKA खाता निष्क्रिय करें";
 "By clicking the button below, your account will be deactivated. Your data will be erased after one month." = "नीचे दिए गए बटन पर क्लिक करने से आपका अकाउंट निष्क्रिय हो जाएगा। एक महीने के बाद आपका डेटा मिटा दिया जाएगा।";
-
+"Do you want to LOGOUT from the WOKA APP" = "क्या आप Woka ऐप से लॉग आउट करना चाहते हैं?";
 
 /*
  <string name="home">घर</string>
@@ -217,9 +217,9 @@
  */
 "WebSeries (English)" = "वेबसीरीज (अंग्रेजी)";
 "WebSeries (Hindi)" = "वेबसीरीज (हिंदी)";
-"Audio Books" = "ऑडियो पुस्तकें";
-"Karaoke" = "कराओके";
-"Games" = "खेल";
+//"Audio Books" = "ऑडियो पुस्तकें";
+//"Karaoke" = "कराओके";
+//"Games" = "खेल";
 "Free Sign In" = "फ्री साइन इन";
 "To continue, please sign in for more adventures and features..." = "कृपया अधिक रोमांच और सुविधाओ के लिए साइन इन करे...";
 "Continue to WOKA" = "WOKA से जुड़े रहे";
diff --git a/WOKA/Main/Delegate/AppDelegate.swift b/WOKA/Main/Delegate/AppDelegate.swift
index 8e0c5c8..1162c38 100644
--- a/WOKA/Main/Delegate/AppDelegate.swift
+++ b/WOKA/Main/Delegate/AppDelegate.swift
@@ -36,7 +36,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         //
         //Initialize Firebase
-//        FirebaseApp.configure()
+        FirebaseApp.configure()
         
         // enabling the IQKeyboard manager instance
         IQKeyboardManager.shared.enable = true
diff --git a/WOKA/TabBar & SideMenu/Controller/SideMenuVC.swift b/WOKA/TabBar & SideMenu/Controller/SideMenuVC.swift
index 46f74fa..0d948ce 100644
--- a/WOKA/TabBar & SideMenu/Controller/SideMenuVC.swift	
+++ b/WOKA/TabBar & SideMenu/Controller/SideMenuVC.swift	
@@ -99,14 +99,16 @@ class SideMenuVC: UIViewController {
         // if its guest user navigate him to login
         if AuthFunc.shareInstance.getUserType() == 3{
             self.sideMenuController?.hideMenu()
-            UIApplication.setRootView(LoginNavVC.instantiate(from: .AuthenticationSB))
+            DispatchQueue.main.async {
+                UIApplication.setRootView(LoginNavVC.instantiate(from: .AuthenticationSB))
+            }
             return
         }
         
         let sb = UIStoryboard(name: K.StoryBoard.customAlerts, bundle: nil)
         let vcPush = sb.instantiateViewController(withIdentifier: K.StoryBoardID.CustomAlerts.yesNoAlertVC) as! YesNoAlertVC
         vcPush.mainTitleText = "WOKA"
-        vcPush.contentLabel = "Do you want to LOGOUT from the WOKA APP"
+        vcPush.contentLabel = "Do you want to LOGOUT from the WOKA APP".localized(loc: AuthFunc.shareInstance.languageSelected.rawValue)
         vcPush.onDoneBlock = { [weak self] mode in
             guard let self else{return}
             switch mode{
diff --git a/WOKA/Theme/Base.lproj/Theme.storyboard b/WOKA/Theme/Base.lproj/Theme.storyboard
index 822ccab..7e7bad9 100644
--- a/WOKA/Theme/Base.lproj/Theme.storyboard
+++ b/WOKA/Theme/Base.lproj/Theme.storyboard
@@ -712,19 +712,19 @@
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </tableView>
                             <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="5iZ-Hr-WYt">
-                                <rect key="frame" x="124" y="332" width="166" height="246"/>
+                                <rect key="frame" x="104" y="332" width="206" height="246"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SupportGirlImage" translatesAutoresizingMaskIntoConstraints="NO" id="mxb-po-4od">
-                                        <rect key="frame" x="0.0" y="0.0" width="166" height="166"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="206" height="166"/>
                                     </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Blogs Found" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oc1-tq-uxI" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="176" width="166" height="24"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Notification Found" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oc1-tq-uxI" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="176" width="206" height="24"/>
                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="20"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uwb-LF-aK3">
-                                        <rect key="frame" x="0.0" y="210" width="166" height="36"/>
+                                        <rect key="frame" x="0.0" y="210" width="206" height="36"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain">
@@ -1106,19 +1106,19 @@
                                 <cells/>
                             </collectionView>
                             <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Nqj-wh-mOZ">
-                                <rect key="frame" x="104" y="312" width="206" height="246"/>
+                                <rect key="frame" x="124" y="312" width="166" height="246"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SupportGirlImage" translatesAutoresizingMaskIntoConstraints="NO" id="aKI-uI-tys">
-                                        <rect key="frame" x="0.0" y="0.0" width="206" height="166"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="166" height="166"/>
                                     </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Notification Found" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h4b-OB-vin" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="176" width="206" height="24"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Blogs Found" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h4b-OB-vin" customClass="LocalisedElementsLabel" customModule="WOKA" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="176" width="166" height="24"/>
                                         <fontDescription key="fontDescription" name="Exo2-Bold" family="Exo 2" pointSize="20"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JCl-tp-aCA">
-                                        <rect key="frame" x="0.0" y="210" width="206" height="36"/>
+                                        <rect key="frame" x="0.0" y="210" width="166" height="36"/>
                                         <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain">
@@ -1330,7 +1330,7 @@
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemBrownColor">
-            <color red="0.63529411759999999" green="0.51764705879999995" blue="0.36862745099999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.63529411764705879" green="0.51764705882352946" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/WOKA/Theme/Controller/PlayerVC.swift b/WOKA/Theme/Controller/PlayerVC.swift
index 168794e..19c33af 100644
--- a/WOKA/Theme/Controller/PlayerVC.swift
+++ b/WOKA/Theme/Controller/PlayerVC.swift
@@ -9,7 +9,7 @@ import UIKit
 import JWPlayerKit
 import AVKit
 
-class PlayerVC: JWPlayerViewController, JWPlayerViewControllerUIDelegate{
+class PlayerVC: JWPlayerViewController, JWPlayerViewControllerDelegate{
 
     @IBOutlet weak var backButton: UIButton!
     var previousScale: CGFloat = 1.0
@@ -41,6 +41,8 @@ class PlayerVC: JWPlayerViewController, JWPlayerViewControllerUIDelegate{
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        player.configurePlayer(with: config)
+        self.delegate = self
         vm.vc = self
         vm.initView()
 //        rotateView(to: .pi / 2) // Example: 90 degrees rotation
@@ -58,18 +60,14 @@ class PlayerVC: JWPlayerViewController, JWPlayerViewControllerUIDelegate{
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        //        DispatchQueue.main.async { [weak self] in
-        //            guard let self else{return}
         appDelegate.deviceOrientation = .landscapeRight
         let value = UIInterfaceOrientation.landscapeRight.rawValue
         UIDevice.current.setValue(value, forKey: "orientation")
-        player.configurePlayer(with: config)
         
-        self.uiDelegate = self
+        
         //Disable Picture in Picture
         playerView.allowsPictureInPicturePlayback = false
         playerView.captionStyle = .none
-        //        }
     }
     
     override func viewWillDisappear(_ animated: Bool) {