diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1e6e684..dd045cb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "cz.bugsy.passwordzebra"
         minSdk = 29
         targetSdk = 34
-        versionCode = 8
-        versionName = "1.6.1"
+        versionCode = 9
+        versionName = "1.7.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 0000000..5032e85
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,168 @@
+<androidx.constraintlayout.widget.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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity"
+    tools:layout_editor_absoluteX="0dp"
+    tools:layout_editor_absoluteY="2dp">
+
+    <TextView
+        android:id="@+id/passwordTextView"
+        android:layout_width="335dp"
+        android:layout_height="149dp"
+        android:layout_centerHorizontal="false"
+        android:layout_marginHorizontal="10dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/password_background"
+        android:gravity="center"
+        android:minHeight="150dp"
+        android:padding="16dp"
+        android:text=""
+        android:textSize="24sp"
+
+        app:layout_constraintBottom_toTopOf="@+id/generateButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/passwordLengthPicker"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <TextView
+        android:id="@+id/passwordLengthLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="0dp"
+        android:text="@string/textview_password_length"
+        app:layout_constraintBottom_toBottomOf="@+id/passwordLengthPicker"
+        app:layout_constraintStart_toStartOf="@id/guideline4"
+        app:layout_constraintTop_toTopOf="@+id/passwordLengthPicker" />
+
+    <NumberPicker
+        android:id="@+id/passwordLengthPicker"
+        android:layout_width="69dp"
+        android:layout_height="178dp"
+        android:layout_marginStart="81dp"
+        app:layout_constraintBottom_toTopOf="@+id/switchWithoutSpaces"
+        app:layout_constraintEnd_toEndOf="@id/guideline5"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toEndOf="@+id/passwordLengthLabel"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switchWithoutSpaces"
+        style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
+        android:layout_width="299dp"
+        android:layout_height="48dp"
+        android:text="@string/switch_without_spaces"
+        app:layout_constraintBottom_toTopOf="@id/switchSpecialChars"
+        app:layout_constraintEnd_toStartOf="@+id/guideline5"
+        app:layout_constraintStart_toStartOf="@id/guideline4" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/switchSpecialChars"
+        style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
+        android:layout_width="299dp"
+        android:layout_height="48dp"
+        android:layout_marginBottom="36dp"
+        android:text="@string/switch_special_characters"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/guideline5"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="@id/guideline4" />
+
+    <Button
+        android:id="@+id/generateButton"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="end|bottom"
+        android:layout_marginBottom="48dp"
+        android:contentDescription="@string/button_generate_description"
+        android:insetLeft="0dp"
+        android:insetTop="0dp"
+        android:insetRight="0dp"
+        android:insetBottom="0dp"
+        android:padding="0dp"
+        android:tooltipText="@string/button_generate_text"
+        app:backgroundColor="@color/design_default_color_primary"
+        app:cornerRadius="16dp"
+        app:icon="@drawable/pw_generate"
+        app:iconGravity="textTop"
+        app:iconPadding="0dp"
+        app:iconSize="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/passwordLengthPicker"
+        app:layout_constraintStart_toStartOf="@+id/guideline5" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="20dp" />
+
+    <ImageView
+        android:id="@+id/imageViewPwLength"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/image_length_desc"
+        app:layout_constraintBottom_toBottomOf="@+id/passwordLengthLabel"
+        app:layout_constraintStart_toStartOf="@+id/guideline3"
+        app:layout_constraintTop_toTopOf="@+id/passwordLengthLabel"
+        app:layout_constraintVertical_bias="0.0"
+        app:srcCompat="@drawable/pw_straighten" />
+
+    <ImageView
+        android:id="@+id/imageViewWithoutSpaces"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="9dp"
+        android:contentDescription="@string/image_wospaces"
+        app:layout_constraintBottom_toBottomOf="@+id/switchWithoutSpaces"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="@+id/guideline3"
+        app:layout_constraintTop_toTopOf="@+id/switchWithoutSpaces"
+        app:layout_constraintVertical_bias="0.8"
+        app:srcCompat="@drawable/pw_letter_spacing" />
+
+    <ImageView
+        android:id="@+id/imageViewAddSpecialChars"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="8dp"
+        android:contentDescription="@string/image_specialchars"
+        app:layout_constraintBottom_toBottomOf="@+id/switchSpecialChars"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="@+id/guideline3"
+        app:layout_constraintTop_toTopOf="@+id/switchSpecialChars"
+        app:layout_constraintVertical_bias="0.625"
+        app:srcCompat="@drawable/pw_special_character" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="16dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="65dp" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="365dp" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>