diff --git a/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard b/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard
index d7c2afbd..4392fd76 100644
--- a/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard	
+++ b/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard	
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -25,7 +24,7 @@
         <!--Exchange Rates View Controller-->
         <scene sceneID="IKD-v4-MtS">
             <objects>
-                <viewController storyboardIdentifier="ExchangeRatesViewController" id="wkj-Ga-GJC" customClass="ExchangeRatesViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ExchangeRatesViewController" id="wkj-Ga-GJC" customClass="ExchangeRatesViewController" customModule="GME_Remit" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Gev-HF-fnm">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -37,10 +36,107 @@
                                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="EEF-HP-StG">
-                                                <rect key="frame" x="10" y="20" width="355" height="353"/>
+                                                <rect key="frame" x="10" y="20" width="355" height="368"/>
                                                 <subviews>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="qGh-mt-tYG">
+                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="154"/>
+                                                        <subviews>
+                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="kS0-ZR-UuV">
+                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="154"/>
+                                                                <subviews>
+                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select Payment Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NTz-FS-kVn">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="15"/>
+                                                                        <constraints>
+                                                                            <constraint firstAttribute="height" constant="15" id="6Xn-wB-Jzv"/>
+                                                                        </constraints>
+                                                                        <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
+                                                                        <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                        <nil key="highlightedColor"/>
+                                                                    </label>
+                                                                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="ENF-cV-uem">
+                                                                        <rect key="frame" x="0.0" y="19" width="355" height="135"/>
+                                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        <constraints>
+                                                                            <constraint firstAttribute="height" constant="135" id="PLg-4u-mYG"/>
+                                                                        </constraints>
+                                                                        <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="eTE-GY-vNR">
+                                                                            <size key="itemSize" width="115" height="115"/>
+                                                                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                                                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                                                            <inset key="sectionInset" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
+                                                                        </collectionViewFlowLayout>
+                                                                        <cells>
+                                                                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ExchangeRateCollectionViewCell" id="7fr-jc-meS" customClass="ExchangeRateCollectionViewCell" customModule="GME_Remit" customModuleProvider="target">
+                                                                                <rect key="frame" x="10" y="10" width="115" height="115"/>
+                                                                                <autoresizingMask key="autoresizingMask"/>
+                                                                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
+                                                                                    <rect key="frame" x="0.0" y="0.0" width="115" height="115"/>
+                                                                                    <autoresizingMask key="autoresizingMask"/>
+                                                                                    <subviews>
+                                                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HXI-YU-rNY">
+                                                                                            <rect key="frame" x="0.0" y="0.0" width="115" height="115"/>
+                                                                                            <subviews>
+                                                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_bank" translatesAutoresizingMaskIntoConstraints="NO" id="e26-PY-aIL">
+                                                                                                    <rect key="frame" x="20" y="8" width="75" height="71"/>
+                                                                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                                    <constraints>
+                                                                                                        <constraint firstAttribute="width" secondItem="e26-PY-aIL" secondAttribute="height" multiplier="62:59" id="pPp-Td-0Eu"/>
+                                                                                                        <constraint firstAttribute="height" constant="71" id="xME-Ln-aKS"/>
+                                                                                                    </constraints>
+                                                                                                </imageView>
+                                                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cash Payments" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RB5-AJ-z2c">
+                                                                                                    <rect key="frame" x="0.0" y="84" width="115" height="14"/>
+                                                                                                    <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
+                                                                                                    <nil key="textColor"/>
+                                                                                                    <nil key="highlightedColor"/>
+                                                                                                </label>
+                                                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 Business Day" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uIj-po-mRW">
+                                                                                                    <rect key="frame" x="0.0" y="98" width="115" height="12"/>
+                                                                                                    <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
+                                                                                                    <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                                    <nil key="highlightedColor"/>
+                                                                                                </label>
+                                                                                            </subviews>
+                                                                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                            <constraints>
+                                                                                                <constraint firstAttribute="height" constant="115" id="30W-ph-pqG"/>
+                                                                                                <constraint firstItem="uIj-po-mRW" firstAttribute="top" secondItem="RB5-AJ-z2c" secondAttribute="bottom" id="9uB-uw-NTm"/>
+                                                                                                <constraint firstItem="uIj-po-mRW" firstAttribute="leading" secondItem="HXI-YU-rNY" secondAttribute="leading" id="ELQ-fe-3TH"/>
+                                                                                                <constraint firstItem="e26-PY-aIL" firstAttribute="top" secondItem="HXI-YU-rNY" secondAttribute="top" constant="8" id="ONe-W9-Iok"/>
+                                                                                                <constraint firstItem="RB5-AJ-z2c" firstAttribute="top" secondItem="e26-PY-aIL" secondAttribute="bottom" constant="5" id="QKt-NE-TPa"/>
+                                                                                                <constraint firstAttribute="trailing" secondItem="RB5-AJ-z2c" secondAttribute="trailing" id="Rtn-3E-GK0"/>
+                                                                                                <constraint firstAttribute="trailing" secondItem="uIj-po-mRW" secondAttribute="trailing" id="fQJ-Vy-LFf"/>
+                                                                                                <constraint firstItem="e26-PY-aIL" firstAttribute="centerX" secondItem="HXI-YU-rNY" secondAttribute="centerX" id="nO1-7M-PAm"/>
+                                                                                                <constraint firstItem="RB5-AJ-z2c" firstAttribute="leading" secondItem="HXI-YU-rNY" secondAttribute="leading" id="tUi-R3-Npo"/>
+                                                                                            </constraints>
+                                                                                        </view>
+                                                                                    </subviews>
+                                                                                </view>
+                                                                                <constraints>
+                                                                                    <constraint firstAttribute="bottom" secondItem="HXI-YU-rNY" secondAttribute="bottom" id="S4d-QB-LBq"/>
+                                                                                    <constraint firstItem="HXI-YU-rNY" firstAttribute="leading" secondItem="7fr-jc-meS" secondAttribute="leading" id="SQU-0a-Y0S"/>
+                                                                                    <constraint firstItem="HXI-YU-rNY" firstAttribute="top" secondItem="7fr-jc-meS" secondAttribute="top" id="aV4-PX-0hp"/>
+                                                                                    <constraint firstAttribute="trailing" secondItem="HXI-YU-rNY" secondAttribute="trailing" id="fde-XH-V8z"/>
+                                                                                </constraints>
+                                                                                <size key="customSize" width="115" height="115"/>
+                                                                                <connections>
+                                                                                    <outlet property="cellBackgroundview" destination="HXI-YU-rNY" id="a9b-UE-yrG"/>
+                                                                                    <outlet property="imageview" destination="e26-PY-aIL" id="Lys-NR-OPq"/>
+                                                                                    <outlet property="paymentLabel" destination="RB5-AJ-z2c" id="ZUA-Cb-D6o"/>
+                                                                                    <outlet property="subtitleLabel" destination="uIj-po-mRW" id="ORr-bq-xDs"/>
+                                                                                </connections>
+                                                                            </collectionViewCell>
+                                                                        </cells>
+                                                                    </collectionView>
+                                                                </subviews>
+                                                            </stackView>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="154" id="GgL-cn-eyU"/>
+                                                        </constraints>
+                                                    </stackView>
                                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="25L-1L-t4e">
