diff --git a/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme b/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme
index 8aa4c4e1..40c19999 100644
--- a/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme	
+++ b/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme	
@@ -63,7 +63,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "1"
+      launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
diff --git a/GME Remit/Modules/ManageAccountsModules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebit.storyboard b/GME Remit/Modules/ManageAccountsModules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebit.storyboard
index 94fd51d8..933df1d6 100644
--- a/GME Remit/Modules/ManageAccountsModules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebit.storyboard	
+++ b/GME Remit/Modules/ManageAccountsModules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebit.storyboard	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="OqX-eA-I5Q">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
@@ -40,7 +40,7 @@
                                                 </constraints>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Add Auto Debit Account" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3RL-rJ-PRr">
-                                                <rect key="frame" x="77" y="30" width="177" height="20.5"/>
+                                                <rect key="frame" x="77" y="30" width="185" height="20"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
                                                 <color key="textColor" name="ThemeText"/>
                                                 <nil key="highlightedColor"/>
@@ -64,12 +64,12 @@
                                 </subviews>
                             </stackView>
                             <tableView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="LTI-ab-Zaj">
-                                <rect key="frame" x="10" y="144" width="355" height="463"/>
+                                <rect key="frame" x="10" y="144" width="355" height="473"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <color key="separatorColor" name="ThemeSeparate"/>
                                 <inset key="separatorInset" minX="5" minY="0.0" maxX="5" maxY="0.0"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="qfm-5F-dVx">
-                                    <rect key="frame" x="0.0" y="152" width="355" height="70"/>
+                                    <rect key="frame" x="0.0" y="150.5" width="355" height="70"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iKW-nd-Zel">
@@ -94,26 +94,26 @@
                                 </view>
                                 <prototypes>
                                     <tableViewCell opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="AutoDebitTableViewCell" id="zqt-r5-jIP" customClass="AutoDebitTableViewCell" customModule="GME_Remit" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="28" width="355" height="96"/>
+                                        <rect key="frame" x="0.0" y="28" width="355" height="94.5"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="zqt-r5-jIP" id="Sk5-JJ-2iK">
-                                            <rect key="frame" x="0.0" y="0.0" width="355" height="96"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355" height="94.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FIK-OV-SBT">
-                                                    <rect key="frame" x="5" y="5" width="345" height="86"/>
+                                                    <rect key="frame" x="5" y="5" width="345" height="84.5"/>
                                                     <subviews>
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="eUe-lZ-JIJ">
-                                                            <rect key="frame" x="80" y="10" width="151" height="66"/>
+                                                            <rect key="frame" x="80" y="10" width="155" height="64.5"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Standard Chartered Korea(SC First)" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="pti-fz-pDe">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="151" height="41.5"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="155" height="40.5"/>
                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
                                                                     <color key="textColor" name="ThemeText"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bank Account" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BvO-gw-4zj">
-                                                                    <rect key="frame" x="0.0" y="46.5" width="151" height="19.5"/>
+                                                                    <rect key="frame" x="0.0" y="45.5" width="155" height="19"/>
                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="16"/>
                                                                     <color key="textColor" name="ThemeText"/>
                                                                     <nil key="highlightedColor"/>
@@ -121,7 +121,7 @@
                                                             </subviews>
                                                         </stackView>
                                                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sc" translatesAutoresizingMaskIntoConstraints="NO" id="zCa-fe-RZX">
-                                                            <rect key="frame" x="20" y="30.5" width="40" height="25"/>
+                                                            <rect key="frame" x="20" y="30" width="40" height="25"/>
                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="25" id="jRr-IL-Yv9"/>
@@ -129,7 +129,7 @@
                                                             </constraints>
                                                         </imageView>
                                                         <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="ph3-Iw-kBH">
-                                                            <rect key="frame" x="265" y="28" width="65" height="30"/>
+                                                            <rect key="frame" x="265" y="27.5" width="65" height="30"/>
                                                             <subviews>
                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qha-7a-eew">
                                                                     <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
