diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 772d503b87..ced5cd40eb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,6 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher"
-        android:screenOrientation="portrait"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <provider
diff --git a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt
index 6d52b47d4c..84055cfa7d 100644
--- a/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/LoadedWalletActivity.kt
@@ -1,6 +1,5 @@
 package com.tangem.presentation.activity
 
-import android.app.Activity
 import android.nfc.NfcAdapter
 import android.nfc.Tag
 import android.os.Bundle
@@ -29,12 +28,12 @@ class LoadedWalletActivity : AppCompatActivity() {
         }
     }
 
-    override fun onBackPressed() {
-        val loadedWallet = supportFragmentManager.findFragmentById(R.id.loaded_wallet_fragment) as LoadedWallet
-        val data = loadedWallet.prepareResultIntent()
-        data.putExtra(EXTRA_MODIFICATION, "update")
-        setResult(Activity.RESULT_OK, data)
-        finish()
-    }
+//    override fun onBackPressed() {
+//        val loadedWallet = supportFragmentManager.findFragmentById(R.id.loaded_wallet_fragment) as LoadedWallet
+//        val data = loadedWallet.prepareResultIntent()
+//        data.putExtra(EXTRA_MODIFICATION, "update")
+//        setResult(Activity.RESULT_OK, data)
+//        finish()
+//    }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
index 026361207e..ce382b2c64 100644
--- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.kt
@@ -83,6 +83,8 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+
         mNfcManager = NfcManager(this, this)
 
         requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR
diff --git a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java
index 039d3c6e1e..d23c490adc 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java
+++ b/app/src/main/java/com/tangem/presentation/activity/PurgeActivity.java
@@ -2,6 +2,7 @@ package com.tangem.presentation.activity;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.nfc.NfcAdapter;
@@ -39,6 +40,8 @@ public class PurgeActivity extends AppCompatActivity implements NfcAdapter.Reade
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_purge);
 