-                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
+                                                        <rect key="frame" x="0.0" y="174" width="355" height="60"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AGt-UA-d1E">
                                                                 <rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
@@ -123,104 +219,10 @@
                                                         </constraints>
                                                     </stackView>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="eZQ-ZM-qFq">
-                                                        <rect key="frame" x="0.0" y="80" width="355" height="193"/>
+                                                        <rect key="frame" x="0.0" y="254" width="355" height="34"/>
                                                         <subviews>
-                                                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="qGh-mt-tYG">
-                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="154"/>
-                                                                <subviews>
-                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="kS0-ZR-UuV">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="355" height="154"/>
-                                                                        <subviews>
-                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select Payment Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NTz-FS-kVn">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="15"/>
-                                                                                <constraints>
-                                                                                    <constraint firstAttribute="height" constant="15" id="6Xn-wB-Jzv"/>
-                                                                                </constraints>
-                                                                                <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
-                                                                                <color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                                                <nil key="highlightedColor"/>
-                                                                            </label>
-                                                                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="ENF-cV-uem">
-                                                                                <rect key="frame" x="0.0" y="19" width="355" height="135"/>
-                                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                                <constraints>
-                                                                                    <constraint firstAttribute="height" constant="135" id="PLg-4u-mYG"/>
-                                                                                </constraints>
-                                                                                <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="eTE-GY-vNR">
-                                                                                    <size key="itemSize" width="115" height="115"/>
-                                                                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                                                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                                                                    <inset key="sectionInset" minX="10" minY="0.0" maxX="10" maxY="0.0"/>
-                                                                                </collectionViewFlowLayout>
-                                                                                <cells>
-                                                                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" misplaced="YES" reuseIdentifier="ExchangeRateCollectionViewCell" id="7fr-jc-meS" customClass="ExchangeRateCollectionViewCell" customModule="GMERemittance" customModuleProvider="target">
-                                                                                        <rect key="frame" x="10" y="10" width="115" height="115"/>
-                                                                                        <autoresizingMask key="autoresizingMask"/>
-                                                                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
-                                                                                            <rect key="frame" x="0.0" y="0.0" width="115" height="115"/>
-                                                                                            <autoresizingMask key="autoresizingMask"/>
-                                                                                            <subviews>
-                                                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HXI-YU-rNY">
-                                                                                                    <rect key="frame" x="0.0" y="0.0" width="115" height="115"/>
-                                                                                                    <subviews>
-                                                                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_bank" translatesAutoresizingMaskIntoConstraints="NO" id="e26-PY-aIL">
-                                                                                                            <rect key="frame" x="20.5" y="8" width="74" height="71"/>
-                                                                                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                                                            <constraints>
-                                                                                                                <constraint firstAttribute="width" secondItem="e26-PY-aIL" secondAttribute="height" multiplier="62:59" id="pPp-Td-0Eu"/>
-                                                                                                                <constraint firstAttribute="height" constant="71" id="xME-Ln-aKS"/>
-                                                                                                            </constraints>
-                                                                                                        </imageView>
-                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cash Payments" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RB5-AJ-z2c">
-                                                                                                            <rect key="frame" x="0.0" y="84" width="115" height="14"/>
-                                                                                                            <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
-                                                                                                            <nil key="textColor"/>
-                                                                                                            <nil key="highlightedColor"/>
-                                                                                                        </label>
-                                                                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1 Business Day" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uIj-po-mRW">
-                                                                                                            <rect key="frame" x="0.0" y="98" width="115" height="12"/>
-                                                                                                            <fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
-                                                                                                            <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                                                            <nil key="highlightedColor"/>
-                                                                                                        </label>
-                                                                                                    </subviews>
-                                                                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                                                    <constraints>
-                                                                                                        <constraint firstAttribute="height" constant="115" id="30W-ph-pqG"/>
-                                                                                                        <constraint firstItem="uIj-po-mRW" firstAttribute="top" secondItem="RB5-AJ-z2c" secondAttribute="bottom" id="9uB-uw-NTm"/>
-                                                                                                        <constraint firstItem="uIj-po-mRW" firstAttribute="leading" secondItem="HXI-YU-rNY" secondAttribute="leading" id="ELQ-fe-3TH"/>
-                                                                                                        <constraint firstItem="e26-PY-aIL" firstAttribute="top" secondItem="HXI-YU-rNY" secondAttribute="top" constant="8" id="ONe-W9-Iok"/>
-                                                                                                        <constraint firstItem="RB5-AJ-z2c" firstAttribute="top" secondItem="e26-PY-aIL" secondAttribute="bottom" constant="5" id="QKt-NE-TPa"/>
-                                                                                                        <constraint firstAttribute="trailing" secondItem="RB5-AJ-z2c" secondAttribute="trailing" id="Rtn-3E-GK0"/>
-                                                                                                        <constraint firstAttribute="trailing" secondItem="uIj-po-mRW" secondAttribute="trailing" id="fQJ-Vy-LFf"/>
-                                                                                                        <constraint firstItem="e26-PY-aIL" firstAttribute="centerX" secondItem="HXI-YU-rNY" secondAttribute="centerX" id="nO1-7M-PAm"/>
-                                                                                                        <constraint firstItem="RB5-AJ-z2c" firstAttribute="leading" secondItem="HXI-YU-rNY" secondAttribute="leading" id="tUi-R3-Npo"/>
-                                                                                                    </constraints>
-                                                                                                </view>
-                                                                                            </subviews>
-                                                                                        </view>
-                                                                                        <constraints>
-                                                                                            <constraint firstAttribute="bottom" secondItem="HXI-YU-rNY" secondAttribute="bottom" id="S4d-QB-LBq"/>
-                                                                                            <constraint firstItem="HXI-YU-rNY" firstAttribute="leading" secondItem="7fr-jc-meS" secondAttribute="leading" id="SQU-0a-Y0S"/>
-                                                                                            <constraint firstItem="HXI-YU-rNY" firstAttribute="top" secondItem="7fr-jc-meS" secondAttribute="top" id="aV4-PX-0hp"/>
-                                                                                            <constraint firstAttribute="trailing" secondItem="HXI-YU-rNY" secondAttribute="trailing" id="fde-XH-V8z"/>
-                                                                                        </constraints>
-                                                                                        <size key="customSize" width="115" height="115"/>
-                                                                                        <connections>
-                                                                                            <outlet property="cellBackgroundview" destination="HXI-YU-rNY" id="a9b-UE-yrG"/>
-                                                                                            <outlet property="imageview" destination="e26-PY-aIL" id="Lys-NR-OPq"/>
-                                                                                            <outlet property="paymentLabel" destination="RB5-AJ-z2c" id="ZUA-Cb-D6o"/>
-                                                                                            <outlet property="subtitleLabel" destination="uIj-po-mRW" id="ORr-bq-xDs"/>
-                                                                                        </connections>
-                                                                                    </collectionViewCell>
-                                                                                </cells>
-                                                                            </collectionView>
-                                                                        </subviews>
-                                                                    </stackView>
-                                                                </subviews>
-                                                            </stackView>
                                                             <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zIZ-e5-h3R">
