diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
index 7f6b33c9..e731fb0b 100644
--- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
+++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java
@@ -19,11 +19,9 @@ import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.text.Html;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
@@ -113,7 +111,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
 
     private ArrayList<Fragment> fragmentList;
 
-    public  final String TAG=getClass().getSimpleName();
+    public final String TAG = getClass().getSimpleName();
 
 
     ViewPager.OnPageChangeListener viewPageChangeListener = new ViewPager.OnPageChangeListener() {
@@ -145,6 +143,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
 
     }
 
+
     private void performDefaultAction(Bundle savedInstanceState) {
         if (savedInstanceState == null) {
             languageViewTransitionManager.underlineTitleText(true);
@@ -170,22 +169,19 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
 //        view_pager.setOffscreenPageLimit(3);
 
 
-
     }
 
-    private void initLanguageRV()
-    {
+    private void initLanguageRV() {
         languageSelectionRVAdapter = new LanguageSelectionRVAdapter();
         languageSelectionRVAdapter.setLanguageSelectionListener(this);
         languageRv.setAdapter(languageSelectionRVAdapter);
     }
 
-    private void initPayoutModeRV()
-    {
-        SelectedRedBorderDecoration selectedRedBorderDecoration=new SelectedRedBorderDecoration(this);
+    private void initPayoutModeRV() {
+        SelectedRedBorderDecoration selectedRedBorderDecoration = new SelectedRedBorderDecoration(this);
         paymentModeRV.addItemDecoration(selectedRedBorderDecoration);
-        paymentModeRV.setLayoutManager(new StaggeredGridLayoutManager(3,StaggeredGridLayoutManager.VERTICAL));
-        payoutModeSelectionRVAdapter=new PayoutModeSelectionRVAdapter(this);
+        paymentModeRV.setLayoutManager(new StaggeredGridLayoutManager(3, StaggeredGridLayoutManager.VERTICAL));
+        payoutModeSelectionRVAdapter = new PayoutModeSelectionRVAdapter(this);
         paymentModeRV.setAdapter(payoutModeSelectionRVAdapter);
     }
 
@@ -350,19 +346,25 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
         private Interpolator accelerateDecelerateInterpolator;
         private boolean userNavigatedToLanguageView;
         private int textViewPaintFlags;
+        private ConstraintSet initialSet;
+        private boolean notCalculatedInitialConstraint;
 
         LanguageViewTransitionManager(Context context) {
             isAnimationOnProgress = false;
             this.context = context;
             constraintSet = new ConstraintSet();
+            initialSet=new ConstraintSet();
+            initialSet.clone(rootLayout);
             anticipateOvershootInterpolator = new AnticipateOvershootInterpolator(.8f);
             overshootInterpolator = new OvershootInterpolator();
             accelerateDecelerateInterpolator = new AccelerateDecelerateInterpolator();
             textViewPaintFlags = selectedLanguageText.getPaintFlags();
+            notCalculatedInitialConstraint = true;
 
         }
 
         void showLanguageView(Runnable onAnimationCompleteCallback) {
+            hideKeyBoard();
             constraintSet.clone(context, R.layout.activity_splash_screen_key_2);
             ChangeBounds transition = new ChangeBounds();
             transition.setPathMotion(new ArcMotion());
@@ -413,9 +415,6 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
         }
 
         void hideLanguage(Runnable onAnimationCompleteCallback) {
-
-            constraintSet.clone(context, R.layout.activity_splash_screen_key_1);
-
             ChangeBounds transition = new ChangeBounds();
             transition.setPathMotion(new ArcMotion());
             transition.setInterpolator(overshootInterpolator);
@@ -456,7 +455,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
                 }
             });
             TransitionManager.beginDelayedTransition(rootLayout, transition);
-            constraintSet.applyTo(rootLayout);
+            initialSet.applyTo(rootLayout);
         }
 
         public boolean isAnimationRunning() {
@@ -479,7 +478,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener,
 
     private void initAntiDebugger() {
         boolean isDebuggable = (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE));
-        if (isDebuggable&&false)
+        if (isDebuggable && false)
             startAntiDebugger();
     }
 
