diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml
index 691270495..29fde5292 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/encrypt_layout.xml
@@ -58,6 +58,7 @@
             <EditText
                 android:id="@+id/crypto_password_edit"
                 android:layout_width="match_parent"
+                android:hint="@string/crypto_password_edit_hint"
                 android:layout_height="0dp"
                 android:layout_weight="1"
                 android:typeface="monospace" />
@@ -81,6 +82,7 @@
                 android:id="@+id/crypto_extra_edit"
                 android:layout_width="match_parent"
                 android:layout_height="fill_parent"
+                android:hint="@string/crypto_extra_edit_hint"
                 android:enabled="true"
                 android:typeface="monospace"
                 android:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_to_clone_or_not.xml b/app/src/main/res/layout/fragment_to_clone_or_not.xml
index 170bd1aa8..87d1d8496 100644
--- a/app/src/main/res/layout/fragment_to_clone_or_not.xml
+++ b/app/src/main/res/layout/fragment_to_clone_or_not.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@color/blue_grey_500"
     android:orientation="vertical"
-    tools:context="com.zeapo.pwdstore.ToCloneOrNot">
+    tools:context="com.zeapo.pwdstore.PasswordStore">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -67,7 +67,7 @@
             android:layout_alignTop="@+id/main_clone_button"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
-            android:textSize="11sp" />
+            android:textSize="12sp" />
         <Button
             android:id="@+id/main_clone_button"
             android:layout_width="wrap_content"
@@ -79,7 +79,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:textSize="11sp"
+            android:textSize="12sp"
             tools:ignore="RelativeOverlap" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml
index 3c886921c..85f8838d0 100644
--- a/app/src/main/res/layout/password_row_layout.xml
+++ b/app/src/main/res/layout/password_row_layout.xml
@@ -39,7 +39,7 @@
             android:layout_alignTop="@+id/type_image"
             android:layout_toRightOf="@+id/type_image"
             android:layout_toEndOf="@+id/type_image"
-            android:maxLines="1"
+            android:singleLine="true"
             tools:ignore="HardcodedText" />
 
         <TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4f5e422fe..d96a75314 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -213,4 +213,6 @@
     <string name="hackish_tools">Hackish tools</string>
     <string name="abort_rebase">Abort rebase</string>
     <string name="commit_hash">Commit hash</string>
+    <string name="crypto_password_edit_hint">p@ssw0rd!</string>
+    <string name="crypto_extra_edit_hint">username: something other extra content</string>
 </resources>