-                                                                <rect key="frame" x="0.0" y="159" width="355" height="34"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="34"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mfS-0Z-txA">
                                                                         <rect key="frame" x="0.0" y="0.0" width="10" height="34"/>
@@ -252,12 +254,9 @@
                                                             </stackView>
                                                         </subviews>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="193" id="pcR-b7-58p"/>
-                                                        </constraints>
                                                     </stackView>
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2dJ-m4-ieK">
-                                                        <rect key="frame" x="0.0" y="293" width="355" height="60"/>
+                                                        <rect key="frame" x="0.0" y="308" width="355" height="60"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xnw-Oo-65c">
                                                                 <rect key="frame" x="0.0" y="0.0" width="355" height="60"/>
@@ -301,7 +300,7 @@
                                                                                         <rect key="frame" x="0.0" y="0.0" width="125" height="60"/>
                                                                                         <subviews>
                                                                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="T9h-bm-oDr">
-                                                                                                <rect key="frame" x="8" y="17" width="110" height="26"/>
+                                                                                                <rect key="frame" x="7.5" y="17" width="110" height="26"/>
                                                                                                 <subviews>
                                                                                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Korea" translatesAutoresizingMaskIntoConstraints="NO" id="Avu-kr-1cs">
                                                                                                         <rect key="frame" x="0.0" y="0.0" width="26" height="26"/>