diff --git a/app/src/main/res/layout/activity_splash_screen_key_1.xml b/app/src/main/res/layout/activity_splash_screen_key_1.xml
index 3b25aa5e..0b2dcfd2 100644
--- a/app/src/main/res/layout/activity_splash_screen_key_1.xml
+++ b/app/src/main/res/layout/activity_splash_screen_key_1.xml
@@ -1,431 +1,430 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rootLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary">
+    android:fillViewport="true">
 
-    <ImageView
-        android:id="@+id/iv_back"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="false"
-        android:alpha="0"
-        android:paddingStart="@dimen/_16sdp"
-        android:paddingTop="@dimen/_26sdp"
-        android:paddingEnd="@dimen/_10sdp"
-        android:paddingBottom="@dimen/_16sdp"
-        android:scaleType="center"
-        android:src="@drawable/ic_back_white"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/imageView2"
-        android:layout_width="@dimen/_100sdp"
-        android:layout_height="@dimen/_30sdp"
-        android:layout_marginStart="@dimen/_8sdp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="@dimen/_8sdp"
-        android:src="@drawable/ic_logo_white_large"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/selectedLanguageIcon"
-        android:layout_width="@dimen/_26sdp"
-        android:layout_height="@dimen/_26sdp"
-        android:layout_marginTop="16dp"
-        android:src="@drawable/flag_default"
-        app:layout_constraintEnd_toStartOf="@id/selectedLanguageText"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/selectedLanguageText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="@dimen/_8sdp"
-        android:paddingTop="@dimen/_10sdp"
-        android:paddingBottom="@dimen/_10sdp"
-        android:text="@string/select_language_text"
-        android:textColor="@color/white"
-        android:textSize="@dimen/_14ssp"
-        app:layout_constraintBottom_toBottomOf="@+id/selectedLanguageIcon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/selectedLanguageIcon"
-        app:layout_constraintTop_toTopOf="@+id/selectedLanguageIcon"
-        app:layout_constraintVertical_bias="0.73"
-        app:txtfontName="@string/semibold" />
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/languageRv"
+    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/rootLayout"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="@dimen/_13sdp"
-        android:background="#33000000"
-        android:clipToPadding="false"
-        android:paddingTop="@dimen/_15sdp"
-        android:scrollbars="vertical"
-        android:visibility="invisible"
-        app:layoutManager="android.support.v7.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/view_pager" />
-
-    <android.support.constraint.ConstraintLayout
-        android:id="@+id/view_pager"
-        android:layout_width="match_parent"
-        android:layout_margin="@dimen/_8sdp"
         android:layout_height="wrap_content"
-        android:background="@drawable/curve_rectangle_bright_grey"
-        android:padding="@dimen/_10sdp"
-        app:layout_constraintBottom_toTopOf="@+id/btn_login"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        >
+        android:background="@color/colorPrimary">
 
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="false"
+            android:alpha="0"
+            android:paddingStart="@dimen/_16sdp"
+            android:paddingTop="@dimen/_26sdp"
+            android:paddingEnd="@dimen/_10sdp"
+            android:paddingBottom="@dimen/_16sdp"
+            android:scaleType="center"
+            android:src="@drawable/ic_back_white"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/imageView2"
+            android:layout_width="@dimen/_100sdp"
+            android:layout_height="@dimen/_30sdp"
+            android:layout_marginStart="@dimen/_8sdp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="@dimen/_8sdp"
+            android:src="@drawable/ic_logo_white_large"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/selectedLanguageIcon"
+            android:layout_width="@dimen/_26sdp"
+            android:layout_height="@dimen/_26sdp"
+            android:layout_marginTop="16dp"
+            android:src="@drawable/flag_default"
+            app:layout_constraintEnd_toStartOf="@id/selectedLanguageText"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView2" />
 
         <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:id="@+id/gmeTextView12"
