diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj
index 6417c6bb..6442bdc6 100644
--- a/GME Remit.xcodeproj/project.pbxproj	
+++ b/GME Remit.xcodeproj/project.pbxproj	
@@ -7568,7 +7568,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 40;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;
@@ -7609,7 +7609,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 31;
+				CURRENT_PROJECT_VERSION = 40;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;
diff --git a/GME Remit/Modules/Home/User Interface/View/.DS_Store b/GME Remit/Modules/Home/User Interface/View/.DS_Store
index 5008ddfc..82650a77 100644
Binary files a/GME Remit/Modules/Home/User Interface/View/.DS_Store and b/GME Remit/Modules/Home/User Interface/View/.DS_Store differ
diff --git a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift
index d863c68d..df424d46 100644
--- a/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift	
+++ b/GME Remit/Modules/Home/User Interface/View/HomeViewController.swift	
@@ -356,7 +356,7 @@ class HomeViewController: UIViewController {
 extension HomeViewController: OtpDelegate {
     func getOtp(otp: String, tappedButton: String) {
         guard let userId = GMEDB.shared.user.string(.userId) else {return}
-        if tappedButton == "okay" {
+        if tappedButton == "ok_text".localized(){
             self.presenter?.checkOtp(otp: otp, userId: userId)
         }
         
@@ -410,7 +410,7 @@ extension HomeViewController {
         messageTitleLabel.text = "Change Password"
         messageLabel.text = "Please change your password"
         messageLeftImageview.image = UIImage(named: "Documents")
-        let tap = UITapGestureRecognizer(target: self, action: #selector(self.changetxnPin(_:)))
+        let tap = UITapGestureRecognizer(target: self, action: #selector(self.changePassword(_:)))
         messageView.addGestureRecognizer(tap)
     }
     
diff --git a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard
index 4838db21..3ab6f9c2 100644
--- a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.storyboard	
+++ b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistory.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" initialViewController="kME-hR-NgN">
+<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="kME-hR-NgN">
     <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="System colors in document resources" minToolsVersion="11.0"/>
@@ -32,11 +32,11 @@
                                 <color key="separatorColor" name="ThemeSeparate"/>
                                 <inset key="separatorInset" minX="15" minY="0.0" maxX="15" maxY="0.0"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="dt8-5N-azE">
-                                    <rect key="frame" x="0.0" y="157" width="375" height="44"/>
+                                    <rect key="frame" x="0.0" y="146" width="375" height="44"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="There is no notice" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hII-jh-P5Z">
-                                            <rect key="frame" x="123" y="12" width="129" height="20.5"/>
+                                            <rect key="frame" x="120" y="12" width="135.5" height="20"/>
                                             <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
                                             <color key="textColor" name="ThemeText"/>
                                             <nil key="highlightedColor"/>
@@ -50,7 +50,7 @@
                                 </view>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="NotificationCell" rowHeight="90" id="vWC-07-oo2" customClass="NotificationCell" customModule="JME_Remit" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="44.5" width="375" height="90"/>
+                                        <rect key="frame" x="0.0" y="28" width="375" height="90"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="vWC-07-oo2" id="jsL-8r-w5O">
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="90"/>
diff --git a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistoryViewController.swift b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistoryViewController.swift
index e8ad254e..00c1b78d 100644
--- a/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistoryViewController.swift	
+++ b/GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationHistoryViewController.swift	
@@ -32,7 +32,8 @@ class NotificationHistoryViewController: UIViewController {
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
     setupNormalNavigation()
-    title = "Notice"
+    title = "notice_text".localized()
+    noticeErrorLabel.text = "donot_have_notification_text".localized()
     
     if self.presentingViewController == nil {
       self.navigationItem.leftBarButtonItem = nil
diff --git a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift
index aae8f37f..1fac0d0f 100644
--- a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserAccessRequest/User Interface/View/ExistingUserRegistrationViewController.swift	
@@ -14,7 +14,7 @@ import RxCocoa
 class ExistingUserRegistrationViewController: UIViewController {
     
     struct StringConstants {
-        let userIdTitle = "id_number_text".localized()
+        let userIdTitle = "residence_id_placeholder".localized()
         
         let dobTitlePlaceholder = "dob_text".localized()
 
diff --git a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserRegistration/User Interface/View/UserRegistrationViewController.swift b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserRegistration/User Interface/View/UserRegistrationViewController.swift
index 56959b64..a47c57a7 100644
--- a/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserRegistration/User Interface/View/UserRegistrationViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/ExistingUserRegistration/UserRegistration/User Interface/View/UserRegistrationViewController.swift	
@@ -210,7 +210,7 @@ class UserRegistrationViewController: UIViewController {
 
 extension UserRegistrationViewController: OtpDelegate {
     func getOtp(otp: String, tappedButton: String) {
-        if tappedButton == "okay" {
+        if tappedButton == "ok_text".localized() {
             self.presenter?.checkOtp(otp: otp, userId: self.userIDTxtField.text ?? "", model: self.registerModel)
             
         }
diff --git a/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift b/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift
index 511e7a34..f2f494bf 100644
--- a/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift	
@@ -186,7 +186,7 @@ class NewUserRegisterViewController: UIViewController {
 
 extension NewUserRegisterViewController: OtpDelegate {
     func getOtp(otp: String, tappedButton: String) {
-        if tappedButton == "okay" {
+        if tappedButton == "ok_text".localized() {
             self.presenter?.checkOtp(otp: otp, userId: self.idTextField.text ?? "", model: self.registerModel)
             
         } 
diff --git a/GME Remit/Modules/RegisterModules/OtpVerification/User Interface/View/OtpVerificationViewController.swift b/GME Remit/Modules/RegisterModules/OtpVerification/User Interface/View/OtpVerificationViewController.swift
index b56a08bd..cf6be0b7 100644
--- a/GME Remit/Modules/RegisterModules/OtpVerification/User Interface/View/OtpVerificationViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/OtpVerification/User Interface/View/OtpVerificationViewController.swift	
@@ -36,14 +36,14 @@ class OtpVerificationViewController: UIViewController {
     // MARK: IBActions
     @IBAction func cancelTapped(_ sender: UIButton) {
         if delegate != nil {
-            delegate?.getOtp(otp: "", tappedButton: "cancel")
+            delegate?.getOtp(otp: "", tappedButton: "cancel_text".localized())
         }
         self.dismiss(animated: true, completion: nil)
     }
     
     @IBAction func okayTapped(_ sender: UIButton) {
         if delegate != nil {
-            delegate?.getOtp(otp: self.otpTextfield.text ?? "", tappedButton: "okay")
+            delegate?.getOtp(otp: self.otpTextfield.text ?? "", tappedButton: "ok_text".localized())
         }
         self.dismiss(animated: true, completion: nil)
     }
@@ -52,6 +52,9 @@ class OtpVerificationViewController: UIViewController {
     private func setup() {
         self.otpView.layer.cornerRadius = 5
         self.titleLabel.text = "enterCodeFromEmail_text".localized()
+        self.otpTextfield.placeholder = "emailCode_text".localized()
+        self.okButton.setTitle("ok_text".localized(), for: .normal)
+        self.cancelButton.setTitle("cancel_text".localized(), for: .normal)
     }
 }
 
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift
index 21954e62..a49f2375 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift	
@@ -565,7 +565,7 @@ class ExistingUserKycViewController: UIViewController {
         }).disposed(by: disposeBag)
         
         output.occupation.drive(onNext: {[weak self] in
-            let configure = TablePresenterConfiguration(presenterTitle: "Select Occupation")
+            let configure = TablePresenterConfiguration(presenterTitle: "select_occupation_text".localized())
             self?.occupationTextField.useAsDropDown(with: configure, items: $0)
         }).disposed(by: disposeBag)
         
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift
index 91281ce4..ef2d3182 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift	
@@ -241,7 +241,7 @@ class KYCVerifyStep1Presenter: ViewModelType {
                     viewController?.alert(message: "kyc_verification_id_error".localized())
                 }
                 if viewController?.additionalIDTextField.text == nil || viewController?.additionalIDTextField.text == ""  {
-                    viewController?.alert(message: "Please Select Additional ID Type")
+                    viewController?.alert(message: "selectAdditionalIdType_text".localized())
                 }
                 
                 else if (viewController?.occupationTxtField.text != "") && (viewController?.monthlyIncomeTextField.text != "") && (viewController?.mobileNumberTextField.text != "")  && (viewController?.addressTextField.text != "") && (viewController?.businessTypeTextField.text != "") && (viewController?.puroposeOfRegisterField.text != "") && (viewController?.idTypeTextField.text != "") && (viewController?.additionalIDTextField.text != "") {
diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
index 9a3e5832..1fa2187c 100644
--- a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift	
@@ -763,7 +763,7 @@ extension KYCVerifyStep1ViewController {
         }).disposed(by: disposeBag)
         
         output.occupation.drive(onNext: {[weak self] in
-            let configure = TablePresenterConfiguration(presenterTitle: "Select Occupation")
+            let configure = TablePresenterConfiguration(presenterTitle: "select_occupation_text".localized())
             self?.occupationTxtField.useAsDropDown(with: configure, items: $0)
         }).disposed(by: disposeBag)
         
diff --git a/GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift b/GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift
index 224b7722..c1435229 100644
--- a/GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift	
+++ b/GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift	
@@ -11,8 +11,8 @@ import UIKit
 class VerifyIDNumberViewController: UIViewController {
     
     struct StringConstants {
-        let residenceIdTitle = "residence_id_card_no_text".localized()
-        let residenceIdPlaceholder = "id_number_text".localized()
+        let residenceIdTitle = "residence_id_placeholder".localized()
+        let residenceIdPlaceholder = "residence_id_placeholder".localized()
         let residenceIdError = "residence_id_error".localized()
         let headerTitle = "register_title_text".localized()
         let verifyBtnTitle = "verify_text".localized()
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 93a088ea..ebaca3ca 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	
@@ -50,6 +50,7 @@ class CDDIViewControllerViewController: UIViewController {
         goodsOrigin.titleText = "goods_origin_text".localized()
         goodsType.titleText = "goods_type_text".localized()
         portofShipment.titleText = "port_of_shipment_text".localized()
+        continueButton.setTitle("continue_text".localized(), for: .normal)
         self.importsGoodsView.isHidden = true
     }
     
diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
index bb180190..16cffd4b 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift	
@@ -139,7 +139,7 @@ class TermsAndConditionViewController: UIViewController {
 extension TermsAndConditionViewController: OtpDelegate {
     func getOtp(otp: String, tappedButton: String) {
         guard let userId = GMEDB.shared.user.string(.userId) else {return}
-        if tappedButton == "okay" {
+        if tappedButton == "ok_text".localized() {
             self.presenter?.checkOtp(otp: otp, userId: userId, receiverID: self.reciepient?.receiverID ?? "")
         }
         
diff --git a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard
index 0e986faf..80ba436c 100644
--- a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.storyboard	
+++ b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistory.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" colorMatched="YES" initialViewController="GvJ-2t-mHS">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="GvJ-2t-mHS">
     <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"/>
@@ -80,7 +80,7 @@
                                                 </connections>
                                             </segmentedControl>
                                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Transaction Found" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jdu-hl-JUc">
-                                                <rect key="frame" x="122" y="128" width="131" height="44"/>
+                                                <rect key="frame" x="118.5" y="128" width="138" height="44"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="44" id="WU9-zv-79l"/>
                                                 </constraints>
@@ -95,13 +95,13 @@
                                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                 <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <view key="tableFooterView" contentMode="scaleToFill" id="0KB-Kj-EQz">
-                                                    <rect key="frame" x="0.0" y="267" width="355" height="44"/>
+                                                    <rect key="frame" x="0.0" y="256" width="355" height="44"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 </view>
                                                 <prototypes>
                                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="TransactionHistoryTableViewCell" rowHeight="100" id="Atv-Nn-ubf" customClass="TransactionHistoryTableViewCell" customModule="JME_Remit" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="44.5" width="355" height="100"/>
+                                                        <rect key="frame" x="0.0" y="28" width="355" height="100"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Atv-Nn-ubf" id="ObJ-hd-ZFd">
                                                             <rect key="frame" x="0.0" y="0.0" width="355" height="100"/>
@@ -117,16 +117,16 @@
                                                                                     <rect key="frame" x="15" y="10" width="300" height="60"/>
                                                                                     <subviews>
                                                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Xg-58-Lhd">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="300" height="14.5"/>
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="300" height="14"/>
                                                                                             <subviews>
                                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Tue, 19/12/2017" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lTb-Co-nsv">
-                                                                                                    <rect key="frame" x="0.0" y="0.0" width="150" height="14.5"/>
+                                                                                                    <rect key="frame" x="0.0" y="0.0" width="150" height="14"/>
                                                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                                     <color key="textColor" name="ThemeBlack"/>
                                                                                                     <nil key="highlightedColor"/>
                                                                                                 </label>
                                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ouw-tA-MfC">
-                                                                                                    <rect key="frame" x="150" y="0.0" width="150" height="14.5"/>
+                                                                                                    <rect key="frame" x="150" y="0.0" width="150" height="14"/>
                                                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                                     <color key="textColor" white="0.25" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                                                                                                     <nil key="highlightedColor"/>
@@ -134,7 +134,7 @@
                                                                                             </subviews>
                                                                                         </stackView>
                                                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eGL-X3-yur">
-                                                                                            <rect key="frame" x="0.0" y="14.5" width="300" height="30"/>
+                                                                                            <rect key="frame" x="0.0" y="14" width="300" height="30"/>
                                                                                             <subviews>
                                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="200" verticalCompressionResistancePriority="700" text="To: Dhan Singh Saud" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="p2g-GW-5Xg">
                                                                                                     <rect key="frame" x="0.0" y="0.0" width="150" height="30"/>
@@ -154,16 +154,16 @@
                                                                                             </subviews>
                                                                                         </stackView>
                                                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Y6-9G-6bb">
-                                                                                            <rect key="frame" x="0.0" y="44.5" width="300" height="15.5"/>
+                                                                                            <rect key="frame" x="0.0" y="44" width="300" height="16"/>
                                                                                             <subviews>
                                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Cash Payment" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nbJ-vS-KkN">
-                                                                                                    <rect key="frame" x="0.0" y="0.0" width="235" height="15.5"/>
+                                                                                                    <rect key="frame" x="0.0" y="0.0" width="235" height="16"/>
                                                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                                     <color key="textColor" name="ThemeBlack"/>
                                                                                                     <nil key="highlightedColor"/>
                                                                                                 </label>
                                                                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Unpaid" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oBB-nk-OGM">
-                                                                                                    <rect key="frame" x="235" y="0.0" width="65" height="15.5"/>
+                                                                                                    <rect key="frame" x="235" y="0.0" width="65" height="16"/>
                                                                                                     <constraints>
                                                                                                         <constraint firstAttribute="width" constant="65" id="W8P-Xj-TuP"/>
                                                                                                     </constraints>
@@ -231,7 +231,7 @@
                                                         </connections>
                                                     </tableViewCell>
                                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="InboundTransactionCell" rowHeight="100" id="bbG-p3-d1o" customClass="InboundTransactionCell" customModule="JME_Remit" customModuleProvider="target">
-                                                        <rect key="frame" x="0.0" y="144.5" width="355" height="100"/>
+                                                        <rect key="frame" x="0.0" y="128" width="355" height="100"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bbG-p3-d1o" id="KZh-fy-uOc">
                                                             <rect key="frame" x="0.0" y="0.0" width="355" height="100"/>
@@ -247,16 +247,16 @@
                                                                                     <rect key="frame" x="15" y="10" width="300" height="60"/>
                                                                                     <subviews>
                                                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="31d-2P-xgE">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="300" height="14.5"/>
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="300" height="14"/>
                                                                                             <subviews>
                                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Tue, 19/12/2017" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pU7-Vf-2z1">
-                                                                                                    <rect key="frame" x="0.0" y="0.0" width="150" height="14.5"/>
+                                                                                                    <rect key="frame" x="0.0" y="0.0" width="150" height="14"/>
                                                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                                     <color key="textColor" name="ThemeBlack"/>
                                                                                                     <nil key="highlightedColor"/>
                                                                                                 </label>
                                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="controlNumber" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZIs-Oh-u5M">
-                                                                                                    <rect key="frame" x="150" y="0.0" width="150" height="14.5"/>
+                                                                                                    <rect key="frame" x="150" y="0.0" width="150" height="14"/>
                                                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                                     <color key="textColor" white="0.25" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                                                                                                     <nil key="highlightedColor"/>
@@ -264,7 +264,7 @@
                                                                                             </subviews>
                                                                                         </stackView>
                                                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Tq-dD-DPn">
-                                                                                            <rect key="frame" x="0.0" y="14.5" width="300" height="30"/>
+                                                                                            <rect key="frame" x="0.0" y="14" width="300" height="30"/>
                                                                                             <subviews>
                                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="200" verticalCompressionResistancePriority="700" text="From: Sender Name" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="a0u-g8-9Ob">
                                                                                                     <rect key="frame" x="0.0" y="0.0" width="150" height="30"/>
@@ -284,16 +284,16 @@
                                                                                             </subviews>
                                                                                         </stackView>
                                                                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="8Kq-19-fos">
-                                                                                            <rect key="frame" x="0.0" y="44.5" width="300" height="15.5"/>
+                                                                                            <rect key="frame" x="0.0" y="44" width="300" height="16"/>
                                                                                             <subviews>
                                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Shinhan" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lpz-go-gHB">
-                                                                                                    <rect key="frame" x="0.0" y="0.0" width="215" height="15.5"/>
+                                                                                                    <rect key="frame" x="0.0" y="0.0" width="215" height="16"/>
                                                                                                     <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                                                                     <color key="textColor" name="ThemeBlack"/>
                                                                                                     <nil key="highlightedColor"/>
                                                                                                 </label>
                                                                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="PROCESSING" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.80000000000000004" translatesAutoresizingMaskIntoConstraints="NO" id="Ckd-qO-Mir">
-                                                                                                    <rect key="frame" x="220" y="0.0" width="80" height="15.5"/>
+                                                                                                    <rect key="frame" x="220" y="0.0" width="80" height="16"/>
                                                                                                     <color key="backgroundColor" red="0.031372549020000001" green="0.63921568630000003" blue="0.51764705879999995" alpha="1" colorSpace="calibratedRGB"/>
                                                                                                     <constraints>
                                                                                                         <constraint firstAttribute="width" constant="80" id="faj-0I-fHt"/>
@@ -370,7 +370,7 @@
                                                         <rect key="frame" x="0.0" y="0.0" width="343" height="35"/>
                                                         <subviews>
                                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="ojY-3U-Rll">
-                                                                <rect key="frame" x="109" y="-7.5" width="125" height="50"/>
+                                                                <rect key="frame" x="108.5" y="-7.5" width="126" height="50"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gGX-qp-QKa">
                                                                         <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -379,13 +379,13 @@
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="~" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JKy-P9-m5l">
-                                                                        <rect key="frame" x="58" y="0.0" width="9" height="50"/>
+                                                                        <rect key="frame" x="58" y="0.0" width="10" height="50"/>
                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="16"/>
                                                                         <color key="textColor" name="ThemeText"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h4N-LL-0cF">
-                                                                        <rect key="frame" x="75" y="0.0" width="50" height="50"/>
+                                                                        <rect key="frame" x="76" y="0.0" width="50" height="50"/>
                                                                         <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="16"/>
                                                                         <color key="textColor" name="ThemeText"/>
                                                                         <nil key="highlightedColor"/>
diff --git a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift
index b8c1c583..dd1f6a00 100644
--- a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift	
+++ b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift	
@@ -81,6 +81,7 @@ class TransactionHistoryViewController: UIViewController {
         super.viewDidLoad()
         self.setupNormalNavigation()
         self.setup()
+        emptyLabel.text = "no_transaction_found_text".localized()
         //    presenter?.viewIsReady()
     }
     
diff --git a/GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift b/GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift
index 4f270b07..564f5a5c 100644
--- a/GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift	
+++ b/GME Remit/Modules/RenewID/User Interface/View/RenewIDViewController.swift	
@@ -77,6 +77,10 @@ class RenewIDViewController: UIViewController {
         setBinding()
         setTitle(title: "renewId_text".localized())
         renewButton.setTitle("renewId_text".localized(), for: .normal)
+        frontIdLabel.text = "front_id_text".localized()
+        backIdLabel.text = "backId_text".localized()
+        viewSampleButton.setTitle("frontIdSample_text".localized(), for: .normal)
+        backSampleButton.setTitle("backIdSample_text".localized(), for: .normal)
     }
     
     private func setTitle(title: String) {
diff --git a/GME Remit/Modules/SideMenu/AboutGMEViewController.swift b/GME Remit/Modules/SideMenu/AboutGMEViewController.swift
index 0936ec20..82df6539 100644
--- a/GME Remit/Modules/SideMenu/AboutGMEViewController.swift	
+++ b/GME Remit/Modules/SideMenu/AboutGMEViewController.swift	
@@ -18,6 +18,7 @@ class AboutGMEViewController: UIViewController {
         let aboutGme = "about_gme_text".localized()
         let termsAndConditions = "terms_and_condition_title_text".localized()
         let privacyPolicy = "privacyAndPolicy_text".localized()
+        let fraudGuaranteePolicy = "fraud_guarantee_policy_text".localized()
     }
     
     // language
@@ -27,6 +28,7 @@ class AboutGMEViewController: UIViewController {
     @IBOutlet weak var versionTitleLabel: UILabel!
     @IBOutlet weak var termsAndConditionButton: UIButton!
     @IBOutlet weak var privacyPolicy: UIButton!
+    @IBOutlet weak var fraudGuarnteePolicy: UIButton!
     
     let facebookUrls: [String: String] = [
         "np" : "",
@@ -73,11 +75,20 @@ class AboutGMEViewController: UIViewController {
     }
     
     func configureLanguage() {
+        let attributes: [NSAttributedString.Key: Any] = [.underlineStyle: NSUnderlineStyle.single.rawValue]
+        let termsAndConditionAttribute = NSMutableAttributedString(string: StringConstants().termsAndConditions, attributes: attributes)
+        let privacyAttribute = NSMutableAttributedString(string: StringConstants().privacyPolicy, attributes: attributes)
+        let fraudAttribute = NSMutableAttributedString(string: StringConstants().fraudGuaranteePolicy, attributes: attributes)
+        
         self.descriptionLabel.text = StringConstants().descriptionText
         self.followUsTitleText.text = StringConstants().followText
         self.versionTitleLabel.text = StringConstants().appVersionText
-        self.termsAndConditionButton.setTitle(StringConstants().termsAndConditions, for: .normal)
-        self.privacyPolicy.setTitle(StringConstants().privacyPolicy, for: .normal)
+        self.termsAndConditionButton.setAttributedTitle(termsAndConditionAttribute, for: .normal)
+        self.privacyPolicy.setAttributedTitle(privacyAttribute, for: .normal)
+        self.fraudGuarnteePolicy.setAttributedTitle(fraudAttribute, for: .normal)
+        //self.termsAndConditionButton.setTitle(StringConstants().termsAndConditions, for: .normal)
+//        self.privacyPolicy.setTitle(StringConstants().privacyPolicy, for: .normal)
+//        self.fraudGuarnteePolicy.setTitle(StringConstants().fraudGuaranteePolicy, for: .normal)
     }
     
     @IBAction func checkForUpdate(_ sender: Any) {
diff --git a/GME Remit/Modules/SideMenu/SideMenu.storyboard b/GME Remit/Modules/SideMenu/SideMenu.storyboard
index d6b2688f..6443c48b 100644
--- a/GME Remit/Modules/SideMenu/SideMenu.storyboard	
+++ b/GME Remit/Modules/SideMenu/SideMenu.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">
+<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="retina5_5" 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"/>
@@ -45,7 +45,7 @@
                                                 <rect key="frame" x="0.0" y="0.0" width="334" height="110"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="..." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="kdg-zQ-NIN">
-                                                        <rect key="frame" x="0.0" y="10" width="15.666666666666666" height="43"/>
+                                                        <rect key="frame" x="0.0" y="10" width="15.333333333333334" height="43"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="43" id="zNb-i9-nnG"/>
@@ -55,7 +55,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="...." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="QNQ-s6-P5E">
-                                                        <rect key="frame" x="0.0" y="61" width="16.333333333333332" height="17"/>
+                                                        <rect key="frame" x="0.0" y="61" width="15.666666666666666" height="17"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="17" id="lMU-0b-sbd"/>
@@ -65,7 +65,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="....." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="SdX-nR-jpH">
-                                                        <rect key="frame" x="0.0" y="86" width="20.333333333333332" height="17"/>
+                                                        <rect key="frame" x="0.0" y="86" width="19.666666666666668" height="17"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="17" id="dRD-RB-xrC"/>
@@ -381,7 +381,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="667" translatesAutoresizingMaskIntoConstraints="NO" id="iFf-7f-Hxa">
-                                        <rect key="frame" x="0.0" y="0.0" width="414" height="784.33333333333337"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="414" height="784"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6iy-En-3n0">
                                                 <rect key="frame" x="0.0" y="0.0" width="414" height="150"/>
@@ -398,7 +398,7 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AYM-92-crE">
-                                                <rect key="frame" x="34" y="182" width="346" height="83.666666666666686"/>
+                                                <rect key="frame" x="34" y="182" width="346" height="81.666666666666686"/>
                                                 <string key="text">Japan Money Express (JME) is a registered money transfer company with Kanto Local Financial Bureau under the Payment Service Act. JME provides easy, speedy, safe and reliable way to transfer money in many parts of the world.</string>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
                                                 <color key="textColor" name="ThemeText"/>
@@ -412,13 +412,13 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="App Version" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E3H-nn-Nvh">
-                                                <rect key="frame" x="34" y="414.33333333333331" width="346" height="14.333333333333314"/>
+                                                <rect key="frame" x="34" y="414.33333333333331" width="346" height="14"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="12"/>
                                                 <color key="textColor" red="0.047058823529411764" green="0.12941176470588234" blue="0.41176470588235292" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1.0.1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cKU-hx-ROy">
-                                                <rect key="frame" x="34" y="435.66666666666669" width="346" height="14.333333333333314"/>
+                                                <rect key="frame" x="34" y="435.33333333333331" width="346" height="14"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
                                                 <color key="textColor" name="ThemeText"/>
                                                 <nil key="highlightedColor"/>
@@ -432,7 +432,7 @@
                                                 </constraints>
                                             </view>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Follow us on" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bfv-Bk-7vq">
-                                                <rect key="frame" x="34" y="484.33333333333331" width="346" height="14.333333333333314"/>
+                                                <rect key="frame" x="34" y="484.33333333333331" width="346" height="14"/>
                                                 <fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="12"/>
                                                 <color key="textColor" red="0.047058823529411764" green="0.12941176470588234" blue="0.41176470588235292" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -458,7 +458,7 @@
                                                 </connections>
                                             </button>
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="IFe-rR-lRI">
-                                                <rect key="frame" x="34" y="509" width="25" height="25"/>
+                                                <rect key="frame" x="34" y="508.66666666666674" width="25" height="25"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j8X-Fa-EPV">
                                                         <rect key="frame" x="0.0" y="0.0" width="25" height="25"/>
@@ -484,53 +484,31 @@
                                                     </button>
                                                 </subviews>
                                             </stackView>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Yn-Ri-dPJ">
-                                                <rect key="frame" x="34" y="285.66666666666669" width="124" height="26.333333333333314"/>
-                                                <state key="normal">
-                                                    <attributedString key="attributedTitle">
-                                                        <fragment content="Terms and Conditions">
-                                                            <attributes>
-                                                                <color key="NSColor" red="0.047058823529411764" green="0.12941176470588234" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                                <font key="NSFont" metaFont="label" size="12"/>
-                                                                <integer key="NSUnderline" value="1"/>
-                                                            </attributes>
-                                                        </fragment>
-                                                    </attributedString>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Yn-Ri-dPJ">
+                                                <rect key="frame" x="34" y="283.66666666666669" width="124" height="27"/>
+                                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="12"/>
+                                                <state key="normal" title="Terms and Conditions">
+                                                    <color key="titleColor" red="0.047058823529411764" green="0.12941176470588234" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </state>
                                                 <connections>
                                                     <action selector="termsAndCondition:" destination="Yhd-pK-olD" eventType="touchUpInside" id="cpG-KG-rpk"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="c1W-1U-xTi">
-                                                <rect key="frame" x="34" y="320" width="79" height="26.333333333333314"/>
-                                                <state key="normal">
-                                                    <attributedString key="attributedTitle">
-                                                        <fragment content="Privacy Policy">
-                                                            <attributes>
-                                                                <color key="NSColor" red="0.047058823529411764" green="0.12941176470588234" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                                <font key="NSFont" metaFont="label" size="12"/>
-                                                                <integer key="NSUnderline" value="1"/>
-                                                            </attributes>
-                                                        </fragment>
-                                                    </attributedString>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c1W-1U-xTi">
+                                                <rect key="frame" x="34" y="318.66666666666669" width="79" height="27"/>
+                                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="12"/>
+                                                <state key="normal" title="Privacy Policy">
+                                                    <color key="titleColor" red="0.047058823529411764" green="0.12941176470588234" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </state>
                                                 <connections>
                                                     <action selector="privacyPolicy:" destination="Yhd-pK-olD" eventType="touchUpInside" id="WDE-Dl-ZEc"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d4v-K1-E9M">
-                                                <rect key="frame" x="34" y="354.33333333333331" width="132" height="26.333333333333314"/>
-                                                <state key="normal">
-                                                    <attributedString key="attributedTitle">
-                                                        <fragment content="Fraud Guarantee Policy">
-                                                            <attributes>
-                                                                <color key="NSColor" red="0.047058823529411764" green="0.12941176470588234" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                                <font key="NSFont" metaFont="label" size="12"/>
-                                                                <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
-                                                                <integer key="NSUnderline" value="1"/>
-                                                            </attributes>
-                                                        </fragment>
-                                                    </attributedString>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="d4v-K1-E9M">
+                                                <rect key="frame" x="34" y="353.66666666666669" width="132" height="27"/>
+                                                <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="12"/>
+                                                <state key="normal" title="Fraud Guarantee Policy">
+                                                    <color key="titleColor" red="0.047058823529411764" green="0.12941176470588234" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 </state>
                                                 <connections>
                                                     <action selector="fraudGuaranteePolicy:" destination="Yhd-pK-olD" eventType="touchUpInside" id="qjt-Aa-RFJ"/>
@@ -598,6 +576,7 @@
                     <connections>
                         <outlet property="descriptionLabel" destination="AYM-92-crE" id="pmb-aV-bdn"/>
                         <outlet property="followUsTitleText" destination="bfv-Bk-7vq" id="sTN-DG-PWP"/>
+                        <outlet property="fraudGuarnteePolicy" destination="d4v-K1-E9M" id="nca-QU-WqM"/>
                         <outlet property="privacyPolicy" destination="c1W-1U-xTi" id="WbU-v3-xdW"/>
                         <outlet property="termsAndConditionButton" destination="5Yn-Ri-dPJ" id="tAj-3J-MLk"/>
                         <outlet property="versionLabel" destination="cKU-hx-ROy" id="OnM-c4-nfB"/>
@@ -606,7 +585,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="gAg-7j-EqI" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4485.507246376812" y="3171.1956521739135"/>
+            <point key="canvasLocation" x="4681" y="3127"/>
         </scene>
     </scenes>
     <resources>
diff --git a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings
index 03b4d859..22a7be2a 100644
--- a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings	
@@ -53,9 +53,9 @@
 "reward_point_text" = "Reward Point";
 
 "available_balance_text" = " আপনার ব্যাল্যান্স ";
-"gme_wallet_no_text" = " GME Wallet No.";
+"gme_wallet_no_text" = " JME একাউন্ট নম্বর";
 "auto_debit_account_text" = " অটো ডেবিট একাউন্ট ";
-"about_gme_text" = " GME সম্পর্কে";
+"about_gme_text" = "জাপান মানি এক্সপ্রেস সম্পর্কিত";
 "settings_text" = " সেটিংস";
 "logout_text" = "লগ আউট";
 "logout_confirmation_title_text" = "লগ আউট?";
@@ -810,7 +810,7 @@
 "terms_and_condition_title_text"="শর্তাবলী";
 "privacyAndPolicy_text"="গোপনীয়তা নীতি";
 "app_name"="জাপান মানি এক্সপ্রেস";
-"about_me_description_text"="জাপানের মানি এক্সপ্রেস স্ট্যান্ড গ্রাহকদের জন্য ডিজিটাল চ্যানেল সক্ষম করতে তরুণ নেপালি ইঞ্জিনিয়ারদের দ্বারা উদ্ভাবিত একটি উদ্ভাবনী সমাধান।";
+"about_me_description_text"="জাপান মানি এক্সপ্রেস (জেএমই) পেমেন্ট সার্ভিসেস অ্যাক্টের অধীনে কান্তো স্থানীয় আর্থিক ব্যুরোর সাথে একটি নিবন্ধিত অর্থ স্থানান্তর সংস্থা। জেএমই বিশ্বের অনেক অংশে অর্থ স্থানান্তর করার জন্য সহজ, দ্রুত, নিরাপদ এবং নির্ভরযোগ্য উপায় সরবরাহ করে।";
 "app_version_text"="অ্যাপ্লিকেশন সংস্করণ";
 "check_for_update_text"="আপডেটের জন্য অনুসন্ধান করুণ";
 "follow_us_text"="আমাদেরকে অনুসরণ করুন";
@@ -1264,7 +1264,7 @@
 "residence_id_card_no_text"="বাসস্থান আইডি কার্ড নম্বর";
 "residence_id_placeholder"="বাসস্থান আইডি কার্ড নম্বর";
 "verify_text"="যাচাই";
-"residence_id_error"="অবৈধ বাসস্থান আইডি নম্বর";
+"residence_id_error"="অবৈধ আবাসিক কার্ড নম্বর";
 "register_title_text1"="JME নিবন্ধন";
 "register_title_text"="জাপান মানি এক্সপ্রেস নিবন্ধন";
 "existing_register_title"="জেএমই ব্যবহারকারী রেজিস্ট্রেশন বিদ্যমান";
@@ -1340,7 +1340,7 @@
 "goods_origin_text" = "পন্যের উৎপত্তিস্থান প্রবেশ করান";
 "goods_type_text" = "পন্যের ধরন প্রবেশ করান";
 "port_of_shipment_text" = "কোন বন্দর থেকে শিপমেন্ট করা হয়েছে প্রবেশ করান";
-"memberShipId_text" = "Membership ID";
+"memberShipId_text" = "মেম্বার আইডি";
 
 "i_have_read_to_text_consent_text" = "   আমি JME শর্তাবলী পড়েছি এবং সম্মত হয়েছি";
 "renewId_text" = "আইডি রিনিউ করুন";
@@ -1348,3 +1348,23 @@
 "enterCodeFromEmail_text" = "ইমেইল-এ প্রাপ্ত কোড লিখুন";
 "agree_and_submit_text" = "সম্মত এবং জমা দিন";
 "biometric_setup" = "বায়োমেট্রিক সেটাপে লগইন করুন";
+"fraud_guarantee_policy_text" = "জালিয়াতি নিশ্চয়োতার নীতি";
+"ok_text" = "ঠিক আছে";
+"emailCode_text" = "ইমেইল কোড";
+"enter_your_password_to_setup_fingerprint" = "আঙ্গু্গুলের ছাপ সেটআপের জন্য আপনার পাসওয়ার্ড প্রদান করুন";
+"frontIdSample_text" = "সামনের আইডির নমুনা";
+"front_id_text" = "ফ্রন্ট আইডি";
+"backId_text" = "পেছনের আইডি";
+"backIdSample_text" = "পিছনের আইডির নমুনা";
+"select_business_type" = "ব্যাবসায়ের ধরণ নির্বাচন করুন";
+"select_additionalId_type_text" = "অতিরিক্ত আইডির টাইপ নির্বাচন করুন";
+"select_purpose_of_registration_text" = "নিবন্ধনের উদ্দেশ্য নির্বাচন করুন";
+"additional_address_text" = "অতিরিক্ত ঠিকানা";
+"purpose_of_registration_text" = "নিবন্ধনের উদ্দেশ্য";
+"saveButtonInfo_text" = "নাম, জাতীয়তা, ঠিকানা ও লিঙ্গ এখানে জমা দেওয়া ব্যক্তিগত সনাক্তকরণ নথিতে বর্ণিত হয়।";
+"request_summary_text" = "অনুরোধ সারাংশ";
+"send_money_success_header_text" = "আমরা আপনার রেমিটেন্স অনুরোধ পেয়েছি";
+"send_money_success_body_text" = "দয়া করে পরিশোধ করুন";
+"send_money_success_footer_text" = "JME থেকে পরবর্তী কারযদিবসের মধ্যে যেন আপনার অনুরোধটি প্রেরন করা যায়। পেমেন্ট করুন এবং পেমেন্ট করার পর নোটিশ চেক করুন যেন এই ট্রানজেকশনের পিন/JME নম্বর পাওয়া যায় ";
+"residence_id_placeholder" = "আবাসিক কার্ড নম্বর";
+"residence_id_error" = "অবৈধ আবাসিক কার্ড নম্বর";
diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings
index 050cc37b..981954a5 100644
--- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/en.lproj/Localizable.strings	
@@ -35,7 +35,7 @@
 //Register
 "residence_id_card_no" = "Residence ID Card No";
 "residence_id_placeholder" = "Residence ID Card Number";
-"residence_id_error" = "Invalid Residence ID No";
+"residence_id_error" = "Invalid Residence Card Number";
 "register_title_text" = "Register to\nJME";
 "create_password_text" = "Create Password";
 "confirm_password_text" = "Confirm Password";
@@ -223,7 +223,7 @@
 
 "setting_text" = "Setting";
 "change_password_text" = "Change Password";
-"about_me_description_text" = "Japan Money Express (JME) is a registered money transfer company with Kanto Local Financial Bureau under the Payment Service Act. JME provides easy, speedy, safe and reliable way to transfer money in many parts of the world.";
+"about_me_description_text" = "Japan Money Express (JME) is a registered money transfer company with Kanto Local Financial Bureau under the Payment Services Act. JME provides easy, speedy, safe and reliable way to transfer money in many parts of the world.";
 "app_version_text" = "App Version";
 "follow_us_text" = "Follow us on";
 "check_for_update_text" = "Check for Update";
@@ -943,3 +943,15 @@
 
 "i_have_read_to_text_consent_text" = "   I have read and agree to JME Terms & Conditions";
 "enterCodeFromEmail_text" = "Enter the code received in email";
+"fraud_guarantee_policy_text" = "Fraud Guarantee Policy";
+"ok_text" = "Ok";
+"emailCode_text" = "Email code";
+"enter_your_password_to_setup_fingerprint" = "Enter your password to setup fingerprint";
+"frontIdSample_text" = "Front ID Sample";
+"front_id_text" = "Front ID";
+"backId_text" = "Back ID";
+"backIdSample_text" = "Back ID Sample";
+"donot_have_notification_text" = "You don't have any notification at the moment.";
+"selectAdditionalIdType_text" = "Select Additional ID Type";
+"residence_id_placeholder" = "Residence Card Number";
+"residence_id_error" = "Invalid Residence Card Number";
diff --git a/GME Remit/MultiLanguages/en_PH.lproj/Localizable.strings b/GME Remit/MultiLanguages/en_PH.lproj/Localizable.strings
index 7319e199..e4d70274 100644
--- a/GME Remit/MultiLanguages/en_PH.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/en_PH.lproj/Localizable.strings	
@@ -524,3 +524,4 @@
 
 "requestedAmt_text"="Hiniling na Halaga";
 "confirmSendingAmt_text"="Kumpirmahin ang halaga ng pagpapadala";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/id.lproj/Localizable.strings b/GME Remit/MultiLanguages/id.lproj/Localizable.strings
index 8eb6f56c..5807572a 100644
--- a/GME Remit/MultiLanguages/id.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/id.lproj/Localizable.strings	
@@ -816,3 +816,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "Peringatan Penipuan";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/ja.lproj/Localizable.strings b/GME Remit/MultiLanguages/ja.lproj/Localizable.strings
index 289d04c2..6e080d24 100644
--- a/GME Remit/MultiLanguages/ja.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ja.lproj/Localizable.strings	
@@ -27,7 +27,7 @@
 "for_validation_6_digit_pin_text" = "お取引の確認には、6桁のお取引用暗証番号が必要となりますので、下記に暗証番号をご指定ください。";
 "new_pin_title" = "New PIN";
 "new_pin_error_text" = "PINは6桁の数字でお願いします。";
-"confirm_pin_title" = "Confirm PIN";
+"confirm_pin_title" = "暗証番号の確認";
 "confirm_pin_placeholder" = "暗証番号の確認";
 
 "enter_your_transaction_pin_text" = "取引用暗証番号を入力してください。";
@@ -35,7 +35,7 @@
 //Register
 "residence_id_card_no" = "Residence ID Card No";
 "residence_id_placeholder" = "Residence ID Card Number";
-"residence_id_error" = "Invalid Residence ID No";
+"residence_id_error" = "在留カード番号が無効です";
 "register_title_text" = "JMEへの登録";
 "create_password_text" = "Create Password";
 "confirm_password_text" = "パスワードの確認";
@@ -943,3 +943,15 @@
 
 "i_have_read_to_text_consent_text" = "   JMEの利用規約を読み、同意します。";
 "enterCodeFromEmail_text" = "メールに記載されているコードを入力してください。";
+"fraud_guarantee_policy_text" = "不正行為の保証について";
+"ok_text" = "オーケー";
+"emailCode_text" = "Eメールコード";
+"enter_your_password_to_setup_fingerprint" = "パスワードを入力して指紋を設定する。";
+"frontIdSample_text" = "表面IDサンプル画像";
+"front_id_text" = "ID表面";
+"backId_text" = "ID裏面";
+"backIdSample_text" = "裏面IDサンプル画像";
+"donot_have_notification_text" = "現時点では何の通知もありません。";
+"selectAdditionalIdType_text" = "追加IDタイプの選択";
+"residence_id_placeholder" = "在留カード番号";
+"residence_id_error" = "在留カード番号が無効です";
diff --git a/GME Remit/MultiLanguages/km.lproj/Localizable.strings b/GME Remit/MultiLanguages/km.lproj/Localizable.strings
index 6f3e5faf..2afa8073 100644
--- a/GME Remit/MultiLanguages/km.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/km.lproj/Localizable.strings	
@@ -817,3 +817,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "សូមប្រយ័ត្នទៅលើការឆបោកទៅលើការផ្ទេរប្រាក់";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/ko.lproj/Localizable.strings b/GME Remit/MultiLanguages/ko.lproj/Localizable.strings
index 128ba57e..471b680b 100644
--- a/GME Remit/MultiLanguages/ko.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ko.lproj/Localizable.strings	
@@ -814,3 +814,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "송금 사기 주의";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/my-MM.lproj/Localizable.strings b/GME Remit/MultiLanguages/my-MM.lproj/Localizable.strings
index 6603a987..45987e12 100644
--- a/GME Remit/MultiLanguages/my-MM.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/my-MM.lproj/Localizable.strings	
@@ -785,3 +785,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "ငွေကြေးဆိုင်ရာ လိမ်လည်မှုများသတိပြုရန်";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/my.lproj/Localizable.strings b/GME Remit/MultiLanguages/my.lproj/Localizable.strings
index b59e8a89..7f962817 100644
--- a/GME Remit/MultiLanguages/my.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/my.lproj/Localizable.strings	
@@ -822,3 +822,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "ငွေကြေးဆိုင်ရာ လိမ်လည်မှုများသတိပြုရန်";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings
index 2b8c1f24..9ae43c0b 100644
--- a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings	
@@ -11,11 +11,11 @@
 "user_Id_placeholder_text" = "दर्ता भएको e-mail ";
 "password_text" = "पासवर्ड ";
 "forgot_password_text" = "नयाँ पासवर्ड ";
-"new_to_gme_text" = "GME को नयाँ प्रयोगकर्ता को लागि ";
+"new_to_gme_text" = "JME को नयाँ प्रयोगकर्ता को लागि ";
 "login_register_here_text" = "यहाँ दर्ता गर्नुहोस ";
 "user_id_empty_error" = "युजर आइडी खाली हुनु हुँदैन";
 
-"register_title_text" = "GME दर्ता गर्नुहोस ";
+"register_title_text" = "JME दर्ता गर्नुहोस ";
 "register_subtitle_text" = "आफ्नो e-mail ठेगाना बाट दर्ता गर्नुहोस ";
 "create_password_text" = "पासवर्ड बनाउनुहोस ";
 "confirm_password_text" = "पासवर्ड  पक्का गर्नुहोस ";
@@ -39,25 +39,25 @@
 "kyc_fill_text" = "एकाउन्ट रुजु गर्नुहोस ";
 "kyc_verify_pending_text" = " रुजु हुँदै छ ";
 "penny_test_pending_text" = "दर्ता को लागि अगाडी बढ्नुहोस ";
-"complete_your_registration_text" = "GME प्रयोग गर्न, पहिला दर्ता प्रकृया पुरा गर्नुहोस ";
-"verification_in_aproval_process_text" = "हजुरको दर्ता प्रकृया पुरा हुँदैछ, दर्ता भए पछी GME प्रयोग गर्न सक्नुहुनेछ ";
+"complete_your_registration_text" = "JME प्रयोग गर्न, पहिला दर्ता प्रकृया पुरा गर्नुहोस ";
+"verification_in_aproval_process_text" = "हजुरको दर्ता प्रकृया पुरा हुँदैछ, दर्ता भए पछी JME प्रयोग गर्न सक्नुहुनेछ ";
 "complete_penny_test" = "दर्ता पुरा गर्नकोलागि बैंकअकाउन्ट रुजु गर्नुहोस ";
 "remaining_limit_text" = "यो बर्ष पठाउन मिल्ने बाँकी रकम  ";
 "send_money_text" = "पैसा पठाउनुहोस ";
 "todays_rate_text" = "आजको विनिमय दर ";
 "transaction_report_text" = "पैसा पठाएको विवरण ";
-"gme_wallet_statement_text" = "GME वालेट विवरण ";
+"gme_wallet_statement_text" = "JME वालेट विवरण ";
 "home_text" = "होम ";
 "branch_text" = "शाखा";
 "profile_text" = "व्यक्तिगत विवरण ";
 "help_you_text" = "ग्राहक सेवा समय बिहान ९:३० बजे देखी बेलुका ६:३० बजे सम्म";
 "cancel_text" = "रद्द गर्नुहोस";
-"reward_point_text" = "GME पोइन्ट ";
+"reward_point_text" = "JME पोइन्ट ";
 
 "available_balance_text" = "खतामा बाँकी रकम ";
-"gme_wallet_no_text" = "GME वालेट नम्बर ";
+"gme_wallet_no_text" = "JME वालेट नम्बर ";
 "auto_debit_account_text" = "अटो डेबिट खाता ";
-"about_gme_text" = "GME को बारेमा ";
+"about_gme_text" = "जापान मनी एक्सप्रेस बारे";
 "settings_text" = "सेटिङ ";
 "logout_text" = "लग आउट ";
 "logout_confirmation_title_text" = "लग आउट ?";
@@ -142,7 +142,7 @@
 "service_charge_text" = "सेवा शुल्क ";
 "payout_agent_text" = "भुक्तानी लिने बैंक/एजेन्ट ";
 "i_have_read_to_text" = "मैले बुझें ";
-"gme_user_aggreement_text" = "GME ग्राहक सम्झौताको नियम ";
+"gme_user_aggreement_text" = "JME ग्राहक सम्झौताको नियम ";
 "agree_and_send_text" = "पैसा पठाउनुहोस ";
 "enter_login_password_text" = "हजुरको लग इन  पासवर्ड  रख्नुहोस ";
 "enter_otp_password_text" = "4 अंक को  ओटिपी कोड प्रविष्ट गर्नुहोस्";
@@ -163,8 +163,8 @@
 "transfer_success_text" = "पैसा ट्रान्स्फर भयो । ";
 "transfer_success_info_text" = "पैसा सफलतापूर्वक ट्रान्स्फर भयो । ";
 "total_payout_amount_text" = "कुल भुक्तानी रकम";
-"gme_control_no_text" = "GME Control नम्बर";
-"gme_control_security_text" = "कृपया यो GME Control नम्बर सुरक्षित राख्नुहोस।";
+"gme_control_no_text" = "JME Control नम्बर";
+"gme_control_security_text" = "कृपया यो JME Control नम्बर सुरक्षित राख्नुहोस।";
 "share_party_text" = "सम्बन्धित पक्षसँग मात्र शेयर गर्नुहोला ";
 "transaction_date_text" = "कारोबार मिति";
 "receiver_text" = "पाउने ";
@@ -397,7 +397,7 @@
 
 
 "resend_money_text" = "पैसा पुन: पठाउनुहोस";
-"resend_search_hint_text" = "GME नम्बर / पाउनेको नाम / बैंकको नाम  ";
+"resend_search_hint_text" = "JME नम्बर / पाउनेको नाम / बैंकको नाम  ";
 
 
 "support_description_text" = "हामी यहाँ सधैं हजुरहरुको मद्दतका लागि छौ ";
@@ -407,7 +407,7 @@
 "request_for_amendment_text" = "संशोधन अनुरोध ";
 "no_subject_error_text" = "कृपया एक विषय लेख्नुहोस";
 "no_message_body_text" = "सन्देश लेख्नुहोस";
-"no_control_id_error_text" = "GME नम्बर फेला परेन";
+"no_control_id_error_text" = "JME नम्बर फेला परेन";
 "no_transaction_id_error_text" = "कारोबर आईडी फेला परेन";
 
 
@@ -441,7 +441,7 @@
 "selected_product_message_text" = "तपाईंको रिवार्ड अंक बाट xxx रिडिम गर्नुहोस्,ooo अंक हरु तपाईंको रिवार्ड अंक बाट कटौटी हुनेछ  ";
 "select_branch_for_redeem_your_reward_text" = "रिवार्ड रिडिम को लागि शाखा चयन गर्नुहोस ";
 "select_branch_text" = "शाखा चयन गर्नुहोस ";
-"you_visit_nearest_gme_branch_to_redeem_text" = "तपाईंको रिवार्ड प्रत्यक्ष रूपमा चयनको लागि नजिकैको GME शाखामा जानुहोस ";
+"you_visit_nearest_gme_branch_to_redeem_text" = "तपाईंको रिवार्ड प्रत्यक्ष रूपमा चयनको लागि नजिकैको JME शाखामा जानुहोस ";
 "order_completed_message_text" = "तपाईंको अर्डर पूरा भएको छ। तपाईको नजिकैको शाखाबाट यसलाई लिनुहोस l";
 "order_completed_message_title_text" = "बधाई छ";
 
@@ -520,10 +520,10 @@
 
 // new registration
 "userid_title_text" = "प्रयोगकर्ताको आइडी";
-"userid_placeholder_text" = "GME प्रयोगको लागि तपाईंको ID प्रविष्ट गर्नुहोस्";
+"userid_placeholder_text" = "JME प्रयोगको लागि तपाईंको ID प्रविष्ट गर्नुहोस्";
 "userid_error_text" = "आईडीको अंक ४ देखि ५० अक्षरहरूको बीचमा हुनुपर्नेछ";
 "password_policy_text" = "पासवर्ड कम्तिमा ६ शब्दको हुनुपर्दछ";
-"kyc_form_exit_confirmation_text" = "KYC जानकारी GME सेवाहरू प्रयोगको लागि आवश्यक छ। के तपाइँ साँच्चै बाहिर निस्कन चाहनुहुन्छ?";
+"kyc_form_exit_confirmation_text" = "KYC जानकारी JME सेवाहरू प्रयोगको लागि आवश्यक छ। के तपाइँ साँच्चै बाहिर निस्कन चाहनुहुन्छ?";
 "retry_text" = "पुन: प्रयास गर्नुहोस्";
 
 // Login
@@ -537,7 +537,7 @@
 "live_chat_text" = "प्रत्यक्ष कुराकानी";
 
 // forgotPassword
-"forgot_password_subtitle_text" = "तपाईंको GME खातासँग लिंक गरिएको तपाईंको प्रयोगकर्ता आईडी प्रयोग गरेर तपाईंको पासवर्ड रिसेट गर्नुहोस्।";
+"forgot_password_subtitle_text" = "तपाईंको JME खातासँग लिंक गरिएको तपाईंको प्रयोगकर्ता आईडी प्रयोग गरेर तपाईंको पासवर्ड रिसेट गर्नुहोस्।";
 "forgot_password_userId_placeholder_text" = "दर्ता गरिएको प्रयोगकर्ता आईडी";
 
 
@@ -633,7 +633,7 @@
 "no_native_country_found_text" = "हजुर को देश को नाम भेटिएन";
 
 // Home's messageView
-"autodebit_account_required_message" = " GME सेवाहरू प्रयोग गर्न कृपया आफ्नो Auto Debit खाता थप्नुहोस्।";
+"autodebit_account_required_message" = " JME सेवाहरू प्रयोग गर्न कृपया आफ्नो Auto Debit खाता थप्नुहोस्।";
 
 // Domestic Remittance
 "local_transfer_text" = "कोरियाको बैंकमा  पठाउनुहोस";
@@ -669,7 +669,7 @@
 "add_text" = "थप गर्नु";
 "inbound_text" = "इन्बाउण्ड";
 "outbound_text" = "आउटबाउन्ड";
-"pennytest_information_text" = "GMEले तपाईको खातामा १ वोन पठाएको छ, कृपया बैंकको विवरण हेर्नुहोस र GME सहित ४ नम्बर बाट १ वोन भुक्तानी भएको हुन्छ, त्यो ४ नम्बर हल्नुहोस";
+"pennytest_information_text" = "JMEले तपाईको खातामा १ वोन पठाएको छ, कृपया बैंकको विवरण हेर्नुहोस र JME सहित ४ नम्बर बाट १ वोन भुक्तानी भएको हुन्छ, त्यो ४ नम्बर हल्नुहोस";
 "deposit_reference_text" = "भुक्तानीकर्ता उल्लेख गर्नुहोस";
 "resend_text" = "पुन: पठाउनुहोस";
 "added_inbound_account_message_text" = "इन्बाउण्ड खाता जोडिएको छ";
@@ -680,7 +680,7 @@
 "inbound_receipt_text" = "इन्बाउण्ड रसिद";
 "transfer_processing_text" = "स्थानान्तरण प्रक्रिया हुदैछ";
 "transfer_canceled_text" = "स्थानान्तरण प्रक्रिया रद्द भयो";
-"you_have_to_register_text" = "तपाई GME मा दर्ता हुनुपर्नेछ";
+"you_have_to_register_text" = "तपाई JME मा दर्ता हुनुपर्नेछ";
 "transaction_will_be_processed_text" = "स्थानान्तरणलाई चाडै प्रक्रिया गरिनेछ";
 "link_korean_bank_account" = "विदेश बाट पैसा पाउनको लागि तपाईको कोरियाको बैंक लिंक गर्नुहोस ";
 "control_no_text" = "कन्ट्रोल नम्बर";
@@ -690,7 +690,7 @@
 
 // Local Top up
 "local_top_up_text" = "प्रीपेड फोन चार्ज";
-"gme_wallet_text" = "GMEव्वालेट";
+"gme_wallet_text" = "JMEव्वालेट";
 "regular_type_text" = "सामान्य दर";
 "regular_type_information_text_1" = "मोबाइल फोन नम्बर र रिचार्ज रकम पुष्टि गर्नुहोस्";
 "regular_type_information_text_2" = "रिचार्ज पूरा भएपछि, रकम फिर्ती गर्न मिल्दैन";
@@ -711,8 +711,8 @@
 "recharge_request_success_text" = "रिचार्ज अनुरोध सफल भयो";
 "waitinge_recent_request_text" = "हालै एक रिचार्ज अनुरोध प्रक्रियामा छ। कृपया अगिल्लो रिचार्ज अनुरोधको परिणाम प्रतीक्षा गर्नुहोस्";
 "recharge_payment_text" = "रिचार्ज भुक्तानी शुल्क";
-"expected_gme_wallet_balance_text" = "अनुमानित GME वालेट शेष रकम";
-"pay_using_gme_wallet_text" = "GME Wallet वालेट प्रयोग गरेर भुक्तान गर्नुहोस्";
+"expected_gme_wallet_balance_text" = "अनुमानित JME वालेट शेष रकम";
+"pay_using_gme_wallet_text" = "JME Wallet वालेट प्रयोग गरेर भुक्तान गर्नुहोस्";
 "select_type_text" = "प्रकार चयन गर्नुहोस्";
 "select_plan_text" = "मासिक योजना चयन गर्नुहोस्";
 "success_uppercase_text" = "सफल भयो";
@@ -723,7 +723,7 @@
 // Manage Agreement
 "terms_and_conditions_text" = "नियम र सर्तहरु";
 "terms_and_conditions_title_text" = "नियम र सर्तहरू स्वीकार गर्नुहोस्।";
-"terms_and_conditions_content_text" = "GME को वैदेशिक रेमिट्यान्स र घरेलु रेमिट्यान्स सहजै प्रयोग गर्न तपाईले आफ्नो खाताबाट स्वतः पैसा निकाल्ने सेवाको सहमति गर्नु पर्नेछ। वैदेशिक रेमिट्यान्स वा घरेलु रेमिट्यान्स जस्ता सेवाहरू प्रयोग गर्दा, open banking platform को auto-debit मार्फत तपाईले सहमति दिएको खाताबाट स्वतः पैसा निकालिनेछ";
+"terms_and_conditions_content_text" = "JME को वैदेशिक रेमिट्यान्स र घरेलु रेमिट्यान्स सहजै प्रयोग गर्न तपाईले आफ्नो खाताबाट स्वतः पैसा निकाल्ने सेवाको सहमति गर्नु पर्नेछ। वैदेशिक रेमिट्यान्स वा घरेलु रेमिट्यान्स जस्ता सेवाहरू प्रयोग गर्दा, open banking platform को auto-debit मार्फत तपाईले सहमति दिएको खाताबाट स्वतः पैसा निकालिनेछ";
 "personal_info_treatment_policy_text" = "गोपनीयता नीति";
 "personal_info_usesage_text" = "व्यक्तिगत जानकारी संकलन र प्रयोग गर्न सहमत गर्नुहोस्";
 "agreement_legal_text" = "म कानूनको हेरफेर र अवैध व्यवहार निषेधको लागि वास्तविक नाम पुष्टि गर्न सहमत छु";
@@ -820,7 +820,7 @@
 "terms_and_condition_title_text"="नियम र सर्त";
 "privacyAndPolicy_text"="गोपनीयता र  नीति";
 "app_name"="जापान मनी एक्सप्रेस ";
-"about_me_description_text"="जापान मनी एक्सप्रेस एक नवीन अभिनव समाधान हो जुन युवा नेपाली इञ्जिनियरहरूले डिजिटल ग्राहकहरूको रेमिट्यान्स उत्पादनहरू र सेवाहरू पहुँच गर्नका लागि डिजिटल च्यानलहरू सक्षम गर्नका लागि उपभोक्ताको रेमिट्यान्सलाई वास्तविक समयको आधारमा डिजिटल च्यानलहरू प्रयोग गरेर सम्बोधन गर्न सहयोग पुर्‍याउँछ। सबै कन्फिगरेसनहरू ब्याकएन्ड वेब ( backend web ) अनुप्रयोग प्रणालीबाट गरिन्छ। जसले अपरेसन प्रयोगकर्ताहरूलाई सबै कन्फिगरेसनहरू प्रबन्ध गर्न र सही निर्णय लिन अनुमति दिन्छ।";
+"about_me_description_text"="जापनको कान्तो लोकल फाइनेन्सियल ब्युरोमा दर्ता भएको जापान मनी एक्स्प्रेसले सुलभ्, सरल, सुरक्षित र छिटो तरिकाले विश्वको धेरै ठाउँमा पैसा पठाउने सेवा दिन्छ ।";
 "app_version_text"="अनुप्रयोग संस्करण (App  Version)";
 "check_for_update_text"="अद्यावधिकका लागि जाँच गर्नुहोस्";
 "follow_us_text"="हामीलाई पछ्याउनुहोस्";
@@ -903,7 +903,7 @@
 "home_text"="घर";
 "branch_text"="शाखा";
 "profile_text"="प्रोफाइल";
-"about_gme_text"="जापान मनी एक्सप्रेस को बारेमा";
+"about_gme_text"="जापान मनी एक्सप्रेस बारे";
 "settings_text"="सेटिङहरू";
 "logout_text"="बाहिर निस्कनु";
 "reward_points_text"="पुरस्कार अंक";
@@ -1273,7 +1273,7 @@
 "residence_id_card_no_text"="निवास परिचय पत्र  नम्बर(Residence ID Card No)";
 "residence_id_placeholder"="निवास परिचय पत्र  नम्बर(Residence ID Card Number)";
 "verify_text"="प्रमाणित गर्नुहोस्";
-"residence_id_error"="अवैध निवास परिचय पत्र  नम्बर";
+"residence_id_error"="अवैध रेसिडेन्स कार्ड नम्बर";
 "register_title_text1"="JME गर्न दर्ता";
 "register_title_text"="जापान मनी एक्सप्रेस को लागी दर्ता गर्नुहोस्";
 "existing_register_title"="अवस्थित JME प्रयोगकर्ता पञ्जीकरण";
@@ -1370,3 +1370,17 @@
 "send_money_success_header_text" = "हामीले तपाईंको रेमिट्यान्स अनुरोध प्राप्त गरेका छौं";
 "send_money_success_body_text" = "कृपया भुक्तानी गर्नुहोस्";
 "send_money_success_footer_text" = "यस अनुरोधलाई प्रसारण गर्न आगामी कार्य दिन भित्र जेनेटलाई। \ n पृष्ठ भुक्तान गर्नुहोस् कृपया सूचनाको लागि jme नम्बर प्राप्त गर्न सूचनाहरू जाँच गर्नुहोस्।";
+"fraud_guarantee_policy_text" = "धोखा ग्यारेन्टी नीति";
+"ok_text" = "ठिक छ";
+"emailCode_text" = "इमेल कोड";
+"enter_your_password_to_setup_fingerprint" = "फिंगरप्रिन्ट सेटअप गर्न आफ्नो पासवर्ड प्रविष्ट गर्नुहोस्";
+"password_error_text" = "पासवर्ड कम्तिमा आठ शब्दको हुन पर्छ । (एक विशेष शब्द, एक अपरकेस, एक नम्बर, एक संख्या, एक लोअरकेस चाहिन्छ, (उदाहरण : jaP@n181)";
+"frontIdSample_text" = "परिचय पत्रको अगाडीको नमूना";
+"front_id_text" = "परिचय पत्रको अगाडि";
+"backId_text" = "परिचय पत्रको पछाडि";
+"backIdSample_text" = "परिचय पत्रको पछाडीको नमूना";
+"select_business_type" = "ब्यापारको प्रकार चयन गर्नुहोस्‌";
+"select_additionalId_type_text" = "अतिरिक्त परिचय पत्रको प्रकार चयन गर्नुहोस्‌";
+"select_purpose_of_registration_text" = "दर्ता गर्ने उद्देश्य चयन गर्नुहोस्‌";
+"residence_id_placeholder" = "रेसिडेन्स कार्ड नम्बर";
+"residence_id_error" = "अवैध रेसिडेन्स कार्ड नम्बर";
diff --git a/GME Remit/MultiLanguages/ru-RU.lproj/Localizable.strings b/GME Remit/MultiLanguages/ru-RU.lproj/Localizable.strings
index 2fcc1d2e..9b7ecc5c 100644
--- a/GME Remit/MultiLanguages/ru-RU.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ru-RU.lproj/Localizable.strings	
@@ -814,3 +814,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "Предупреждение о мошенничествах";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/si.lproj/Localizable.strings b/GME Remit/MultiLanguages/si.lproj/Localizable.strings
index cf6b4981..e18a4434 100644
--- a/GME Remit/MultiLanguages/si.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/si.lproj/Localizable.strings	
@@ -823,3 +823,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "වංචා අනතුරු ඇඟවීම";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/th.lproj/Localizable.strings b/GME Remit/MultiLanguages/th.lproj/Localizable.strings
index 87576dd5..8bf76e6e 100644
--- a/GME Remit/MultiLanguages/th.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/th.lproj/Localizable.strings	
@@ -810,3 +810,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "ประกาศเตือนภัยมิจฉาชีพ";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/ur-PK.lproj/Localizable.strings b/GME Remit/MultiLanguages/ur-PK.lproj/Localizable.strings
index 78a6c883..908c2b27 100644
--- a/GME Remit/MultiLanguages/ur-PK.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/ur-PK.lproj/Localizable.strings	
@@ -739,3 +739,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "فراڈ کی وارننگ";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/uz.lproj/Localizable.strings b/GME Remit/MultiLanguages/uz.lproj/Localizable.strings
index 514d5bb2..67fb77e4 100644
--- a/GME Remit/MultiLanguages/uz.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/uz.lproj/Localizable.strings	
@@ -814,3 +814,4 @@
 
 //Fraud Waring
 "GME_fraud_warning_text" = "Firibgarliklar haqida ogohlantirish";
+"ok_text" = "Ok";
diff --git a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings
index 3db00885..685d6cf9 100644
--- a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings	
+++ b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings	
@@ -55,9 +55,9 @@
 "reward_point_text" = "Tích điểm";
 
 "available_balance_text" = "Số dư hiện có của bạn";
-"gme_wallet_no_text" = "Số tài khoản GME";
+"gme_wallet_no_text" = "Số tài khoản JME";
 "auto_debit_account_text" = "Tài khoản Auto Debit";
-"about_gme_text" = "Giới thiệu về GME";
+"about_gme_text" = "Về dịch vụ Chuyển tiền Japan Money Express";
 "settings_text" = "Cài đặt";
 "logout_text" = "Đăng xuất";
 "logout_confirmation_title_text" = "Bạn muốn đăng xuất?";
@@ -813,7 +813,7 @@ Chúng tôi đang xác minh thông tin của bạn.";
 "terms_and_condition_title_text"="Điều khoản & Điều kiện";
 "privacyAndPolicy_text"="Chính sách bảo mật";
 "app_name"="Japan Money Express";
-"about_me_description_text"="Japan Money Expresstance là 1 bước sáng tạo đột phá do các Kỹ sư trẻ người Nepal phát triển, nhằm  cung cấp kênh kỹ thuật số cho khách hàng truy cập vào các sản phẩm và dịch vụ Chuyển tiền, đáp ứng nhu cầu chuyển tiền của người tiêu dùng theo thời gian thực bằng các kênh kỹ thuật số, cho phép người dùng quản lý tất cả các cấu hình và đưa ra quyết định đúng đắn.";
+"about_me_description_text"="Japan Money Express (JME) là một công ty chuyển tiền đã đăng ký với Văn phòng Tài chính Địa phương Kanto theo Luật Tài chính. JME cung cấp cách chuyển tiền dễ dàng, nhanh chóng, an toàn và đáng tin cậy ở nhiều nơi trên thế giới.";
 "app_version_text"="Phiên bản ứng dụng";
 "check_for_update_text"="Kiểm tra cập nhật";
 "follow_us_text"="Theo dõi chúng tôi trên";
@@ -1102,7 +1102,7 @@ Chúng tôi đang xác minh thông tin của bạn.";
 "confirm_passowrd_empty_error"="Xác nhận mật khẩu không được để trống";
 "already_have_account_text"="Đã có tài khoản?";
 "register_button_text"="Đăng ký";
-"register_text"="Bạn phải đăng ký tài khoản tại Japan Money Express";
+"register_text"="Đăng ký để JME";
 
 "forgot_password_title_text"="Bạn gặp vấn đề với mật khẩu ?";
 "forgot_password_subtitle_text"="Đặt lại mật khẩu của bạn bằng User ID được liên kết với tài khoản Japan Money Express của bạn";
@@ -1267,7 +1267,7 @@ Chúng tôi đang xác minh thông tin của bạn.";
 "residence_id_card_no_text"="Số thẻ ngoại kiều";
 "residence_id_placeholder"="Số thẻ ngoại kiều";
 "verify_text"="Xác minh";
-"residence_id_error"="Số thẻ ngoại kiều không hợp lệ";
+"residence_id_error"="Cảng gửi hàng không hợp lệ";
 "register_title_text1"="Đăng ký để JME";
 "register_title_text"="Đăng ký tại Japan Money Express";
 "existing_register_title"="Đăng nhập tài khoản JME hiện tại";
@@ -1347,8 +1347,34 @@ 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";
+"memberShipId_text" = "ID thành viên";
 
 "i_have_read_to_text_consent_text" = "   Tôi đã đọc và đồng ý với Điều khoản và Điều kiện của JME";
 "enterCodeFromEmail_text" = "Nhập mã nhận được trong email";
 "biometric_setup" = "Đăng nhập thiết lập sinh trắc học";
+
+"renewId_text" = "NHẬP ID MỚI";
+"fraud_guarantee_policy_text" = "Chính sách đảm bảo gian lận";
+"ok_text" = "Đồng ý";
+"emailCode_text" = "Mã email";
+
+"enter_your_password_to_setup_fingerprint" = "Nhập mật khẩu của bạn để thiết lập vân tay";
+"password_error_text" = "Mật khẩu nên chứa ít nhất một ký tự đặc biệt, một chữ hoa, một số, một chữ thường và tối thiểu 8 ký tự (e.g.: jaP@n181)";
+"frontIdSample_text" = "Mặt trước thẻ ID mẫu";
+"front_id_text" = "ID trước";
+"backId_text" = "Mặt sau thẻ ID";
+"backIdSample_text" = "Mặt sau thẻ ID mẫu";
+"select_business_type" = "Chọn loại hình kinh doanh";
+"select_additionalId_type_text" = "Chọn hình thức ID bổ sung";
+"select_purpose_of_registration_text" = "Chọn mục đích đăng ký";
+
+"additional_address_text" = "Địa chỉ bổ sung";
+"purpose_of_registration_text" = "Mục đích đăng ký";
+"saveButtonInfo_text" = "Tên, quốc tịch, địa chỉ và giới tính được nêu trong tài liệu nhận dạng cá nhân được gửi ở đây.";
+"invalidMobNumber_text" = "Số điện thoại không hợp lệ";
+"request_summary_text" = "Tóm tắt yêu cầu";
+"send_money_success_header_text" = "Chúng tôi đã nhận được yêu cầu chuyển tiền của bạn cho";
+"send_money_success_body_text" = "Vui lòng thanh toán";
+"send_money_success_footer_text" = "đến JME trong ngày làm việc tiếp theo để truyền yêu cầu này. \ Nafter thanh toán Vui lòng kiểm tra các thông báo để nhận số JME để chuyển khoản này.";
+"residence_id_placeholder" = "Số thẻ cư trú";
+"residence_id_error" = "Cảng gửi hàng không hợp lệ";
diff --git a/GME Remit/Utilities/CustomUI/PasswordConfirm/PasswordConfirmViewController.swift b/GME Remit/Utilities/CustomUI/PasswordConfirm/PasswordConfirmViewController.swift
index f02d8665..b4079cda 100644
--- a/GME Remit/Utilities/CustomUI/PasswordConfirm/PasswordConfirmViewController.swift	
+++ b/GME Remit/Utilities/CustomUI/PasswordConfirm/PasswordConfirmViewController.swift	
@@ -25,9 +25,11 @@ class PasswordConfirmViewController: UIViewController {
     @IBOutlet weak var passwordTextField: ValidationTextField!
     @IBOutlet weak var viewPasswordToggle: UIButton!
     
+    @IBOutlet weak var enterYorPasswordTitleLabel: UILabel!
     @IBAction func closeTapped(_ sender: UIButton) {
         self.delegate?.cancel()
         self.dismiss(animated: true)
+        
     }
     
     @IBAction func confirmTapped(_ sender: UIButton) {
@@ -40,12 +42,19 @@ class PasswordConfirmViewController: UIViewController {
         passwordTextField.isSecureTextEntry ? viewPasswordToggle.setImage(UIImage(named: "Show"), for: .normal) : viewPasswordToggle.setImage(UIImage(named: "Hide"), for: .normal)
     }
     
+    private func setupLanguage() {
+        self.confirmButton.setTitle("confirm_text".localized(), for: .normal)
+        self.titleLabel.text = "confirm_password_text".localized()
+        self.enterYorPasswordTitleLabel.text = "enter_your_password_to_setup_fingerprint".localized()
+        self.passwordTextField.placeholder = "current_password_text".localized()
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         passwordTextField.isSecureTextEntry = true
         self.modalPresentationStyle = UIModalPresentationStyle.overCurrentContext
         self.modalTransitionStyle = UIModalTransitionStyle.crossDissolve
-        
+        self.setupLanguage()
     }
 
   
diff --git a/GME Remit/Utilities/CustomUI/PasswordConfirm/PasswordConfirmation.storyboard b/GME Remit/Utilities/CustomUI/PasswordConfirm/PasswordConfirmation.storyboard
index cb247613..fd6ef378 100644
--- a/GME Remit/Utilities/CustomUI/PasswordConfirm/PasswordConfirmation.storyboard	
+++ b/GME Remit/Utilities/CustomUI/PasswordConfirm/PasswordConfirmation.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"/>
@@ -168,6 +168,7 @@
                     <connections>
                         <outlet property="closeButton" destination="aln-7a-JMo" id="5aD-Nx-3qh"/>
                         <outlet property="confirmButton" destination="JME-UO-Fav" id="NDz-2V-JvH"/>
+                        <outlet property="enterYorPasswordTitleLabel" destination="cen-wd-Zvx" id="ufL-lG-HjO"/>
                         <outlet property="passwordTextField" destination="vR1-bb-dxj" id="SkV-j4-uzJ"/>
                         <outlet property="popupView" destination="G9z-s4-4PD" id="zrN-qQ-rBP"/>
                         <outlet property="titleLabel" destination="j78-FZ-sTQ" id="MRM-Ve-2ry"/>
@@ -180,6 +181,11 @@
             <point key="canvasLocation" x="-16.800000000000001" y="96.7016491754123"/>
         </scene>
     </scenes>
+    <designables>
+        <designable name="vR1-bb-dxj">
+            <size key="intrinsicContentSize" width="128" height="34"/>
+        </designable>
+    </designables>
     <resources>
         <image name="Hide" width="20" height="18"/>
         <image name="ic_cancel" width="12" height="12"/>
diff --git a/GME Remit/Utilities/MultiMediaManager.swift b/GME Remit/Utilities/MultiMediaManager.swift
index 6613480c..58693520 100644
--- a/GME Remit/Utilities/MultiMediaManager.swift	
+++ b/GME Remit/Utilities/MultiMediaManager.swift	
@@ -46,7 +46,7 @@ class MultiMediaManager: NSObject {
     
     let alertController = UIAlertController(
       title: nil,
-      message: "Jme would like to access your camera",
+      message: "JME would like to access your camera",
       preferredStyle: presentationStyle
     )