From 4bbd29088675414f30e34686244730ca6e56a358 Mon Sep 17 00:00:00 2001
From: Mac <mac@Macs-Mac-mini.local>
Date: Tue, 22 Feb 2022 08:50:02 +0545
Subject: [PATCH] Japanese Language Bug Fixing

---
 .../View/GmeContactsViewController.swift      |  2 +
 .../Home/User Interface/View/Home.storyboard  | 36 +++++------
 .../Wireframe/MainWireframe.swift             |  1 +
 GME Remit/Modules/Profile/Profile.storyboard  | 60 +++++++++----------
 .../Profile/ProfileViewController.swift       |  3 +
 .../User Interface/View/Recipients.storyboard | 14 ++---
 .../View/RecipientsViewController.swift       |  7 ++-
 .../View/InboundReceipt.storyboard            | 12 ++--
 .../CDDIViewControllerViewController.swift    |  5 ++
 .../View/SendMoneyReceipt.storyboard          |  2 +-
 .../bn.lproj/Localizable.strings              |  1 +
 .../en.lproj/Localizable.strings              |  3 +-
 .../ja.lproj/Localizable.strings              |  3 +-
 .../ne.lproj/Localizable.strings              |  1 +
 .../vi-VN.lproj/Localizable.strings           |  1 +
 15 files changed, 86 insertions(+), 65 deletions(-)

diff --git a/GME Remit/Modules/GmeContacts/User Interface/View/GmeContactsViewController.swift b/GME Remit/Modules/GmeContacts/User Interface/View/GmeContactsViewController.swift
index a6ae7926..b955b7ab 100644
--- a/GME Remit/Modules/GmeContacts/User Interface/View/GmeContactsViewController.swift	
+++ b/GME Remit/Modules/GmeContacts/User Interface/View/GmeContactsViewController.swift	
@@ -52,6 +52,8 @@ class GmeContactsViewController: UIViewController {
     if self.presentingViewController == nil {
       self.navigationItem.leftBarButtonItem = nil
     }
+    let image = UIImage.init(named: "branch")
+    self.tabBarItem = UITabBarItem(title: "branch_text".localized(), image: image, selectedImage: UIImage(named: "branch_selected"))
   }
   
   // MARK: IBActions
diff --git a/GME Remit/Modules/Home/User Interface/View/Home.storyboard b/GME Remit/Modules/Home/User Interface/View/Home.storyboard
index 1a872265..55fa4695 100644
--- a/GME Remit/Modules/Home/User Interface/View/Home.storyboard	
+++ b/GME Remit/Modules/Home/User Interface/View/Home.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ezt-uK-zb8">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ezt-uK-zb8">
     <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <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"/>
@@ -41,7 +41,7 @@
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Thank you for registering with us!" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="pcY-xj-hQb">
-                                        <rect key="frame" x="103" y="20" width="193" height="14.5"/>
+                                        <rect key="frame" x="103" y="20" width="193" height="14"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="12"/>
                                         <color key="textColor" name="ThemeRed"/>
                                         <nil key="highlightedColor"/>
@@ -54,7 +54,7 @@
                                         </constraints>
                                     </view>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your document is in verification process. This will not take long. Thereafter you can enjoy GME online service." lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="rwJ-pQ-p9z">
-                                        <rect key="frame" x="103" y="42.5" width="193" height="36"/>
+                                        <rect key="frame" x="103" y="42" width="193" height="35"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
                                         <color key="textColor" name="ThemeText"/>
                                         <nil key="highlightedColor"/>
@@ -86,7 +86,7 @@
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="HomeRemainingLimitTableViewCell" id="rcn-u6-1gx" customClass="HomeRemainingLimitTableViewCell" customModule="JME_Remit" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="44.5" width="320" height="110"/>
+                                        <rect key="frame" x="0.0" y="28" width="320" height="110"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="rcn-u6-1gx" id="ekT-Zr-ohe">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="110"/>
@@ -102,25 +102,25 @@
                                                                     <rect key="frame" x="0.0" y="0.0" width="280" height="60"/>
                                                                     <subviews>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Ktu-2Y-ndo">
