diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d199810..fbb68289 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index dbae8a15..14f2d91a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 16
-        versionName "0.8.0.3"
+        versionCode 17
+        versionName "0.8.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
diff --git a/app/src/main/res/layout/gen_fragment.xml b/app/src/main/res/layout/gen_fragment.xml
index 99e88eba..d6b3273e 100644
--- a/app/src/main/res/layout/gen_fragment.xml
+++ b/app/src/main/res/layout/gen_fragment.xml
@@ -1,107 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="2">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <EditText
-            android:id="@+id/etWalletName"
-            style="@style/MoneroEdit"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="@string/generate_name_hint"
-            android:imeOptions="actionNext"
-            android:inputType="text"
-            android:maxLines="1"
-            android:textAlignment="center" />
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <EditText
+                android:id="@+id/etWalletName"
+                style="@style/MoneroEdit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/generate_name_hint"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:maxLines="1"
+                android:textAlignment="center" />
+
+            <EditText
+                android:id="@+id/etWalletPassword"
+                style="@style/MoneroEdit"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/generate_password_hint"
+                android:imeOptions="actionNext"
+                android:inputType="text"
+                android:textAlignment="center" />
+        </LinearLayout>
 
         <EditText
-            android:id="@+id/etWalletPassword"
-            style="@style/MoneroEdit"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="@string/generate_password_hint"
-            android:imeOptions="actionNext"
-            android:inputType="text"
-            android:textAlignment="center" />
-    </LinearLayout>
-
-    <EditText
-        android:id="@+id/etWalletMnemonic"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_mnemonic_hint"
-        android:imeOptions="actionNext"
-        android:inputType="textMultiLine"
-        android:textAlignment="center" />
-
-    <EditText
-        android:id="@+id/etWalletAddress"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_address_hint"
-        android:imeOptions="actionNext"
-        android:inputType="textMultiLine"
-        android:textAlignment="center" />
-
-    <LinearLayout
-        android:id="@+id/llRestoreKeys"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <EditText
-            android:id="@+id/etWalletViewKey"
+            android:id="@+id/etWalletMnemonic"
             style="@style/MoneroEdit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/generate_viewkey_hint"
+            android:hint="@string/generate_mnemonic_hint"
             android:imeOptions="actionNext"
             android:inputType="textMultiLine"
             android:textAlignment="center" />
 
         <EditText
-            android:id="@+id/etWalletSpendKey"
+            android:id="@+id/etWalletAddress"
             style="@style/MoneroEdit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/generate_spendkey_hint"
+            android:hint="@string/generate_address_hint"
             android:imeOptions="actionNext"
             android:inputType="textMultiLine"
-            android:textAlignment="center"/>
+            android:textAlignment="center" />
+
+        <LinearLayout
+            android:id="@+id/llRestoreKeys"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone">
+
+            <EditText
+                android:id="@+id/etWalletViewKey"
+                style="@style/MoneroEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/generate_viewkey_hint"
+                android:imeOptions="actionNext"
+                android:inputType="textMultiLine"
+                android:textAlignment="center" />
+
+            <EditText
+                android:id="@+id/etWalletSpendKey"
+                style="@style/MoneroEdit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/generate_spendkey_hint"
+                android:imeOptions="actionNext"
+                android:inputType="textMultiLine"
+                android:textAlignment="center" />
+        </LinearLayout>
+
+        <EditText
+            android:id="@+id/etWalletRestoreHeight"
+            style="@style/MoneroEdit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/generate_restoreheight_hint"
+            android:imeOptions="actionDone"
+            android:inputType="number"
+            android:textAlignment="center"
+            android:visibility="gone" />
+
+        <Button
+            android:id="@+id/bGenerate"
+            style="@style/MoneroButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
+            android:enabled="false"
+            android:text="@string/generate_buttonGenerate" />
+
     </LinearLayout>