-            android:layout_width="match_parent"
+            android:id="@+id/selectedLanguageText"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-
-            android:gravity="start|left"
-            android:paddingTop="@dimen/_4sdp"
-            android:paddingBottom="@dimen/_4sdp"
-            android:text="@string/todays_rate_text"
-            android:textColor="@color/dark_gray"
-            android:textSize="@dimen/_11ssp"
-            app:layout_constraintBottom_toTopOf="@+id/paymentModeRV"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="@dimen/_8sdp"
+            android:paddingTop="@dimen/_10sdp"
+            android:paddingBottom="@dimen/_10sdp"
+            android:text="@string/select_language_text"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_15ssp"
+            app:layout_constraintBottom_toBottomOf="@+id/selectedLanguageIcon"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.13"
-            app:layout_constraintVertical_chainStyle="packed"
+            app:layout_constraintStart_toEndOf="@id/selectedLanguageIcon"
+            app:layout_constraintTop_toTopOf="@+id/selectedLanguageIcon"
+            app:layout_constraintVertical_bias="0.73"
             app:txtfontName="@string/semibold" />
 
         <android.support.v7.widget.RecyclerView
-            android:id="@+id/paymentModeRV"
+            android:id="@+id/languageRv"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_marginTop="@dimen/_6sdp"
-            android:layout_marginBottom="@dimen/_12sdp"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toTopOf="@+id/linearLayout"
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/_13sdp"
+            android:background="#33000000"
+            android:clipToPadding="false"
+            android:paddingTop="@dimen/_15sdp"
+            android:scrollbars="vertical"
+            android:visibility="invisible"
+            app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/gmeTextView12" />
+            app:layout_constraintTop_toTopOf="@+id/view_pager" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout"
+        <android.support.constraint.ConstraintLayout
+            android:id="@+id/view_pager"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/curve_rectangle_grey_bg"
-            android:orientation="horizontal"
-            android:padding="@dimen/_1sdp"
-            app:layout_constraintBottom_toTopOf="@+id/circularIndexView"
+            android:layout_margin="@dimen/_8sdp"
+            android:background="@drawable/curve_rectangle_bright_grey"
+            android:padding="@dimen/_10sdp"
+            app:layout_constraintBottom_toTopOf="@+id/btn_login"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/paymentModeRV">
+            app:layout_constraintTop_toBottomOf="@id/selectedLanguageText">
 
-            <LinearLayout
-                android:id="@+id/sendMoneyViewContainer"
-                android:layout_width="0dp"
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/gmeTextView12"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingLeft="@dimen/_4sdp"
-                android:paddingRight="@dimen/_4sdp">
 
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/_2sdp"
-                    android:paddingLeft="@dimen/_2sdp"
-                    android:paddingTop="@dimen/_2sdp"
-                    android:text="@string/you_send_text"
-                    android:textColor="@color/darkgray"
-                    android:textSize="@dimen/_12ssp" />
-
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
-                    android:id="@+id/sendAmountEdTxt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:backgroundTint="@android:color/transparent"
-                    android:digits="0,1,2,3,4,5,6,7,8,9"
-                    android:gravity="center_vertical"
-                    android:hint="100,000"
-                    android:imeOptions="actionDone"
-                    android:inputType="textMultiLine|number"
-                    android:maxLength="11"
-                    android:singleLine="false"
-                    android:textColor="@color/colorPrimary"
-                    android:textSize="@dimen/_19ssp"
-                    app:edfontName="@string/semibold" />
-            </LinearLayout>
+                android:gravity="start|left"
+                android:paddingTop="@dimen/_4sdp"
+                android:paddingBottom="@dimen/_4sdp"
+                android:text="@string/todays_rate_text"
+                android:textColor="@color/dark_gray"
+                android:textSize="@dimen/_11ssp"
+                app:layout_constraintBottom_toTopOf="@+id/paymentModeRV"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_bias="0.13"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:txtfontName="@string/semibold" />
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/paymentModeRV"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginTop="@dimen/_6sdp"
+                android:layout_marginBottom="@dimen/_12sdp"
+                android:orientation="horizontal"
+                app:layout_constraintBottom_toTopOf="@+id/linearLayout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/gmeTextView12" />
 
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@drawable/curve_rectangle_blue_bg"
-                android:paddingStart="@dimen/_4sdp"
-                android:paddingEnd="@dimen/_4sdp">
+            <LinearLayout
+                android:id="@+id/linearLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/curve_rectangle_grey_bg"
+                android:orientation="horizontal"
+                android:padding="@dimen/_1sdp"
+                app:layout_constraintBottom_toTopOf="@+id/circularIndexView"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/paymentModeRV">
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:id="@+id/sendMoneyViewContainer"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:layout_width="@dimen/_34sdp"
-                        android:layout_height="@dimen/_30sdp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/flag_south_korea" />
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/_4sdp"
+                    android:paddingRight="@dimen/_4sdp">
 
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-                        android:paddingStart="@dimen/_4sdp"
-                        android:paddingLeft="@dimen/_4sdp"
-                        android:paddingEnd="@dimen/_4sdp"
-                        android:paddingRight="@dimen/_4sdp"
-                        android:text="KRW"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/_10ssp"
-                        android:textStyle="bold" />
-
-                    <View
-                        android:layout_width="@dimen/_18sdp"
-                        android:layout_height="@dimen/_17sdp"
-                        android:layout_gravity="center_vertical" />
+                        android:layout_height="wrap_content"
+                        android:paddingStart="@dimen/_2sdp"
+                        android:paddingLeft="@dimen/_2sdp"
+                        android:paddingTop="@dimen/_2sdp"
+                        android:text="@string/you_send_text"
+                        android:textColor="@color/darkgray"
+                        android:textSize="@dimen/_12ssp" />
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/sendAmountEdTxt"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@android:color/transparent"
+                        android:digits="0,1,2,3,4,5,6,7,8,9"
+                        android:gravity="center_vertical"
+                        android:hint="100,000"
+                        android:imeOptions="actionDone"
+                        android:inputType="textMultiLine|number"
+                        android:maxLength="11"
+                        android:singleLine="false"
+                        android:textColor="@color/colorPrimary"
+                        android:textSize="@dimen/_19ssp"
+                        app:edfontName="@string/semibold" />
                 </LinearLayout>
 
