diff --git a/test-app/src/main/res/layout-land/activity_main.xml b/test-app/src/main/res/layout-land/activity_main.xml
index 2731bed..02bc7d4 100644
--- a/test-app/src/main/res/layout-land/activity_main.xml
+++ b/test-app/src/main/res/layout-land/activity_main.xml
@@ -73,73 +73,7 @@
         app:layout_constraintStart_toEndOf="@id/embedded_player_layout"
         app:layout_constraintTop_toTopOf="parent">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-
-            <Button
-                android:id="@+id/start_6502_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="Start 6502 Stream" />
-
-            <Button
-                android:id="@+id/start_imu_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="Start IMU Stream" />
-
-            <Button
-                android:id="@+id/start_portrait_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="Start Portrait Stream" />
-
-            <Button
-                android:id="@+id/start_yt_test_video_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="Start Yt Test Video" />
-
-            <Button
-                android:id="@+id/add_6502_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/material_dynamic_primary50"
-                android:text="Append 6502 Stream" />
-
-            <Button
-                android:id="@+id/add_imu_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/material_dynamic_primary50"
-                android:text="Append IMU Stream" />
-
-            <Button
-                android:id="@+id/add_portrait_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/material_dynamic_primary50"
-                android:text="Append Portrait Stream" />
-
-            <Button
-                android:id="@+id/add_yt_test_video_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/material_dynamic_primary50"
-                android:text="Add Yt Test Video" />
-
-        </LinearLayout>
+        <include layout="@layout/buttons"/>
     </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/test-app/src/main/res/layout/activity_main.xml b/test-app/src/main/res/layout/activity_main.xml
index d9e885e..7c3d62c 100644
--- a/test-app/src/main/res/layout/activity_main.xml
+++ b/test-app/src/main/res/layout/activity_main.xml
@@ -72,73 +72,7 @@
         app:layout_constraintTop_toBottomOf="@id/embedded_player_layout"
         app:layout_constraintVertical_weight="1">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-
-            <Button
-                android:id="@+id/start_6502_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="Start 6502 Stream" />
-
-            <Button
-                android:id="@+id/start_imu_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="Start IMU Stream" />
-
-            <Button
-                android:id="@+id/start_portrait_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="Start Portrait Stream" />
-
-            <Button
-                android:id="@+id/start_yt_test_video_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="Start Yt Test Video" />
-
-            <Button
-                android:id="@+id/add_6502_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/material_dynamic_primary50"
-                android:text="Append 6502 Stream" />
-
-            <Button
-                android:id="@+id/add_imu_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/material_dynamic_primary50"
-                android:text="Append IMU Stream" />
-
-            <Button
-                android:id="@+id/add_portrait_stream_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/material_dynamic_primary50"
-                android:text="Append Portrait Stream" />
-
-            <Button
-                android:id="@+id/add_yt_test_video_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/material_dynamic_primary50"
-                android:text="Add Yt Test Video" />
-
-        </LinearLayout>
+        <include layout="@layout/buttons"/>
 
     </ScrollView>
 
diff --git a/test-app/src/main/res/layout/buttons.xml b/test-app/src/main/res/layout/buttons.xml
new file mode 100644
index 0000000..4d1d189
--- /dev/null
+++ b/test-app/src/main/res/layout/buttons.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <Button
+        android:id="@+id/start_6502_stream_button"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="Start 6502 Stream" />
+
+    <Button
+        android:id="@+id/start_imu_stream_button"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="Start IMU Stream" />
+
+    <Button
+        android:id="@+id/start_portrait_stream_button"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="Start Portrait Stream" />
+
+    <Button
+        android:id="@+id/start_yt_test_video_button"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="Start Yt Test Video" />
+
+    <Button
+        android:backgroundTint="@color/material_dynamic_primary50"
+        android:id="@+id/add_6502_stream_button"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="Append 6502 Stream" />
+
+    <Button
+        android:backgroundTint="@color/material_dynamic_primary50"
+        android:id="@+id/add_imu_stream_button"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="Append IMU Stream" />
+
+    <Button
+        android:backgroundTint="@color/material_dynamic_primary50"
+        android:id="@+id/add_portrait_stream_button"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="Append Portrait Stream" />
+
+    <Button
+        android:backgroundTint="@color/material_dynamic_primary50"
+        android:id="@+id/add_yt_test_video_button"
+        android:layout_gravity="center"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="Add Yt Test Video" />
+
+</LinearLayout>
\ No newline at end of file