@@ -196,7 +196,7 @@
                                 </prototypes>
                             </tableView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q9d-oi-zwr">
-                                <rect key="frame" x="0.0" y="617" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="627" width="375" height="40"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="26g-hb-7wi">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="0.5"/>
@@ -206,16 +206,16 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="DMZ-o5-axc">
-                                        <rect key="frame" x="10" y="10" width="355" height="30"/>
+                                        <rect key="frame" x="5" y="5" width="365" height="30"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NBf-df-LDI">
-                                                <rect key="frame" x="0.0" y="0.0" width="226.5" height="30"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="232.5" height="30"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="jhN-rL-SDk">
-                                                <rect key="frame" x="236.5" y="0.0" width="118.5" height="30"/>
+                                                <rect key="frame" x="242.5" y="0.0" width="122.5" height="30"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8CV-kq-xbU">
                                                         <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
@@ -238,7 +238,7 @@
                                                         </constraints>
                                                     </view>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" text="Register Inbound" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Eht-u1-2km">
-                                                        <rect key="frame" x="30" y="0.0" width="88.5" height="30"/>
+                                                        <rect key="frame" x="30" y="0.0" width="92.5" height="30"/>
                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                         <color key="textColor" name="ThemeText"/>
                                                         <nil key="highlightedColor"/>
@@ -250,12 +250,12 @@
                                 </subviews>
                                 <color key="backgroundColor" name="ThemeSubBackground"/>
                                 <constraints>
-                                    <constraint firstAttribute="bottom" secondItem="DMZ-o5-axc" secondAttribute="bottom" constant="10" id="0go-fk-P1L"/>
+                                    <constraint firstAttribute="bottom" secondItem="DMZ-o5-axc" secondAttribute="bottom" constant="5" id="0go-fk-P1L"/>
                                     <constraint firstItem="26g-hb-7wi" firstAttribute="leading" secondItem="q9d-oi-zwr" secondAttribute="leading" id="6Pz-k1-Vi3"/>
-                                    <constraint firstItem="DMZ-o5-axc" firstAttribute="top" secondItem="q9d-oi-zwr" secondAttribute="top" constant="10" id="ALY-o1-pdv"/>
-                                    <constraint firstItem="DMZ-o5-axc" firstAttribute="leading" secondItem="q9d-oi-zwr" secondAttribute="leading" constant="10" id="BRw-67-K6k"/>
+                                    <constraint firstItem="DMZ-o5-axc" firstAttribute="top" secondItem="q9d-oi-zwr" secondAttribute="top" constant="5" id="ALY-o1-pdv"/>
+                                    <constraint firstItem="DMZ-o5-axc" firstAttribute="leading" secondItem="q9d-oi-zwr" secondAttribute="leading" constant="5" id="BRw-67-K6k"/>
                                     <constraint firstItem="26g-hb-7wi" firstAttribute="top" secondItem="q9d-oi-zwr" secondAttribute="top" id="L2l-IH-wDv"/>
-                                    <constraint firstAttribute="trailing" secondItem="DMZ-o5-axc" secondAttribute="trailing" constant="10" id="aUS-41-bcw"/>
+                                    <constraint firstAttribute="trailing" secondItem="DMZ-o5-axc" secondAttribute="trailing" constant="5" id="aUS-41-bcw"/>
                                     <constraint firstAttribute="trailing" secondItem="26g-hb-7wi" secondAttribute="trailing" id="hs2-WA-5zm"/>
                                 </constraints>
                             </view>
diff --git a/GME Remit/Modules/ManageAccountsModules/InboundAccounts/User Interface/View/InboundAccounts.storyboard b/GME Remit/Modules/ManageAccountsModules/InboundAccounts/User Interface/View/InboundAccounts.storyboard
index 1b62f348..90c39adc 100644
--- a/GME Remit/Modules/ManageAccountsModules/InboundAccounts/User Interface/View/InboundAccounts.storyboard	
+++ b/GME Remit/Modules/ManageAccountsModules/InboundAccounts/User Interface/View/InboundAccounts.storyboard	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
@@ -26,10 +26,11 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="DTn-qE-4wa">
-                                <rect key="frame" x="10" y="10" width="355" height="597"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <rect key="frame" x="10" y="10" width="355" height="607"/>
+                                <color key="backgroundColor" name="ThemeMainBackground"/>
                                 <color key="separatorColor" name="ThemeSeparate"/>
                                 <inset key="separatorInset" minX="5" minY="0.0" maxX="5" maxY="0.0"/>
