diff --git a/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt b/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt
index 4b3ec79..ade4922 100644
--- a/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt
+++ b/app/src/main/java/com/github/mondei1/offpass/CreateActivity.kt
@@ -139,7 +139,8 @@ class CreateActivity : AppCompatActivity() {
     }
 
     fun passwordKnown(password: String): Boolean {
-        return this.known_passwords.contains(password)
+        // TODO: Doesn't work on all devices somehow :shrug:
+        return this.known_passwords.contains(password.toLowerCase(Locale.ROOT))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/layout/activity_create.xml b/app/src/main/res/layout/activity_create.xml
index e3eb523..5477449 100644
--- a/app/src/main/res/layout/activity_create.xml
+++ b/app/src/main/res/layout/activity_create.xml
@@ -23,8 +23,8 @@
             <ImageButton
                 android:id="@+id/print_button"
                 style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="86dp"
-                android:layout_height="50dp"
+                android:layout_width="88dp"
+                android:layout_height="55dp"
                 android:layout_margin="0dp"
                 android:layout_marginStart="64dp"
                 android:backgroundTint="#F8F8F8"
@@ -82,8 +82,11 @@
     </androidx.appcompat.widget.Toolbar>
 
     <ScrollView
-        android:layout_width="416dp"
-        android:layout_height="566dp"
+        android:id="@+id/scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="56dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toolbar">
 
@@ -106,7 +109,7 @@
                 android:id="@+id/email_input"
                 style="@style/Widget.AppCompat.AutoCompleteTextView"
                 android:layout_width="354dp"
-                android:layout_height="48dp"
+                android:layout_height="97dp"
                 android:layout_marginStart="16dp"
                 android:background="@color/colorPrimary"
                 android:ems="10"
@@ -131,9 +134,10 @@
 
             <EditText
                 android:id="@+id/password_input"
-                android:layout_width="263dp"
-                android:layout_height="67dp"
+                android:layout_width="0dp"
+                android:layout_height="81dp"
                 android:layout_marginStart="16dp"
+                android:layout_marginTop="12dp"
                 android:background="@color/colorPrimary"
                 android:ems="10"
                 android:fontFamily="sans-serif-black"
@@ -142,7 +146,8 @@
                 android:singleLine="true"
                 android:textSize="28sp"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/password_label" />
+                app:layout_constraintTop_toBottomOf="@+id/password_label"
+                app:layout_constraintWidth_percent="0.6" />
 
             <EditText
                 android:id="@+id/username_input"
@@ -232,6 +237,8 @@
                 android:layout_marginStart="16dp"
                 android:background="@color/colorPrimary"
                 app:layout_constraintBottom_toBottomOf="@+id/password_input"
+                app:layout_constraintEnd_toStartOf="@+id/password_random"
+                app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/password_input"
                 app:layout_constraintTop_toTopOf="@+id/password_input"
                 app:layout_constraintVertical_bias="0.48000002"
@@ -247,59 +254,65 @@
                 android:tint="#000000"
                 app:layout_constraintBottom_toBottomOf="@+id/password_input"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/password_hide"
                 app:layout_constraintTop_toTopOf="@+id/password_input"
                 app:srcCompat="@drawable/ic_autorenew" />
+
+            <ProgressBar
+                android:id="@+id/fa_progress"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="379dp"
+                android:layout_height="15dp"
+                android:layout_marginStart="16dp"
+                android:max="30"
+                android:visibility="invisible"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/fa_input" />
+
+            <TextView
+                android:id="@+id/fa_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="20dp"
+                android:text="Two factor authentication"
+                android:textSize="18sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/url_input" />
+
+            <EditText
+                android:id="@+id/fa_input"
+                style="@style/Widget.AppCompat.AutoCompleteTextView"
+                android:layout_width="354dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="16dp"
+                android:background="#00FFFFFF"
+                android:editable="false"
+                android:ems="10"
+                android:fontFamily="sans-serif-black"
+                android:hint="TAP TO SCAN"
+                android:inputType="none|textEmailAddress"
+                android:singleLine="true"
+                android:textSize="24sp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/fa_label" />
+
+            <Button
+                android:id="@+id/button"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="256dp"
+                android:layout_height="42dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
+                android:background="@color/colorPrimaryDark"
+                android:text="Add more"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/fa_progress" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="110dp"
-        android:background="@color/colorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <TextView
-            android:id="@+id/fa_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:text="Two factor authentication"
-            android:textSize="18sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <EditText
-            android:id="@+id/fa_input"
-            style="@style/Widget.AppCompat.AutoCompleteTextView"
-            android:layout_width="354dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="16dp"
-            android:background="@color/colorPrimary"
-            android:editable="false"
-            android:ems="10"
-            android:fontFamily="sans-serif-black"
-            android:hint="TAP TO SCAN"
-            android:inputType="none|textEmailAddress"
-            android:singleLine="true"
-            android:textSize="24sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/fa_label" />
-
-        <ProgressBar
-            android:id="@+id/fa_progress"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="379dp"
-            android:layout_height="15dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:max="30"
-            android:visibility="invisible"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/fa_input" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file