-            </FrameLayout>
-        </LinearLayout>
-
-        <com.gmeremit.online.gmeremittance_native.customwidgets.CircularIndexView
-            android:id="@+id/circularIndexView"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="16dp"
-            android:paddingStart="@dimen/_2sdp"
+                <FrameLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/curve_rectangle_blue_bg"
+                    android:paddingStart="@dimen/_4sdp"
+                    android:paddingEnd="@dimen/_4sdp">
 
-            android:paddingEnd="@dimen/_2sdp"
-            app:layout_constraintBottom_toTopOf="@+id/circularIndexView2"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:layout_width="@dimen/_34sdp"
+                            android:layout_height="@dimen/_30sdp"
+                            android:layout_gravity="center"
+                            android:background="@drawable/flag_south_korea" />
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:paddingStart="@dimen/_4sdp"
+                            android:paddingLeft="@dimen/_4sdp"
+                            android:paddingEnd="@dimen/_4sdp"
+                            android:paddingRight="@dimen/_4sdp"
+                            android:text="KRW"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/_10ssp"
+                            android:textStyle="bold" />
+
+                        <View
+                            android:layout_width="@dimen/_18sdp"
+                            android:layout_height="@dimen/_17sdp"
+                            android:layout_gravity="center_vertical" />
+                    </LinearLayout>
+
+                </FrameLayout>
+            </LinearLayout>
 
-        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:id="@+id/transferFeeTxtView"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:gravity="center_vertical"
-            android:text="Transfer fee 5000 KRW"
-            android:textColor="@color/dark_gray"
-            android:textSize="@dimen/_10ssp"
-            app:layout_constraintBottom_toBottomOf="@+id/circularIndexView"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/circularIndexView"
-            app:layout_constraintTop_toTopOf="@+id/circularIndexView"
-            app:txtfontName="@string/semibold" />
+            <com.gmeremit.online.gmeremittance_native.customwidgets.CircularIndexView
+                android:id="@+id/circularIndexView"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:layout_marginStart="16dp"
+                android:paddingStart="@dimen/_2sdp"
 
-        <com.gmeremit.online.gmeremittance_native.customwidgets.CircularIndexView
-            android:id="@+id/circularIndexView2"
-            android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="16dp"
-            android:paddingStart="@dimen/_2sdp"
-            android:paddingEnd="@dimen/_2sdp"
-            app:layout_constraintBottom_toTopOf="@+id/receiveMoneyViewContainer"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/circularIndexView" />
+                android:paddingEnd="@dimen/_2sdp"
+                app:layout_constraintBottom_toTopOf="@+id/circularIndexView2"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
 