-
-    <EditText
-        android:id="@+id/etWalletRestoreHeight"
-        style="@style/MoneroEdit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/generate_restoreheight_hint"
-        android:imeOptions="actionDone"
-        android:inputType="number"
-        android:textAlignment="center"
-        android:visibility="gone" />
-
-    <Button
-        android:id="@+id/bGenerate"
-        style="@style/MoneroButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginTop="8dp"
-        android:enabled="false"
-        android:text="@string/generate_buttonGenerate" />
-
-</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/gen_review_fragment.xml b/app/src/main/res/layout/gen_review_fragment.xml
index e1572193..f3ac4144 100644
--- a/app/src/main/res/layout/gen_review_fragment.xml
+++ b/app/src/main/res/layout/gen_review_fragment.xml
@@ -1,141 +1,146 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ProgressBar
-        android:id="@+id/pbProgress"
-        style="@android:style/Widget.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8sp"
-        android:visibility="invisible" />
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="2">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ProgressBar
+            android:id="@+id/pbProgress"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8sp"
+            android:visibility="invisible" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/tvWalletLabel"
+                style="@style/MoneroLabel"
+                android:layout_width="0sp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/generate_wallet_label"
+                android:textAlignment="center" />
+
+            <TextView
+                android:id="@+id/tvWalletPasswordLabel"
+                style="@style/MoneroLabel"
+                android:layout_width="0sp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/generate_password_label"
+                android:textAlignment="center" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp"
+            android:orientation="horizontal"
+            android:weightSum="2">
+
+            <TextView
+                android:id="@+id/tvWalletName"
+                style="@style/MoneroText"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textAlignment="center" />
+
+            <TextView
+                android:id="@+id/tvWalletPassword"
+                style="@style/MoneroText"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="***"
+                android:textAlignment="center" />
+        </LinearLayout>
 
         <TextView
-            android:id="@+id/tvWalletLabel"
+            android:id="@+id/tvWalletMnemonicLabel"
             style="@style/MoneroLabel"
-            android:layout_width="0sp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/generate_wallet_label"
+            android:text="@string/generate_mnemonic_label"
             android:textAlignment="center" />
 
         <TextView
-            android:id="@+id/tvWalletPasswordLabel"
+            android:id="@+id/tvWalletMnemonic"
+            style="@style/MoneroText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAlignment="center" />
+
+        <TextView
+            android:id="@+id/tvWalletAddressLabel"
             style="@style/MoneroLabel"
-            android:layout_width="0sp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/generate_password_label"
-            android:textAlignment="center" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:orientation="horizontal"
-        android:weightSum="2">
-
-        <TextView
-            android:id="@+id/tvWalletName"
-            style="@style/MoneroText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:text="@string/generate_address_label"
             android:textAlignment="center" />
 
         <TextView
-            android:id="@+id/tvWalletPassword"
+            android:id="@+id/tvWalletAddress"
             style="@style/MoneroText"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="***"
+            android:selectAllOnFocus="true"
+            android:textAlignment="center"
+            android:textIsSelectable="true" />
+
+        <TextView
+            android:id="@+id/tvWalletViewKeyLabel"
+            style="@style/MoneroLabel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/generate_viewkey_label"
             android:textAlignment="center" />
+
+        <TextView
+            android:id="@+id/tvWalletViewKey"
+            style="@style/MoneroText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:selectAllOnFocus="true"
+            android:textAlignment="center"
+            android:textIsSelectable="true" />
+
+        <TextView
+            android:id="@+id/tvWalletSpendKeyLabel"
+            style="@style/MoneroLabel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/generate_spendkey_label"
+            android:textAlignment="center" />
+
+        <TextView
+            android:id="@+id/tvWalletSpendKey"
+            style="@style/MoneroText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:textIsSelectable="true" />
+
+        <Button
+            android:id="@+id/bAccept"
+            style="@style/MoneroButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/generate_button_accept"
+            android:visibility="gone" />
     </LinearLayout>
-
-    <TextView
-        android:id="@+id/tvWalletMnemonicLabel"
-        style="@style/MoneroLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/generate_mnemonic_label"
-        android:textAlignment="center" />
-
-    <TextView
-        android:id="@+id/tvWalletMnemonic"
-        style="@style/MoneroText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center" />
-
-    <TextView
-        android:id="@+id/tvWalletAddressLabel"
-        style="@style/MoneroLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/generate_address_label"
-        android:textAlignment="center" />
-
-    <TextView
-        android:id="@+id/tvWalletAddress"
-        style="@style/MoneroText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:selectAllOnFocus="true"
-        android:textAlignment="center"
-        android:textIsSelectable="true" />
-
-    <TextView
-        android:id="@+id/tvWalletViewKeyLabel"
-        style="@style/MoneroLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/generate_viewkey_label"
-        android:textAlignment="center" />
-
-    <TextView
-        android:id="@+id/tvWalletViewKey"
-        style="@style/MoneroText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:selectAllOnFocus="true"
-        android:textAlignment="center"
-        android:textIsSelectable="true" />
-
-    <TextView
-        android:id="@+id/tvWalletSpendKeyLabel"
-        style="@style/MoneroLabel"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/generate_spendkey_label"
-        android:textAlignment="center" />
-
-    <TextView
-        android:id="@+id/tvWalletSpendKey"
-        style="@style/MoneroText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textIsSelectable="true" />
-
-    <Button
-        android:id="@+id/bAccept"
-        style="@style/MoneroButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/generate_button_accept"
-        android:visibility="gone" />
-</LinearLayout>
+</ScrollView>
\ No newline at end of file