diff --git a/app/src/main/res/layout/activity_buttons.xml b/app/src/main/res/layout/activity_buttons.xml
index 36d84792..1e7ee84d 100644
--- a/app/src/main/res/layout/activity_buttons.xml
+++ b/app/src/main/res/layout/activity_buttons.xml
@@ -14,7 +14,7 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/activity_images.xml b/app/src/main/res/layout/activity_images.xml
index 106ce33c..497934dd 100644
--- a/app/src/main/res/layout/activity_images.xml
+++ b/app/src/main/res/layout/activity_images.xml
@@ -14,7 +14,7 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
diff --git a/app/src/main/res/layout/activity_linear_layout.xml b/app/src/main/res/layout/activity_linear_layout.xml
index d84edc4d..8b130070 100644
--- a/app/src/main/res/layout/activity_linear_layout.xml
+++ b/app/src/main/res/layout/activity_linear_layout.xml
@@ -14,7 +14,7 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
@@ -96,8 +96,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_margin="24dp"
-                android:orientation="horizontal"
-                app:layout_constraintStart_toStartOf="parent">
+                android:orientation="horizontal">
 
                 <com.google.android.material.button.MaterialButton
                     style="@style/Widget.Material3.Button.ElevatedButton"
diff --git a/app/src/main/res/layout/activity_permissions.xml b/app/src/main/res/layout/activity_permissions.xml
index 32beefae..28c99007 100644
--- a/app/src/main/res/layout/activity_permissions.xml
+++ b/app/src/main/res/layout/activity_permissions.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/frame_layout_permissions"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
+
diff --git a/app/src/main/res/layout/activity_permissions_tutorial.xml b/app/src/main/res/layout/activity_permissions_tutorial.xml
index b14692e8..5067e50d 100644
--- a/app/src/main/res/layout/activity_permissions_tutorial.xml
+++ b/app/src/main/res/layout/activity_permissions_tutorial.xml
@@ -8,7 +8,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text_view_permissions_beginning"
diff --git a/app/src/main/res/layout/activity_progress_bar.xml b/app/src/main/res/layout/activity_progress_bar.xml
index d08aa2a1..ed854889 100644
--- a/app/src/main/res/layout/activity_progress_bar.xml
+++ b/app/src/main/res/layout/activity_progress_bar.xml
@@ -14,7 +14,7 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
@@ -83,10 +83,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_margin="24dp"
-                android:indeterminate="true"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:indeterminate="true" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/button_download"
diff --git a/app/src/main/res/layout/activity_startup.xml b/app/src/main/res/layout/activity_startup.xml
index 0829745c..4f717100 100644
--- a/app/src/main/res/layout/activity_startup.xml
+++ b/app/src/main/res/layout/activity_startup.xml
@@ -13,7 +13,7 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="wrap_content">
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/text_view_welcome"
diff --git a/app/src/main/res/layout/activity_switch.xml b/app/src/main/res/layout/activity_switch.xml
index f9baeb68..d261998a 100644
--- a/app/src/main/res/layout/activity_switch.xml
+++ b/app/src/main/res/layout/activity_switch.xml
@@ -16,7 +16,7 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
             <com.google.android.material.textview.MaterialTextView
@@ -66,7 +66,7 @@
                 <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/material_switch_preference"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
                     android:padding="24dp"
                     android:text="@string/switch_me"
                     android:tooltipText="@string/switch_me"
diff --git a/app/src/main/res/layout/dialog_bottom_sheet_menu.xml b/app/src/main/res/layout/dialog_bottom_sheet_menu.xml
index 96c5810a..f08a8927 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet_menu.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet_menu.xml
@@ -31,7 +31,7 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:padding="16dp">
@@ -95,7 +95,7 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:padding="16dp">
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 6589dd24..1f7971f7 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -12,7 +12,7 @@
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:gravity="center"
             android:orientation="vertical">