+                                <color key="sectionIndexBackgroundColor" name="ThemeMainBackground"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="FKJ-fI-LmX">
                                     <rect key="frame" x="0.0" y="152.5" width="355" height="70"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -153,7 +154,7 @@
                                 </prototypes>
                             </tableView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bmT-u8-mfw">
-                                <rect key="frame" x="0.0" y="617" width="375" height="50"/>
+                                <rect key="frame" x="0.0" y="627" width="375" height="40"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K0R-cW-h4c">
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="0.5"/>
@@ -163,16 +164,16 @@
                                         </constraints>
                                     </view>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="9ak-ro-a9Y">
-                                        <rect key="frame" x="10" y="10" width="355" height="30"/>
+                                        <rect key="frame" x="5" y="5" width="365" height="30"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aWf-wz-9Cf">
-                                                <rect key="frame" x="0.0" y="0.0" width="230" height="30"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="240" height="30"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <stackView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="LmG-ZD-fLc">
-                                                <rect key="frame" x="240" y="0.0" width="115" height="30"/>
+                                                <rect key="frame" x="250" y="0.0" width="115" height="30"/>
                                                 <subviews>
                                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_warning" translatesAutoresizingMaskIntoConstraints="NO" id="HkK-bt-2he">
                                                         <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
@@ -195,11 +196,11 @@
                                 </subviews>
                                 <color key="backgroundColor" name="ThemeSubBackground"/>
                                 <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="9ak-ro-a9Y" secondAttribute="trailing" constant="10" id="3Jy-1h-dqJ"/>
-                                    <constraint firstItem="9ak-ro-a9Y" firstAttribute="leading" secondItem="bmT-u8-mfw" secondAttribute="leading" constant="10" id="ASw-fl-nQd"/>
+                                    <constraint firstAttribute="trailing" secondItem="9ak-ro-a9Y" secondAttribute="trailing" constant="5" id="3Jy-1h-dqJ"/>
+                                    <constraint firstItem="9ak-ro-a9Y" firstAttribute="leading" secondItem="bmT-u8-mfw" secondAttribute="leading" constant="5" id="ASw-fl-nQd"/>
                                     <constraint firstItem="K0R-cW-h4c" firstAttribute="leading" secondItem="bmT-u8-mfw" secondAttribute="leading" id="Jyn-3b-MSd"/>
-                                    <constraint firstItem="9ak-ro-a9Y" firstAttribute="top" secondItem="bmT-u8-mfw" secondAttribute="top" constant="10" id="Sj1-fm-NRD"/>
-                                    <constraint firstAttribute="bottom" secondItem="9ak-ro-a9Y" secondAttribute="bottom" constant="10" id="rM6-n9-bsq"/>
+                                    <constraint firstItem="9ak-ro-a9Y" firstAttribute="top" secondItem="bmT-u8-mfw" secondAttribute="top" constant="5" id="Sj1-fm-NRD"/>
+                                    <constraint firstAttribute="bottom" secondItem="9ak-ro-a9Y" secondAttribute="bottom" constant="5" id="rM6-n9-bsq"/>
                                     <constraint firstAttribute="trailing" secondItem="K0R-cW-h4c" secondAttribute="trailing" id="wlz-tg-pQT"/>
                                     <constraint firstItem="K0R-cW-h4c" firstAttribute="top" secondItem="bmT-u8-mfw" secondAttribute="top" id="ybL-7X-3Vu"/>
                                 </constraints>