+        setRequestedOrientation (ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+
         mNfcManager = new NfcManager(this, this);
 
         MainActivity.Companion.commonInit(getApplicationContext());
diff --git a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
index bd55d9e38a..deb4f339e0 100644
--- a/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/VerifyCardActivity.kt
@@ -13,7 +13,6 @@ class VerifyCardActivity : AppCompatActivity() {
         MainActivity.commonInit(applicationContext)
     }
 
-
     override fun onBackPressed() {
         super.onBackPressed()
         val verifyCard = supportFragmentManager.findFragmentById(R.id.verify_card_fragment) as VerifyCard
diff --git a/app/src/main/res/layout/activity_confirm_payment.xml b/app/src/main/res/layout/activity_confirm_payment.xml
index 81c73d830f..efc1f3e9c1 100644
--- a/app/src/main/res/layout/activity_confirm_payment.xml
+++ b/app/src/main/res/layout/activity_confirm_payment.xml
@@ -78,25 +78,6 @@
             android:textStyle="bold"
             tools:text="4.51735 mBtc"/>
 
-        <!--<LinearLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_marginStart="16dp"-->
-        <!--android:orientation="horizontal">-->
-
-        <!--<TextView-->
-        <!--android:id="@+id/tvBalanceEquivalent"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_marginStart="8dp"-->
-        <!--android:layout_marginTop="4dp"-->
-        <!--android:fontFamily="@font/montserrat_light"-->
-        <!--android:textColor="@android:color/darker_gray"-->
-        <!--android:textSize="@dimen/text_size_1_small"-->
-        <!--tools:text="343"/>-->
-
-        <!--</LinearLayout>-->
-
         <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -123,7 +104,6 @@
             android:id="@+id/etWallet"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-
             android:enabled="false"
             android:fontFamily="@font/montserrat_light"
             android:hint="@string/target_wallet_address"
@@ -203,20 +183,6 @@
                 app:layout_constraintStart_toEndOf="@+id/etAmount"
                 app:layout_constraintTop_toTopOf="parent"/>
 
-            <!--<TextView-->
-            <!--android:id="@+id/tvAmountEquivalent"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:layout_marginEnd="12dp"-->
-            <!--android:layout_marginTop="12dp"-->
-            <!--android:fontFamily="@font/montserrat_light"-->
-            <!--android:textColor="@android:color/darker_gray"-->
-            <!--android:textSize="@dimen/text_size_1_small"-->
-            <!--app:layout_constraintBottom_toBottomOf="parent"-->
-            <!--app:layout_constraintEnd_toEndOf="parent"-->
-            <!--app:layout_constraintTop_toTopOf="parent"-->
-            <!--tools:text="0000"/>-->
-
         </android.support.constraint.ConstraintLayout>
 
     </LinearLayout>
@@ -334,14 +300,15 @@
                 android:id="@+id/tvFeeEquivalent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
                 android:fontFamily="@font/montserrat_light"
-                android:paddingLeft="10dp"
+                android:paddingEnd="10dp"
+                android:paddingStart="10dp"
                 android:textColor="@android:color/darker_gray"
                 android:textSize="@dimen/text_size_1_small"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@+id/tvCurrency2"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
 
         </android.support.constraint.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/activity_loaded_wallet.xml b/app/src/main/res/layout/activity_loaded_wallet.xml
index de02a8e23e..896f1e7ddb 100644
--- a/app/src/main/res/layout/activity_loaded_wallet.xml
+++ b/app/src/main/res/layout/activity_loaded_wallet.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout
     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:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.tangem.presentation.activity.LoadedWalletActivity">
 
-    <include
-        layout="@layout/content_loaded_wallet"/>
+    <fragment
+        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/loaded_wallet_fragment"
+        android:name="com.tangem.presentation.fragment.LoadedWallet"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:layout="@layout/fr_loaded_wallet"/>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_verify_card.xml b/app/src/main/res/layout/activity_verify_card.xml
index 2f071da0b2..b8242c7c8c 100644
--- a/app/src/main/res/layout/activity_verify_card.xml
+++ b/app/src/main/res/layout/activity_verify_card.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout
     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:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.tangem.presentation.activity.VerifyCardActivity">
 
-    <include
-        layout="@layout/content_verify_card"
+    <fragment
+        android:id="@+id/verify_card_fragment"
+        android:name="com.tangem.presentation.fragment.VerifyCard"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:layout="@layout/fr_verify_card"/>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_loaded_wallet.xml b/app/src/main/res/layout/content_loaded_wallet.xml
deleted file mode 100644
index 1bd85f9209..0000000000
--- a/app/src/main/res/layout/content_loaded_wallet.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<fragment
-    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/loaded_wallet_fragment"
-    android:name="com.tangem.presentation.fragment.LoadedWallet"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:layout="@layout/fr_loaded_wallet"/>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
deleted file mode 100644
index 6098a522ac..0000000000
--- a/app/src/main/res/layout/content_main.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<fragment
-    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/fragmentMain"
-    android:name="com.tangem.presentation.fragment.Main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:layout="@layout/fr_main"/>
diff --git a/app/src/main/res/layout/content_verify_card.xml b/app/src/main/res/layout/content_verify_card.xml
deleted file mode 100644
index 04b43bbca9..0000000000
--- a/app/src/main/res/layout/content_verify_card.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<fragment
-    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/verify_card_fragment"
-    android:name="com.tangem.presentation.fragment.VerifyCard"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:layout="@layout/fr_verify_card"/>
diff --git a/app/src/main/res/layout/dialog_fingerprint_confirmation.xml b/app/src/main/res/layout/dialog_fingerprint_confirmation.xml
index efcb43ad02..c3fee9ccb2 100644
--- a/app/src/main/res/layout/dialog_fingerprint_confirmation.xml
+++ b/app/src/main/res/layout/dialog_fingerprint_confirmation.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:ignore="contentDescription">
 
     <ImageView
         android:layout_width="96dp"
@@ -17,7 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_margin="16dp"
-        android:text="Touch fingerprint scanner to confirm"
+        android:text="@string/touch_fingerprint_scanner_to_confirm"
         android:textAlignment="center"
         android:textSize="@dimen/text_size_medium"/>
 
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index e3558797fc..36c5a2b865 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -99,7 +99,7 @@
                         android:id="@+id/tvBalance"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="2"
+                        android:layout_weight="3"
                         android:fontFamily="@font/maaxmedium"
                         android:paddingLeft="5dp"
                         android:paddingRight="5dp"
@@ -120,7 +120,7 @@
                         android:paddingRight="5dp"
                         android:textColor="@color/primary"
                         android:textStyle="normal|bold"
-                        tools:text="Bitcoin" />
+                        tools:text="Bitcoin"/>
 
                 </LinearLayout>
 
@@ -174,7 +174,7 @@
                         android:textColor="@android:color/black"
                         android:textSize="@dimen/text_size_1_small"
                         android:textStyle="normal|bold"
-                        tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY" />
+                        tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY"/>
 
                     <LinearLayout
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml
index b4e56c7212..a4bb13c077 100644
--- a/app/src/main/res/layout/fr_verify_card.xml
+++ b/app/src/main/res/layout/fr_verify_card.xml
@@ -7,8 +7,8 @@
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="vertical"
-    android:padding="0dp"
     tools:context="com.tangem.presentation.fragment.VerifyCard"
+    tools:ignore="contentDescription"
     tools:showIn="@layout/activity_verify_card">
 
     <android.support.v4.widget.SwipeRefreshLayout
@@ -28,11 +28,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-
             <RelativeLayout
                 android:id="@+id/rlCardInfo"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -165,10 +164,10 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="@font/montserrat_light"
-                            android:text="Sign hash"
                             android:textColor="@color/primary_dark"
                             android:textSize="@dimen/text_size_1_small"
-                            android:textStyle="normal|bold"/>
+                            android:textStyle="normal|bold"
+                            tools:text="Sign hash"/>
 
                     </LinearLayout>
 
@@ -190,10 +189,10 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="@font/montserrat_light"
-                            android:text="Reusable"
                             android:textColor="@color/primary_dark"
                             android:textSize="@dimen/text_size_1_small"
-                            android:textStyle="normal|bold"/>
+                            android:textStyle="normal|bold"
+                            tools:text="Reusable"/>
 
                     </LinearLayout>
 
@@ -461,10 +460,10 @@
                             android:layout_height="match_parent"
                             android:fontFamily="@font/montserrat_light"
                             android:gravity="start|center_vertical"
-                            android:text="address"
                             android:textColor="@color/primary_dark"
                             android:textSize="@dimen/text_size_small"
-                            android:textStyle="normal|bold"/>
+                            android:textStyle="normal|bold"
+                            tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY"/>
 
                     </LinearLayout>
 
@@ -474,12 +473,11 @@
                         android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/tvWalletIdentityLabel"
                             android:layout_width="@dimen/verify_card_left_col_width"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="20dp"
                             android:fontFamily="@font/raleway_r"
-                            android:text="Private key"
+                            android:text="@string/private_key"
                             android:textSize="@dimen/text_size_1_small"/>
 
                         <TextView
@@ -487,10 +485,10 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="@font/montserrat_light"
-                            android:text="Possession proved"
                             android:textColor="@color/confirmed"
                             android:textSize="@dimen/text_size_1_small"
-                            android:textStyle="normal|bold"/>
+                            android:textStyle="normal|bold"
+                            tools:text="Possession proved"/>
 
                     </LinearLayout>
 
@@ -505,10 +503,10 @@
                         android:shadowDx="2"
                         android:shadowDy="2"
                         android:shadowRadius="2"
-                        android:text="Error!"
                         android:textAlignment="center"
                         android:textColor="@color/white"
-                        android:textStyle="bold"/>
+                        android:textStyle="bold"
+                        tools:text="Error!"/>
 
                     <TextView
                         android:id="@+id/tvMessage"
@@ -517,10 +515,10 @@
                         android:background="#7F7FF27F"
                         android:fontFamily="@font/montserrat_light"
                         android:padding="4dp"
-                        android:text="Message!"
                         android:textAlignment="center"
                         android:textColor="@color/black"
-                        android:textStyle="normal|bold"/>
+                        android:textStyle="normal|bold"
+                        tools:text="Message!"/>
 
                 </LinearLayout>
 
@@ -567,7 +565,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent">
 
-
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/fabMenu"
             android:layout_width="wrap_content"
@@ -585,4 +582,4 @@
 
     </LinearLayout>
 
-</android.support.constraint.ConstraintLayout>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d8c64beee3..bba1497064 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,10 +190,12 @@
     <string name="possession_proved">Possession proved</string>
     <string name="possession_not_proved">Possession NOT proved</string>
     <string name="not_available">not available</string>
+    <string name="private_key">Private key</string>
 
     <!-- SavePINActivity -->
     <string name="save">Save</string>
     <string name="delete">Delete</string>
     <string name="protect_with_fingerprint">Protect with fingerprint</string>
+    <string name="touch_fingerprint_scanner_to_confirm">Touch fingerprint scanner to confirm</string>
 
 </resources>
\ No newline at end of file