@@ -359,7 +358,7 @@
                                                 </subviews>
                                             </stackView>
                                             <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H6t-AW-Fpn">
-                                                <rect key="frame" x="87.5" y="397" width="200" height="50"/>
+                                                <rect key="frame" x="87.5" y="412" width="200" height="50"/>
                                                 <color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="200" id="Z0u-lJ-VEU"/>
@@ -422,7 +421,7 @@
                         <outlet property="exchangeBackground2" destination="xnw-Oo-65c" id="AAp-Qo-9jN"/>
                         <outlet property="exchangeRateInfoLabel" destination="fEt-T6-kPD" id="KGd-ws-hYl"/>
                         <outlet property="paymentModeStackView" destination="eZQ-ZM-qFq" id="5S2-5n-A53"/>
-                        <outlet property="paymentModeStackViewConstraint" destination="pcR-b7-58p" id="2rs-mV-JYv"/>
+                        <outlet property="paymentModeStackViewConstraint" destination="GgL-cn-eyU" id="iNe-p5-0At"/>
                         <outlet property="reciepientTextField" destination="dTw-1k-6zQ" id="MRk-KS-OWU"/>
                         <outlet property="senderTextField" destination="g3K-Yw-9MX" id="tT2-Dp-c29"/>
                         <outlet property="transferFeeInfoLabel" destination="5j8-YV-UND" id="Wa0-5G-EXA"/>
diff --git a/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift b/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
index cd3afa3b..92af4dd7 100644
--- a/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift	
+++ b/GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift	
@@ -25,7 +25,7 @@ class ExchangeRatesViewController: UIViewController {
     struct Constants {
         static let transferFeeDetailText = "Transfer Fee Included"
         static let currentExchangeRateText = "Current Exchange Rate"
-        static let paymentModeHeightConstant: CGFloat = 193
+        static let paymentModeHeightConstant: CGFloat = 154
     }
     
     struct ApiConstants {