-        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-            android:id="@+id/exchangeRateTxtView"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:gravity="center_vertical"
-            android:text="Exrate 0.093"
-            android:textColor="@color/dark_gray"
-            android:textSize="@dimen/_10ssp"
-            app:layout_constraintBottom_toBottomOf="@+id/circularIndexView2"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/circularIndexView2"
-            app:layout_constraintTop_toTopOf="@+id/circularIndexView2"
-            app:txtfontName="@string/semibold" />
-
-        <LinearLayout
-            android:id="@+id/receiveMoneyViewContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/curve_rectangle_grey_bg"
-            android:orientation="horizontal"
-            android:padding="@dimen/_1sdp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/circularIndexView2">
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/transferFeeTxtView"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:gravity="center_vertical"
+                android:text="Transfer fee 5000 KRW"
+                android:textColor="@color/dark_gray"
+                android:textSize="@dimen/_10ssp"
+                app:layout_constraintBottom_toBottomOf="@+id/circularIndexView"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/circularIndexView"
+                app:layout_constraintTop_toTopOf="@+id/circularIndexView"
+                app:txtfontName="@string/semibold" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.CircularIndexView
+                android:id="@+id/circularIndexView2"
+                android:layout_width="wrap_content"
+                android:layout_height="35dp"
+                android:layout_marginStart="16dp"
+                android:paddingStart="@dimen/_2sdp"
+                android:paddingEnd="@dimen/_2sdp"
+                app:layout_constraintBottom_toTopOf="@+id/receiveMoneyViewContainer"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/circularIndexView" />
+
+            <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                android:id="@+id/exchangeRateTxtView"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:gravity="center_vertical"
+                android:text="Exrate 0.093"
+                android:textColor="@color/dark_gray"
+                android:textSize="@dimen/_10ssp"
+                app:layout_constraintBottom_toBottomOf="@+id/circularIndexView2"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/circularIndexView2"
+                app:layout_constraintTop_toTopOf="@+id/circularIndexView2"
+                app:txtfontName="@string/semibold" />
 
             <LinearLayout
-                android:layout_width="0dp"
+                android:id="@+id/receiveMoneyViewContainer"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical"
-                android:paddingLeft="@dimen/_4sdp"
-                android:paddingRight="@dimen/_4sdp">
-
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/_2sdp"
-                    android:paddingLeft="@dimen/_2sdp"
-                    android:paddingTop="@dimen/_2sdp"
-                    android:text="@string/receipient_gets_text"
-                    android:textColor="@color/darkgray"
-                    android:textSize="@dimen/_12ssp" />
-
-                <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
-                    android:id="@+id/receiveAmountEdTxt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:backgroundTint="@android:color/transparent"
-                    android:digits="0,1,2,3,4,5,6,7,8,9"
-                    android:gravity="center_vertical"
-                    android:hint="100,000"
-                    android:imeOptions="actionDone"
-                    android:inputType="textMultiLine|number"
-                    android:maxLength="11"
-                    android:textColor="@color/colorPrimary"
-                    android:textSize="@dimen/_19ssp"
-                    app:edfontName="@string/semibold" />
-            </LinearLayout>
-
-            <FrameLayout
-                android:id="@+id/countrySelectionSpinner"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="@drawable/curve_rectangle_blue_bg"
-                android:paddingStart="@dimen/_4sdp"
-                android:paddingEnd="@dimen/_4sdp">
+                android:background="@drawable/curve_rectangle_grey_bg"
+                android:orientation="horizontal"
+                android:padding="@dimen/_1sdp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/circularIndexView2">
 
                 <LinearLayout
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:orientation="horizontal">
-
-                    <ImageView
-                        android:id="@+id/recepientFlagImageView"
-                        android:layout_width="@dimen/_34sdp"
-                        android:layout_height="@dimen/_30sdp"
-                        android:layout_gravity="center"
-                        android:background="@drawable/flag_south_korea" />
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/_4sdp"
+                    android:paddingRight="@dimen/_4sdp">
 
                     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-                        android:id="@+id/recepientCurrencyTextView"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center"
