diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b089642..b801924 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,13 +12,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.App.Starting">
-        <activity
-            android:exported="false"
-            android:name="org.mosad.teapod.ui.activity.onboarding.OnboardingActivity"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTop"
-            android:windowSoftInputMode="adjustPan">
-        </activity>
         <activity
             android:exported="true"
             android:name="org.mosad.teapod.ui.activity.main.MainActivity"
@@ -28,6 +21,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:exported="false"
+            android:name="org.mosad.teapod.ui.activity.onboarding.OnboardingActivity"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustPan">
+        </activity>
         <activity
             android:exported="false"
             android:name="org.mosad.teapod.ui.activity.player.PlayerActivity"
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 4f3c904..9c8f86f 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -243,6 +243,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:checked="true"
+                            android:contentDescription="@string/settings_prefer_subbed"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -304,6 +305,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:checked="true"
+                            android:contentDescription="@string/settings_autoplay"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -390,6 +392,7 @@
                         android:id="@+id/imageView5"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:contentDescription="@string/update_playhead"
                         android:minWidth="48dp"
                         android:minHeight="48dp"
                         android:padding="9dp"
@@ -399,8 +402,7 @@
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1">
+                        android:layout_height="wrap_content">
 
                         <LinearLayout
                             android:id="@+id/linearLayout4"
@@ -416,14 +418,14 @@
                                 android:id="@+id/text_update_playhead"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text="@string/disable_playhead_updates"
+                                android:text="@string/update_playhead"
                                 android:textSize="16sp" />
 
                             <TextView
                                 android:id="@+id/text_update_playhead_desc"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:text="@string/disable_playhead_updates_desc"
+                                android:text="@string/update_playhead_desc"
                                 android:textColor="?textSecondary" />
                         </LinearLayout>
 
@@ -432,6 +434,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:checked="true"
+                            android:contentDescription="@string/update_playhead"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -447,7 +450,8 @@
                     android:foreground="?android:selectableItemBackground"
                     android:gravity="center"
                     android:orientation="horizontal"
-                    android:padding="7dp">
+                    android:padding="7dp"
+                    android:visibility="gone">
 
                     <ImageView
                         android:id="@+id/image_export_data"
@@ -492,7 +496,8 @@
                     android:foreground="?android:selectableItemBackground"
                     android:gravity="center"
                     android:orientation="horizontal"
-                    android:padding="7dp">
+                    android:padding="7dp"
+                    android:visibility="gone">
 
                     <ImageView
                         android:id="@+id/image_import_data"
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e73016b..037c51c 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -50,8 +50,8 @@
     <string name="theme_light">Hell</string>
     <string name="theme_dark">Dunkel</string>
     <string name="dev_settings">Entwickler Einstellungen</string>
-    <string name="disable_playhead_updates">Playhead Updates</string>
-    <string name="disable_playhead_updates_desc">Fortschritt bei Episoden auf cr updaten</string>
+    <string name="update_playhead">Playhead Updates</string>
+    <string name="update_playhead_desc">Fortschritt bei Episoden auf cr updaten</string>
     <string name="export_data">Daten exportieren</string>
     <string name="export_data_desc">Speichere "Meine Liste" in eine Datei</string>
     <string name="import_data">Daten importieren</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fabe099..9da9aa4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,8 +59,8 @@
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
     <string name="dev_settings">Developer Settings</string>
-    <string name="disable_playhead_updates">Playhead updates</string>
-    <string name="disable_playhead_updates_desc">Update episode playhead on cr</string>
+    <string name="update_playhead">Playhead updates</string>
+    <string name="update_playhead_desc">Update episode playhead on cr</string>
     <string name="export_data">export data</string>
     <string name="export_data_desc">export "My list" to a file</string>
     <string name="import_data">import data</string>