-                                                                            <rect key="frame" x="150.5" y="8" width="124.5" height="44"/>
+                                                                            <rect key="frame" x="150.5" y="8.5" width="124.5" height="43"/>
                                                                             <subviews>
                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="253" text="Avaliable Balance" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xJH-zQ-Y2H">
-                                                                                    <rect key="frame" x="12.5" y="0.0" width="99.5" height="16"/>
+                                                                                    <rect key="frame" x="11" y="0.0" width="103" height="15.5"/>
                                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="13"/>
                                                                                     <color key="textColor" name="ThemeRedDark"/>
                                                                                     <nil key="highlightedColor"/>
                                                                                 </label>
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Hk9-Sd-1vf">
-                                                                                    <rect key="frame" x="47.5" y="21" width="30" height="23"/>
+                                                                                    <rect key="frame" x="46" y="20.5" width="32.5" height="22.5"/>
                                                                                     <subviews>
                                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="261" verticalHuggingPriority="251" text="N/A" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="M1e-cc-M1d">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="30" height="23"/>
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="32.5" height="22.5"/>
                                                                                             <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="19"/>
                                                                                             <color key="textColor" name="ThemeBlue"/>
                                                                                             <nil key="highlightedColor"/>
                                                                                         </label>
                                                                                         <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="JPY" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uBk-0o-Pgj">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="33" height="23"/>
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="33" height="22.5"/>
                                                                                             <constraints>
                                                                                                 <constraint firstAttribute="width" constant="33" id="0LO-Ay-wBw"/>
                                                                                             </constraints>
@@ -141,19 +141,19 @@
                                                                             </constraints>
                                                                         </view>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="9Ft-mi-Ev0">
-                                                                            <rect key="frame" x="5" y="8" width="124.5" height="44"/>
+                                                                            <rect key="frame" x="5" y="8.5" width="124.5" height="43"/>
                                                                             <subviews>
-                                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="253" text="Kwangju(034)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.84999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="IXG-rj-tyI">
-                                                                                    <rect key="frame" x="22.5" y="0.0" width="80" height="16"/>
+                                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="253" ambiguous="YES" text="Kwangju(034)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.84999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="IXG-rj-tyI">
+                                                                                    <rect key="frame" x="23" y="0.0" width="79" height="15.5"/>
                                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="13"/>
                                                                                     <color key="textColor" name="ThemeRedDark"/>
                                                                                     <nil key="highlightedColor"/>
                                                                                 </label>
-                                                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="jPc-HT-RBJ">
-                                                                                    <rect key="frame" x="47.5" y="21" width="30" height="23"/>
+                                                                                <stackView opaque="NO" contentMode="scaleToFill" ambiguous="YES" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="jPc-HT-RBJ">
+                                                                                    <rect key="frame" x="46" y="20.5" width="32.5" height="22.5"/>
                                                                                     <subviews>
-                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="261" verticalHuggingPriority="251" text="N/A" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="FSQ-xU-CsJ">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="30" height="23"/>
+                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="261" verticalHuggingPriority="251" ambiguous="YES" text="N/A" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="FSQ-xU-CsJ">
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="32.5" height="22.5"/>
                                                                                             <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="19"/>
                                                                                             <color key="textColor" name="ThemeBlue"/>
                                                                                             <nil key="highlightedColor"/>