-
-                        android:paddingStart="@dimen/_4sdp"
-                        android:paddingLeft="@dimen/_4sdp"
-                        android:paddingEnd="@dimen/_2sdp"
-                        android:paddingRight="@dimen/_2sdp"
-                        android:text="KRW"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/_10ssp"
-                        android:textStyle="bold" />
-
-                    <ImageView
-                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:background="@drawable/outline_keyboard_arrow_down_white_24" />
+                        android:paddingStart="@dimen/_2sdp"
+                        android:paddingLeft="@dimen/_2sdp"
+                        android:paddingTop="@dimen/_2sdp"
+                        android:text="@string/receipient_gets_text"
+                        android:textColor="@color/darkgray"
+                        android:textSize="@dimen/_12ssp" />
+
+                    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeEditText
+                        android:id="@+id/receiveAmountEdTxt"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:backgroundTint="@android:color/transparent"
+                        android:digits="0,1,2,3,4,5,6,7,8,9"
+                        android:gravity="center_vertical"
+                        android:hint="100,000"
+                        android:imeOptions="actionDone"
+                        android:inputType="textMultiLine|number"
+                        android:maxLength="11"
+                        android:textColor="@color/colorPrimary"
+                        android:textSize="@dimen/_19ssp"
+                        app:edfontName="@string/semibold" />
                 </LinearLayout>
 
-            </FrameLayout>
+                <FrameLayout
+                    android:id="@+id/countrySelectionSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/curve_rectangle_blue_bg"
+                    android:paddingStart="@dimen/_4sdp"
+                    android:paddingEnd="@dimen/_4sdp">
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/recepientFlagImageView"
+                            android:layout_width="@dimen/_34sdp"
+                            android:layout_height="@dimen/_30sdp"
+                            android:layout_gravity="center"
+                            android:background="@drawable/flag_south_korea" />
+
+                        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+                            android:id="@+id/recepientCurrencyTextView"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+
+                            android:paddingStart="@dimen/_4sdp"
+                            android:paddingLeft="@dimen/_4sdp"
+                            android:paddingEnd="@dimen/_2sdp"
+                            android:paddingRight="@dimen/_2sdp"
+                            android:text="KRW"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/_10ssp"
+                            android:textStyle="bold" />
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:background="@drawable/outline_keyboard_arrow_down_white_24" />
+                    </LinearLayout>
+
+                </FrameLayout>
+            </LinearLayout>
+
+
+        </android.support.constraint.ConstraintLayout>
+
+        <LinearLayout
+            android:id="@+id/layoutDots"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toTopOf="@+id/btn_login"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
         </LinearLayout>
 
 
-    </android.support.constraint.ConstraintLayout>
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+            android:id="@+id/btn_login"
+            android:layout_width="182dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/ic_blue_button_with_white_border"
+            android:text="@string/login_text"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_11ssp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view_pager" />
 
-    <LinearLayout
-        android:id="@+id/layoutDots"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toTopOf="@+id/btn_login"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
+            android:id="@+id/btn_new_user"
+            android:layout_width="182dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/ic_red_button_with_white_border"
+            android:text="@string/new_user_text"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_11ssp"
+            app:layout_constraintEnd_toEndOf="@+id/btn_login"
+            app:layout_constraintStart_toStartOf="@+id/btn_login"
+            app:layout_constraintTop_toBottomOf="@+id/btn_login" />
 
-    </LinearLayout>
+        <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
+            android:id="@+id/appVersionTxtView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:textColor="@color/white"
+            android:textSize="@dimen/_10ssp"
+            app:layout_constraintEnd_toEndOf="@+id/btn_new_user"
+            app:layout_constraintStart_toStartOf="@+id/btn_new_user"
+            app:layout_constraintTop_toBottomOf="@+id/btn_new_user"
+            tools:text=" 2.2.3 " />
 
+    </android.support.constraint.ConstraintLayout>
 