diff --git a/GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/View/RechargeHistory.storyboard b/GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/View/RechargeHistory.storyboard
index 30913b98..b3e61540 100644
--- a/GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/View/RechargeHistory.storyboard	
+++ b/GME Remit/Modules/PowerCallModules/RechargeHistory/User Interface/View/RechargeHistory.storyboard	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="hLd-Wc-6YC">
-    <device id="retina4_0" orientation="portrait" appearance="light"/>
+    <device id="retina4_0" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
@@ -28,8 +28,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="wYq-sy-WtH">
-                                <rect key="frame" x="10" y="54" width="300" height="504"/>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="wYq-sy-WtH">
+                                <rect key="frame" x="10" y="54" width="300" height="473"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GyV-RQ-S76">
                                         <rect key="frame" x="0.0" y="0.0" width="300" height="50"/>
@@ -73,7 +73,7 @@
                                         </constraints>
                                     </stackView>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yw9-cK-pIF">
-                                        <rect key="frame" x="0.0" y="60" width="300" height="35"/>
+                                        <rect key="frame" x="0.0" y="50" width="300" height="35"/>
                                         <subviews>
                                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EHz-NG-QNu">
                                                 <rect key="frame" x="0.0" y="1" width="300" height="33"/>
@@ -129,7 +129,7 @@
                                         </constraints>
                                     </view>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="kkE-JE-vKh">
-                                        <rect key="frame" x="0.0" y="105" width="300" height="358"/>
+                                        <rect key="frame" x="0.0" y="85" width="300" height="388"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="separatorColor" name="ThemeSeparate"/>
                                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
@@ -305,62 +305,65 @@
                                             </tableViewCell>
                                         </prototypes>
                                     </tableView>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n1y-jr-cUl">
-                                        <rect key="frame" x="0.0" y="473" width="300" height="31"/>
+                                </subviews>
+                            </stackView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n1y-jr-cUl">
+                                <rect key="frame" x="0.0" y="537" width="320" height="31"/>
+                                <subviews>
+                                    <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="7" translatesAutoresizingMaskIntoConstraints="NO" id="p4Y-mp-BXT">
+                                        <rect key="frame" x="5" y="5" width="310" height="21"/>
                                         <subviews>
-                                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="7" translatesAutoresizingMaskIntoConstraints="NO" id="p4Y-mp-BXT">
-                                                <rect key="frame" x="0.0" y="5" width="300" height="21"/>
-                                                <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Wn-gZ-2ei">
-                                                        <rect key="frame" x="0.0" y="0.0" width="70" height="21"/>
-                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                        <nil key="textColor"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WAITING" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="qBt-j3-Y9y">
-                                                        <rect key="frame" x="77" y="0.0" width="69.5" height="21"/>
-                                                        <color key="backgroundColor" name="ThemeGreen"/>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SUCCESS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="JhP-It-2Dc">
-                                                        <rect key="frame" x="153.5" y="0.0" width="70" height="21"/>
-                                                        <color key="backgroundColor" name="ThemeBlue"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="21" id="nV0-Mc-HUY"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FAILURE" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="SyV-28-eMx">
-                                                        <rect key="frame" x="230.5" y="0.0" width="69.5" height="21"/>
-                                                        <color key="backgroundColor" name="ThemeRed"/>
-                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
-                                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                </subviews>
-                                            </stackView>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Wn-gZ-2ei">
+                                                <rect key="frame" x="0.0" y="0.0" width="72.5" height="21"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <nil key="textColor"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WAITING" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="qBt-j3-Y9y">
+                                                <rect key="frame" x="79.5" y="0.0" width="72" height="21"/>
+                                                <color key="backgroundColor" name="ThemeGreen"/>
+                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SUCCESS" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="JhP-It-2Dc">
+                                                <rect key="frame" x="158.5" y="0.0" width="72.5" height="21"/>
+                                                <color key="backgroundColor" name="ThemeBlue"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="21" id="nV0-Mc-HUY"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FAILURE" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="SyV-28-eMx">
+                                                <rect key="frame" x="238" y="0.0" width="72" height="21"/>
+                                                <color key="backgroundColor" name="ThemeRed"/>
+                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
+                                                <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
                                         </subviews>
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <constraints>
-                                            <constraint firstAttribute="trailing" secondItem="p4Y-mp-BXT" secondAttribute="trailing" id="8hB-J6-0zS"/>
-                                            <constraint firstAttribute="bottom" secondItem="p4Y-mp-BXT" secondAttribute="bottom" constant="5" id="Bfg-JR-dAo"/>
-                                            <constraint firstItem="p4Y-mp-BXT" firstAttribute="leading" secondItem="n1y-jr-cUl" secondAttribute="leading" id="Kwf-zK-plv"/>
-                                            <constraint firstItem="p4Y-mp-BXT" firstAttribute="top" secondItem="n1y-jr-cUl" secondAttribute="top" constant="5" id="d6z-qS-gBT"/>
-                                        </constraints>
-                                    </view>
+                                    </stackView>
                                 </subviews>
