diff --git a/app/build.gradle b/app/build.gradle
index d8e3ff7..8706a55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,11 +38,11 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d7ced19..e35f381 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:fullBackupContent="@xml/backup_descriptor">
         <activity
             android:name=".MainActivity"
             android:windowSoftInputMode="adjustPan"
diff --git a/app/src/main/res/layout-land/content_main.xml b/app/src/main/res/layout-land/content_main.xml
index 4dd9685..a205dec 100644
--- a/app/src/main/res/layout-land/content_main.xml
+++ b/app/src/main/res/layout-land/content_main.xml
@@ -87,7 +87,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginTop="16dp"
-            android:clickable="true">
+            android:clickable="false">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -273,7 +273,8 @@
                 android:paddingTop="15dp"
                 android:paddingBottom="15dp"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/back" />
+                app:srcCompat="@drawable/back"
+                android:contentDescription="TODO" />
 
         </LinearLayout>
 
@@ -312,7 +313,8 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1.0"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/checkmark" />
+                app:srcCompat="@drawable/checkmark"
+                android:contentDescription="TODO" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index f556b16..31da6fa 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -86,7 +86,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginTop="16dp"
-        android:clickable="true"
+        android:clickable="false"
         app:layout_constraintBottom_toTopOf="@+id/viewInput"
         app:layout_constraintTop_toBottomOf="@+id/viewScore">
 
@@ -275,7 +275,8 @@
             android:paddingTop="15dp"
             android:paddingBottom="15dp"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/back" />
+            app:srcCompat="@drawable/back"
+            android:contentDescription="TODO" />
 
     </LinearLayout>
 
@@ -317,6 +318,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1.0"
             android:scaleType="fitCenter"
-            app:srcCompat="@drawable/checkmark" />
+            app:srcCompat="@drawable/checkmark"
+            android:contentDescription="TODO" />
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
new file mode 100644
index 0000000..6fd6103
--- /dev/null
+++ b/app/src/main/res/xml/backup_descriptor.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- Exclude specific shared preferences that contain GCM registration Id -->
+</full-backup-content>