-    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-        android:id="@+id/btn_login"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/ic_blue_button_with_white_border"
-        android:text="@string/login_text"
-        android:textAllCaps="false"
-        android:textColor="@color/white"
-        android:textSize="@dimen/_11ssp"
-        app:layout_constraintBottom_toTopOf="@+id/appVersionTxtView"
-        app:layout_constraintEnd_toEndOf="@+id/btn_new_user"
-        app:layout_constraintEnd_toStartOf="@+id/btn_new_user"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/languageRv"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
-        android:id="@+id/btn_new_user"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/ic_red_button_with_white_border"
-        android:text="@string/new_user_text"
-        android:textAllCaps="false"
-        android:textColor="@color/white"
-        android:textSize="@dimen/_11ssp"
-        app:layout_constraintBottom_toTopOf="@+id/appVersionTxtView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/btn_login" />
-
-    <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
-        android:id="@+id/appVersionTxtView"
-        android:layout_width="wrap_content"
-        tools:text=" 2.2.3 "
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/_8sdp"
-        android:layout_marginEnd="@dimen/_8sdp"
-        android:layout_marginBottom="@dimen/_5sdp"
-        android:layout_marginTop="@dimen/_8sdp"
-
-        android:textColor="@color/white"
-        android:textSize="@dimen/_10ssp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-</android.support.constraint.ConstraintLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/activity_splash_screen_key_2.xml b/app/src/main/res/layout/activity_splash_screen_key_2.xml
index 6540a71d..a1f67f9c 100644
--- a/app/src/main/res/layout/activity_splash_screen_key_2.xml
+++ b/app/src/main/res/layout/activity_splash_screen_key_2.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rootLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -22,8 +23,8 @@
 
     <ImageView
         android:id="@+id/imageView2"
-        android:layout_width="@dimen/_166sdp"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/_100sdp"
+        android:layout_height="@dimen/_30sdp"
         android:layout_marginEnd="@dimen/_8sdp"
         android:layout_marginStart="@dimen/_8sdp"
         android:layout_marginTop="@dimen/_32sdp"
@@ -69,7 +70,7 @@
         android:layout_marginStart="@dimen/_12sdp"
         android:text="@string/select_language_text"
         android:textColor="@color/white"
-        android:textSize="@dimen/_16ssp"
+        android:textSize="@dimen/_15ssp"
         app:layout_constraintBottom_toBottomOf="@+id/selectedLanguageIcon"
         app:layout_constraintStart_toEndOf="@id/selectedLanguageIcon"
         app:layout_constraintTop_toTopOf="@+id/selectedLanguageIcon"
@@ -97,53 +98,45 @@
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/btn_login"
-        android:layout_width="0dp"
+        android:layout_width="182dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
         android:background="@drawable/ic_blue_button_with_white_border"
         android:text="@string/login_text"
         android:textAllCaps="false"
         android:textColor="@color/white"
         android:textSize="@dimen/_11ssp"
-        app:layout_constraintEnd_toEndOf="@+id/btn_new_user"
-        app:layout_constraintEnd_toStartOf="@+id/btn_new_user"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/languageRv"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeButton
         android:id="@+id/btn_new_user"
-        android:layout_width="0dp"
+        android:layout_width="182dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"
         android:background="@drawable/ic_red_button_with_white_border"
         android:text="@string/new_user_text"
         android:textAllCaps="false"
         android:textColor="@color/white"
         android:textSize="@dimen/_11ssp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintTop_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/btn_login" />
+        app:layout_constraintEnd_toEndOf="@+id/btn_login"
+        app:layout_constraintStart_toStartOf="@+id/btn_login"
+        app:layout_constraintTop_toBottomOf="@+id/btn_login" />
 
     <com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
         android:id="@+id/appVersionTxtView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/_8sdp"
-        android:layout_marginEnd="@dimen/_8sdp"
-        android:layout_marginBottom="@dimen/_8sdp"
+        android:layout_marginTop="8dp"
         android:textColor="@color/white"
         android:textSize="@dimen/_10ssp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="parent"
-        android:text="App Version 1.1" />
+        app:layout_constraintEnd_toEndOf="@+id/btn_new_user"
+        app:layout_constraintStart_toStartOf="@+id/btn_new_user"
+        app:layout_constraintTop_toBottomOf="@+id/btn_new_user"
+        tools:text=" 2.2.3 " />
 
 
 </android.support.constraint.ConstraintLayout>