-                            </stackView>
+                                <color key="backgroundColor" name="ThemeSubBackground"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="p4Y-mp-BXT" secondAttribute="trailing" constant="5" id="8hB-J6-0zS"/>
+                                    <constraint firstAttribute="bottom" secondItem="p4Y-mp-BXT" secondAttribute="bottom" constant="5" id="Bfg-JR-dAo"/>
+                                    <constraint firstItem="p4Y-mp-BXT" firstAttribute="leading" secondItem="n1y-jr-cUl" secondAttribute="leading" constant="5" id="Kwf-zK-plv"/>
+                                    <constraint firstItem="p4Y-mp-BXT" firstAttribute="top" secondItem="n1y-jr-cUl" secondAttribute="top" constant="5" id="d6z-qS-gBT"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" name="ThemeMainBackground"/>
                         <constraints>
+                            <constraint firstItem="n1y-jr-cUl" firstAttribute="leading" secondItem="O1T-1R-Sun" secondAttribute="leading" id="J7a-dk-Z8L"/>
+                            <constraint firstItem="O1T-1R-Sun" firstAttribute="trailing" secondItem="n1y-jr-cUl" secondAttribute="trailing" id="Nn8-aL-fLy"/>
                             <constraint firstAttribute="trailing" secondItem="wYq-sy-WtH" secondAttribute="trailing" constant="10" id="PDC-10-ebf"/>
+                            <constraint firstItem="n1y-jr-cUl" firstAttribute="top" secondItem="wYq-sy-WtH" secondAttribute="bottom" constant="10" id="da6-fW-7Tr"/>
                             <constraint firstItem="wYq-sy-WtH" firstAttribute="top" secondItem="O1T-1R-Sun" secondAttribute="top" constant="10" id="lCL-g5-bC7"/>
-                            <constraint firstItem="O1T-1R-Sun" firstAttribute="bottom" secondItem="wYq-sy-WtH" secondAttribute="bottom" constant="10" id="lkZ-Z5-3Vf"/>
                             <constraint firstItem="wYq-sy-WtH" firstAttribute="leading" secondItem="O1T-1R-Sun" secondAttribute="leading" constant="10" id="tFJ-0x-o7b"/>
+                            <constraint firstItem="n1y-jr-cUl" firstAttribute="bottom" secondItem="O1T-1R-Sun" secondAttribute="bottom" id="yed-7m-cBW"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="O1T-1R-Sun"/>
                     </view>
@@ -431,6 +434,9 @@
         <namedColor name="ThemeSeparate">
             <color red="0.82400000095367432" green="0.82400000095367432" blue="0.82400000095367432" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="ThemeSubBackground">
+            <color red="0.93300002813339233" green="0.93300002813339233" blue="0.93300002813339233" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+        </namedColor>
         <namedColor name="ThemeText">
             <color red="0.28999999165534973" green="0.28999999165534973" blue="0.28999999165534973" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