@@ -237,7 +237,7 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="HomeCollectionTableViewCell" rowHeight="250" id="va0-Yj-PKZ" userLabel="CollectionTableCell" customClass="HomeCollectionTableViewCell" customModule="JME_Remit" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="154.5" width="320" height="250"/>
+                                        <rect key="frame" x="0.0" y="138" width="320" height="250"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="va0-Yj-PKZ" id="UgU-Jo-DQf">
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="250"/>
diff --git a/GME Remit/Modules/Main/User Interface/Wireframe/MainWireframe.swift b/GME Remit/Modules/Main/User Interface/Wireframe/MainWireframe.swift
index 46cb91d0..1289ffcf 100644
--- a/GME Remit/Modules/Main/User Interface/Wireframe/MainWireframe.swift	
+++ b/GME Remit/Modules/Main/User Interface/Wireframe/MainWireframe.swift	
@@ -44,6 +44,7 @@ extension MainWireframe: MainWireframeInput {
     navSendMoneyViewController.hero.isEnabled = true
     
     let contactsViewController = GmeContactsWireframe().getMainView()
+    contactsViewController.setupTabItem()
     let navContactsViewController = SwipeNavigationController(rootViewController: contactsViewController)
     guard let profileViewController = UIStoryboard(name: "Profile", bundle: nil)
       .instantiateViewController(withIdentifier: "ProfileViewController") as? ProfileViewController else {
diff --git a/GME Remit/Modules/Profile/Profile.storyboard b/GME Remit/Modules/Profile/Profile.storyboard
index ea721799..b809c4a5 100644
--- a/GME Remit/Modules/Profile/Profile.storyboard	
+++ b/GME Remit/Modules/Profile/Profile.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ift-aL-bsv">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ift-aL-bsv">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -110,13 +110,13 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="265" height="15.666666666666666"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="Birthday" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S83-ox-03E">
-                                                        <rect key="frame" x="0.0" y="0.0" width="50.666666666666664" height="15.666666666666666"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="51" height="15.666666666666666"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="3" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AMe-aR-gKB">
-                                                        <rect key="frame" x="55.666666666666671" y="0.0" width="209.33333333333331" height="15.666666666666666"/>
+                                                        <rect key="frame" x="56" y="0.0" width="209" height="15.666666666666666"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
@@ -394,22 +394,22 @@
                                                 <rect key="frame" x="10" y="278" width="355" height="210"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Available Balance" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mmh-uV-sP4">
-                                                        <rect key="frame" x="30" y="18" width="143" height="31.333333333333329"/>
+                                                        <rect key="frame" x="30" y="17.999999999999996" width="142.66666666666666" height="32.666666666666657"/>
                                                         <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                         <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QWE-De-OIo">
-                                                        <rect key="frame" x="20" y="87.333333333333314" width="315" height="45"/>
+                                                        <rect key="frame" x="20" y="88.666666666666686" width="315" height="45"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="JME Account No" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="nlo-iP-QwN">
-                                                                <rect key="frame" x="10" y="2" width="102.66666666666667" height="17"/>
+                                                                <rect key="frame" x="10" y="2" width="106.33333333333333" height="16.333333333333332"/>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                 <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="91028120938112" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="hkj-cL-iCj">
-                                                                <rect key="frame" x="10" y="21" width="100" height="28.666666666666671"/>
+                                                                <rect key="frame" x="10" y="20.333333333333314" width="100" height="28"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="100" id="GGp-iK-ZUJ"/>
                                                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="13" id="dAY-tV-MW7"/>
@@ -430,7 +430,7 @@
                                                         </constraints>
                                                     </view>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="MAZ-i9-fR8">
-                                                        <rect key="frame" x="30" y="51.333333333333314" width="21" height="28"/>
+                                                        <rect key="frame" x="30" y="52.666666666666686" width="20.333333333333329" height="28"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="28" id="bd9-CU-FEm"/>
                                                         </constraints>
@@ -439,13 +439,13 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="JPY" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EXY-5m-shp">
-                                                        <rect key="frame" x="54.999999999999993" y="58.333333333333314" width="23.666666666666664" height="17"/>
+                                                        <rect key="frame" x="54.333333333333321" y="60.333333333333321" width="25.666666666666664" height="16.333333333333336"/>
                                                         <fontDescription key="fontDescription" name="SanFranciscoText-Medium" family="San Francisco Text" pointSize="14"/>
                                                         <color key="textColor" name="ThemeText"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Z2-3Z-f4C">
-                                                        <rect key="frame" x="30" y="140.33333333333331" width="0.0" height="45"/>
+                                                        <rect key="frame" x="30" y="141.66666666666669" width="0.0" height="45"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="13" id="Fsm-2f-UIG"/>
                                                         </constraints>
@@ -454,16 +454,16 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="MLt-Tq-rHc">
-                                                        <rect key="frame" x="30" y="144.33333333333331" width="295" height="49.666666666666657"/>
+                                                        <rect key="frame" x="30" y="145.66666666666669" width="295" height="48.333333333333343"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Membership ID" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qQL-ah-r8e">
-                                                                <rect key="frame" x="0.0" y="0.0" width="295" height="17"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="295" height="16.333333333333332"/>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                                 <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="N/A" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oe9-UI-xXR">
-                                                                <rect key="frame" x="0.0" y="21" width="295" height="28.666666666666671"/>
+                                                                <rect key="frame" x="0.0" y="20.333333333333314" width="295" height="28"/>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="24"/>
                                                                 <color key="textColor" name="ThemeBlue"/>
                                                                 <nil key="highlightedColor"/>
@@ -501,13 +501,13 @@
                                                 <rect key="frame" x="10" y="498" width="355" height="70"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Remaining Yearly Limit" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4mc-iJ-afH">
-                                                        <rect key="frame" x="30" y="10" width="146" height="17"/>
+                                                        <rect key="frame" x="30" y="10" width="142" height="17"/>
                                                         <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
                                                         <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="..." lineBreakMode="wordWrap" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="vPE-Gj-mJ6">
-                                                        <rect key="frame" x="30" y="34" width="21" height="28"/>
+                                                        <rect key="frame" x="30" y="34" width="20.333333333333329" height="28"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="28" id="lqg-pN-PeN"/>
                                                         </constraints>
@@ -516,7 +516,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="USD" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Tx-yy-kIw">
-                                                        <rect key="frame" x="55.000000000000007" y="43.666666666666629" width="27.333333333333336" height="17"/>
+                                                        <rect key="frame" x="54.333333333333336" y="43.666666666666629" width="29.333333333333336" height="16.333333333333329"/>
                                                         <fontDescription key="fontDescription" name="SanFranciscoText-Medium" family="San Francisco Text" pointSize="14"/>
                                                         <color key="textColor" name="ThemeText"/>
                                                         <nil key="highlightedColor"/>
@@ -543,7 +543,7 @@
                                                 <rect key="frame" x="149" y="169.66666666666666" width="77" height="0.0"/>
                                                 <subviews>
                                                     <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bv9-cG-fQQ">
-                                                        <rect key="frame" x="0.0" y="0.0" width="93" height="17"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="99" height="17"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="17" id="MrC-na-8TP"/>
                                                         </constraints>
@@ -1451,40 +1451,40 @@
     </scenes>
     <designables>
         <designable name="Eiz-rR-0nN">
-            <size key="intrinsicContentSize" width="85" height="34"/>
+            <size key="intrinsicContentSize" width="91" height="34"/>
         </designable>
         <designable name="F2k-F0-UYs">
-            <size key="intrinsicContentSize" width="106.66666666666667" height="34"/>
+            <size key="intrinsicContentSize" width="112" height="34"/>
         </designable>
         <designable name="GwX-M7-rY8">
-            <size key="intrinsicContentSize" width="128.33333333333334" height="34"/>
+            <size key="intrinsicContentSize" width="136" height="34"/>
         </designable>
         <designable name="HAU-4h-JJP">
-            <size key="intrinsicContentSize" width="128.33333333333334" height="34"/>
+            <size key="intrinsicContentSize" width="136" height="34"/>
         </designable>
         <designable name="ISW-DN-TIg">
-            <size key="intrinsicContentSize" width="106.66666666666667" height="34"/>
+            <size key="intrinsicContentSize" width="112" height="34"/>
         </designable>
         <designable name="Pb3-P7-311">
-            <size key="intrinsicContentSize" width="154" height="34"/>
+            <size key="intrinsicContentSize" width="160.33333333333334" height="34"/>
         </designable>
         <designable name="V5J-Sb-fhg">
-            <size key="intrinsicContentSize" width="154" height="34"/>
+            <size key="intrinsicContentSize" width="160.33333333333334" height="34"/>
         </designable>
         <designable name="VQt-0P-NWm">
-            <size key="intrinsicContentSize" width="150" height="34"/>
+            <size key="intrinsicContentSize" width="156.66666666666666" height="34"/>
         </designable>
         <designable name="Yc1-rZ-6DK">
-            <size key="intrinsicContentSize" width="110.33333333333333" height="34"/>
+            <size key="intrinsicContentSize" width="115.66666666666667" height="34"/>
         </designable>
         <designable name="gXZ-eP-eXW">
-            <size key="intrinsicContentSize" width="110.33333333333333" height="34"/>
+            <size key="intrinsicContentSize" width="115.66666666666667" height="34"/>
         </designable>
         <designable name="seX-dm-Wn4">
-            <size key="intrinsicContentSize" width="85" height="34"/>
+            <size key="intrinsicContentSize" width="91" height="34"/>
         </designable>
         <designable name="zfD-X4-YTt">
-            <size key="intrinsicContentSize" width="150" height="34"/>
+            <size key="intrinsicContentSize" width="156.66666666666666" height="34"/>
         </designable>
     </designables>
     <resources>
diff --git a/GME Remit/Modules/Profile/ProfileViewController.swift b/GME Remit/Modules/Profile/ProfileViewController.swift
index e21bc1f7..e55395d4 100644
--- a/GME Remit/Modules/Profile/ProfileViewController.swift	
+++ b/GME Remit/Modules/Profile/ProfileViewController.swift	
@@ -37,6 +37,8 @@ class ProfileViewController: UIViewController {
         self.setupNormalNavigation()
         self.navigationItem.title = StringConstants().profileText
         show()
+        let image = UIImage.init(named: "profile")
+        self.tabBarItem = UITabBarItem(title: "profile_text".localized(), image: image, selectedImage: UIImage(named: "profile_selected"))
     }
     
     override func viewWillDisappear(_ animated: Bool) {
@@ -65,6 +67,7 @@ class ProfileViewController: UIViewController {
         self.changePasswordButton.setTitle(StringConstants().changePasswordText, for: UIControl.State.normal)
         
         limitTitleLabel.text = "remaining_limit_text".localized()
+        referralCodeTitle.text = "memberShipId_text".localized()
         limitLabel.textColor = .themeBlue
         let yearlyLimit = GMEDB.shared.user.string(.yearlyLimit)
         limitLabel.text = Utility.getCommaSeperatedString(numberString: yearlyLimit ?? "")
diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
index 6e1ec8a8..f008928c 100644
--- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard	
+++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard	
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <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"/>
@@ -39,7 +39,7 @@
                                         </constraints>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Recipient" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Wj9-qf-u2U">
-                                        <rect key="frame" x="90" y="30" width="228" height="20.5"/>
+                                        <rect key="frame" x="90" y="30" width="228" height="20"/>
                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
                                         <color key="textColor" name="ThemeText"/>
                                         <nil key="highlightedColor"/>
@@ -63,17 +63,17 @@
                                 <rect key="frame" x="0.0" y="90" width="375" height="528"/>
                                 <subviews>
                                     <searchBar contentMode="redraw" searchBarStyle="minimal" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PQz-1Q-bqI">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="51"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
                                         <color key="barTintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <textInputTraits key="textInputTraits"/>
                                     </searchBar>
                                     <tableView 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="vEB-d2-zNF">
-                                        <rect key="frame" x="10" y="51" width="355" height="477"/>
+                                        <rect key="frame" x="10" y="56" width="355" height="472"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="separatorColor" name="ThemeSeparate"/>
                                         <inset key="separatorInset" minX="15" minY="0.0" maxX="15" maxY="0.0"/>
                                         <view key="tableFooterView" contentMode="scaleToFill" id="IIt-Yb-InY">
-                                            <rect key="frame" x="0.0" y="237" width="355" height="44"/>
+                                            <rect key="frame" x="0.0" y="226" width="355" height="44"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="There are no recipients." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="6" translatesAutoresizingMaskIntoConstraints="NO" id="Sv8-Ik-xEU">
@@ -93,7 +93,7 @@
                                         </view>
                                         <prototypes>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="RecipientCell" rowHeight="170" id="hGj-Pf-Qj3" customClass="RecipientCell" customModule="JME_Remit" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="44.5" width="355" height="170"/>
+                                                <rect key="frame" x="0.0" y="28" width="355" height="170"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hGj-Pf-Qj3" id="sz3-Ck-jnS">
                                                     <rect key="frame" x="0.0" y="0.0" width="355" height="170"/>
diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift
index 9739198d..4a5e6a69 100644
--- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift	
+++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift	
@@ -48,6 +48,11 @@ class RecipientsViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.navigationItem.title = (self.parentType == .sendmoney) ? "recipient_listing_title_text".localized() :  "recipient_text".localized()
+        let image = UIImage.init(named: "send_money_tab")
+        self.tabBarItem = UITabBarItem(
+            title: "send_money_text".localized(),
+            image: image, selectedImage: UIImage(named: "send_money_selected")
+        )
         setupNormalNavigation()
         configureLanguage()
     }
@@ -61,7 +66,7 @@ class RecipientsViewController: UIViewController {
     override func setupTabItem() {
         let image = UIImage.init(named: "send_money_tab")
         self.tabBarItem = UITabBarItem(
-            title: "send_money_title_text".localized(),
+            title: "send_money_text".localized(),
             image: image, selectedImage: UIImage(named: "send_money_selected")
         )
         self.tabBarItem.titlePositionAdjustment = UIOffset(
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 7f2ea874..85d69f06 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="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <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"/>
@@ -635,7 +635,7 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="1OV-x4-AkU">
                                                         <rect key="frame" x="0.0" y="1092" width="355" height="50"/>
                                                         <subviews>
-                                                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qbr-Ug-ywW">
+                                                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qbr-Ug-ywW">
                                                                 <rect key="frame" x="0.0" y="0.0" width="0.0" height="50"/>
                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
@@ -648,7 +648,7 @@
                                                                     </userDefinedRuntimeAttribute>
                                                                 </userDefinedRuntimeAttributes>
                                                             </button>
-                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a5e-dp-XrJ">
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a5e-dp-XrJ">
                                                                 <rect key="frame" x="0.0" y="0.0" width="0.0" height="50"/>
                                                                 <color key="backgroundColor" name="ThemeRed"/>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
@@ -657,7 +657,7 @@
                                                                     <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 </state>
                                                             </button>
-                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BeD-TZ-T6e">
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BeD-TZ-T6e">
                                                                 <rect key="frame" x="10" y="0.0" width="345" height="50"/>
                                                                 <color key="backgroundColor" name="ThemeRed"/>
                                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
@@ -697,6 +697,7 @@
                                 </constraints>
                             </scrollView>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="aD3-8c-HPv"/>
                         <color key="backgroundColor" name="ThemeMainBackground"/>
                         <constraints>
                             <constraint firstItem="wWR-dD-FNf" firstAttribute="top" secondItem="aD3-8c-HPv" secondAttribute="top" id="B66-pQ-eR6"/>
@@ -704,7 +705,6 @@
                             <constraint firstItem="wWR-dD-FNf" firstAttribute="leading" secondItem="aD3-8c-HPv" secondAttribute="leading" id="Go4-ej-X8k"/>
                             <constraint firstItem="wWR-dD-FNf" firstAttribute="trailing" secondItem="aD3-8c-HPv" secondAttribute="trailing" id="Wfl-nh-C4U"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="aD3-8c-HPv"/>
                     </view>
                     <size key="freeformSize" width="375" height="800"/>
                     <connections>
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift
index 224d2467..93a088ea 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift	
@@ -41,10 +41,15 @@ class CDDIViewControllerViewController: UIViewController {
         super.viewDidLoad()
         self.setup()
         purposeOfRemit.placeholder = "select_transfer_reason_text".localized()
+        purposeOfRemit.titleText = "select_transfer_reason_text".localized()
         sourceOfFund.placeholder = "source_of_fund_placeholder_text".localized()
+        sourceOfFund.titleText = "source_of_fund_placeholder_text".localized()
         goodsOrigin.placeholder = "goods_origin_text".localized()
         goodsType.placeholder = "goods_type_text".localized()
         portofShipment.placeholder = "port_of_shipment_text".localized()
+        goodsOrigin.titleText = "goods_origin_text".localized()
+        goodsType.titleText = "goods_type_text".localized()
+        portofShipment.titleText = "port_of_shipment_text".localized()
         self.importsGoodsView.isHidden = true
     }
     
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
index 713c999a..8cf47c15 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard	
@@ -688,7 +688,7 @@ notices to get JME Number for this transfer.</string>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="b3B-PU-UlH" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <tapGestureRecognizer id="Nbz-kB-4Hj"/>
             </objects>
-            <point key="canvasLocation" x="-842.75362318840587" y="344.83695652173918"/>
+            <point key="canvasLocation" x="-1201" y="256"/>
         </scene>
     </scenes>
     <color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings
index fbde81df..6f61fdaa 100644
--- a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings	
@@ -1340,3 +1340,4 @@
 "goods_origin_text" = "পন্যের উৎপত্তিস্থান প্রবেশ করান";
 "goods_type_text" = "পন্যের ধরন প্রবেশ করান";
 "port_of_shipment_text" = "কোন বন্দর থেকে শিপমেন্ট করা হয়েছে প্রবেশ করান";
+"memberShipId_text" = "Membership ID";
diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings
index 7a356593..710a843f 100644
--- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
@@ -169,7 +169,7 @@
 "exchange_rate_text" = "Exchange Rate";
 "service_charge_text" = "Service Charge";
 "payout_agent_text" = "Payout Agent/Bank";
-"i_have_read_to_text" = "I have read and agreed to";
+"i_have_read_to_text" = "I have read and agreed to ";
 "jme_user_aggreement_text" = "1. JME Remittance User Agreement";
 "send_money_text" = "Send Money";
 "enter_login_password_text" = "********";
@@ -939,3 +939,4 @@
 "goods_origin_text" = "Enter Goods Origin";
 "goods_type_text" = "Enter Goods Type";
 "port_of_shipment_text" = "Enter Port of Shipment";
+"memberShipId_text" = "Membership ID";
diff --git a/GME Remit/MultiLanguages/ja.lproj/Localizable.strings b/GME Remit/MultiLanguages/ja.lproj/Localizable.strings
index 2a9a72e7..05a39d2c 100644
--- a/GME Remit/MultiLanguages/ja.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ja.lproj/Localizable.strings	
@@ -191,7 +191,7 @@
 "jme_control_no_text" = "JME管理番号";
 "gme_control_security_text" = "このJME管理番号は厳重に保管してください。";
 "share_party_text" = "Share with concerned party only";
-"transaction_date_text" = "Transaction";
+"transaction_date_text" = "取引年月日";
 "receiver_text" = "受取人";
 "service_fee_text" = "サービス料";
 "ex_rate_text" = "為替レート";
@@ -939,3 +939,4 @@
 "goods_origin_text" = "原産地";
 "goods_type_text" = "商品。";
 "port_of_shipment_text" = "船積地。";
+"memberShipId_text" = "会員ID";
diff --git a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings
index 50c9c91b..e74be7bd 100644
--- a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings	
@@ -1361,3 +1361,4 @@
 "goods_origin_text" = "सामानको उत्पत्ति प्रविष्ट गर्नुहोस्";
 "goods_type_text" = "सामानको प्रकार प्रविष्ट गर्नुहोस्";
 "port_of_shipment_text" = "ढुवानी पोर्ट प्रविष्ट गर्नुहोस्";
+"memberShipId_text" = "सदस्यता आईडी";
diff --git a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings
index c06bb856..207d0c00 100644
--- a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings	
@@ -1347,3 +1347,4 @@ Chúng tôi đang xác minh thông tin của bạn.";
 "goods_origin_text" = "NHẬP XUẤT XỨ HÀNG HÓA";
 "goods_type_text" = "NHẬP LOẠI HÀNG HÓA";
 "port_of_shipment_text" = "NHẬP CẢNG GỬI HÀNG";
+"memberShipId_text" = "Membership ID";