diff --git a/GME Remit/Modules/RemittanceModules/InboundModules/InboundPennyTestSubmit/User Interface/View/InboundPennyTestSubmit.storyboard b/GME Remit/Modules/RemittanceModules/InboundModules/InboundPennyTestSubmit/User Interface/View/InboundPennyTestSubmit.storyboard
index 644381c9..7ca7bc2e 100644
--- a/GME Remit/Modules/RemittanceModules/InboundModules/InboundPennyTestSubmit/User Interface/View/InboundPennyTestSubmit.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/InboundModules/InboundPennyTestSubmit/User Interface/View/InboundPennyTestSubmit.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="9ZW-c2-LfR">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -76,7 +76,7 @@ enter the 4 digit number display after GME.</string>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                         </subviews>
-                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="trailing" secondItem="fNy-Ec-rIe" secondAttribute="trailing" constant="20" id="9LO-tW-QTX"/>
                                             <constraint firstItem="fNy-Ec-rIe" firstAttribute="top" secondItem="tZy-1o-pQa" secondAttribute="top" id="Rsd-Av-r2p"/>
@@ -104,6 +104,7 @@ enter the 4 digit number display after GME.</string>
                                                         <subviews>
                                                             <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="252" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="1234" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="y15-Xf-IBz">
                                                                 <rect key="frame" x="0.0" y="0.0" width="247" height="45"/>
+                                                                <color key="textColor" name="ThemeText"/>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
                                                                 <textInputTraits key="textInputTraits" keyboardType="numberPad"/>
                                                             </textField>
@@ -120,9 +121,10 @@ enter the 4 digit number display after GME.</string>
                                                         </subviews>
                                                     </stackView>
                                                 </subviews>
+                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </stackView>
                                         </subviews>
-                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstItem="i6h-r2-NsS" firstAttribute="top" secondItem="duM-Of-mja" secondAttribute="top" id="4Gr-6i-LAk"/>
                                             <constraint firstAttribute="trailing" secondItem="i6h-r2-NsS" secondAttribute="trailing" constant="20" id="9vs-Yp-pAR"/>
diff --git a/GME Remit/Modules/RemittanceModules/InboundModules/InboundPennyTestSubmit/User Interface/View/InboundPennyTestSubmitViewController.swift b/GME Remit/Modules/RemittanceModules/InboundModules/InboundPennyTestSubmit/User Interface/View/InboundPennyTestSubmitViewController.swift
index a7bc2694..3ca9318a 100644
--- a/GME Remit/Modules/RemittanceModules/InboundModules/InboundPennyTestSubmit/User Interface/View/InboundPennyTestSubmitViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/InboundModules/InboundPennyTestSubmit/User Interface/View/InboundPennyTestSubmitViewController.swift	
@@ -42,6 +42,9 @@ class InboundPennyTestSubmitViewController: UIViewController {
   
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
+    
+    setupNormalNavigation()
+    
     navigationController?.isNavigationBarHidden = false
     
     navigationController?.navigationBar.setBackgroundImage(UIImage(), for: .default)
diff --git a/GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceipt.storyboard b/GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceipt.storyboard
index cee081b6..bacb9209 100644
--- a/GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceipt.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceipt.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <device id="retina4_7" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -548,7 +548,7 @@
                                                 </subviews>
                                             </stackView>
                                         </subviews>
-                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="bottom" secondItem="nH9-TW-YRF" secondAttribute="bottom" constant="10" id="63d-Hg-CvH"/>
                                             <constraint firstItem="nH9-TW-YRF" firstAttribute="leading" secondItem="vYC-uV-BDD" secondAttribute="leading" constant="10" id="6L0-g0-bwM"/>
@@ -566,7 +566,7 @@
                                 </constraints>
                             </scrollView>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" name="ThemeMainBackground"/>
                         <constraints>
                             <constraint firstItem="wWR-dD-FNf" firstAttribute="top" secondItem="aD3-8c-HPv" secondAttribute="top" id="B66-pQ-eR6"/>
                             <constraint firstItem="wWR-dD-FNf" firstAttribute="bottom" secondItem="aD3-8c-HPv" secondAttribute="bottom" id="Dbm-s7-gRG"/>