diff --git a/apps/OboeTester/app/build.gradle b/apps/OboeTester/app/build.gradle
index 10f20bdf3..22020961f 100644
--- a/apps/OboeTester/app/build.gradle
+++ b/apps/OboeTester/app/build.gradle
@@ -25,6 +25,15 @@ android {
             jniDebuggable true
         }
     }
+    flavorDimensions = ["device"]
+    productFlavors {
+        mobile {
+            dimension "device"
+        }
+        watch {
+            dimension "device"
+        }
+    }
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
diff --git a/apps/OboeTester/app/src/main/AndroidManifest.xml b/apps/OboeTester/app/src/main/AndroidManifest.xml
index ba91a8a3d..bcf73af0c 100644
--- a/apps/OboeTester/app/src/main/AndroidManifest.xml
+++ b/apps/OboeTester/app/src/main/AndroidManifest.xml
@@ -20,6 +20,9 @@
     <uses-feature
         android:name="android.software.leanback"
         android:required="false" />
+    <uses-feature
+        android:name="android.hardware.type.watch"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
@@ -41,7 +44,6 @@
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -52,104 +54,82 @@
         </activity>
         <activity
             android:name=".TestOutputActivity"
-            android:label="@string/title_activity_test_output"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_activity_test_output" />
         <activity
             android:name=".TestInputActivity"
-            android:label="@string/title_activity_test_input"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_activity_test_input" />
         <activity
             android:name=".TapToToneActivity"
-            android:label="@string/title_activity_output_latency"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_activity_output_latency" />
         <activity
             android:name=".RecorderActivity"
-            android:label="@string/title_activity_recorder"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_activity_recorder" />
         <activity
             android:name=".EchoActivity"
-            android:label="@string/title_activity_echo"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_activity_echo" />
         <activity
             android:name=".RoundTripLatencyActivity"
-            android:label="@string/title_activity_rt_latency"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_activity_rt_latency" />
         <activity
             android:name=".ManualGlitchActivity"
-            android:label="@string/title_activity_glitches"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_activity_glitches" />
         <activity
             android:name=".AutomatedGlitchActivity"
-            android:label="@string/title_activity_auto_glitches"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_activity_auto_glitches" />
         <activity
             android:name=".TestDisconnectActivity"
-            android:label="@string/title_test_disconnect"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_test_disconnect" />
         <activity
             android:name=".DeviceReportActivity"
-            android:label="@string/title_report_devices"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_report_devices" />
         <activity
             android:name=".TestDataPathsActivity"
-            android:label="@string/title_data_paths"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_data_paths" />
         <activity
             android:name=".ExtraTestsActivity"
             android:exported="true"
-            android:label="@string/title_extra_tests"
-            android:screenOrientation="portrait" />
+            android:label="@string/title_extra_tests" />
 
         <activity
             android:name=".ExternalTapToToneActivity"
             android:label="@string/title_external_tap"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".TestPlugLatencyActivity"
             android:label="@string/title_plug_latency"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".TestErrorCallbackActivity"
             android:label="@string/title_error_callback"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".TestRouteDuringCallbackActivity"
             android:label="@string/title_route_during_callback"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".DynamicWorkloadActivity"
             android:label="@string/title_dynamic_load"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".TestColdStartLatencyActivity"
             android:label="@string/title_cold_start_latency"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".TestRapidCycleActivity"
             android:label="@string/title_rapid_cycle"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".AudioWorkloadTestActivity"
             android:label="@string/title_audio_workload_test"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".AudioWorkloadTestRunnerActivity"
             android:label="@string/title_audio_workload_test_runner"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
         <activity
             android:name=".ReverseJniActivity"
             android:label="@string/title_reverse_jni"
-            android:exported="true"
-            android:screenOrientation="portrait" />
+            android:exported="true" />
 
         <service
             android:name=".MidiTapTester"
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_audio_workload_test_runner.xml b/apps/OboeTester/app/src/main/res/layout/activity_audio_workload_test_runner.xml
index a36a12d7b..46c52a867 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_audio_workload_test_runner.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_audio_workload_test_runner.xml
@@ -42,6 +42,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:id="@+id/buttonGrid"
         android:layout_width="match_parent"
@@ -142,16 +148,17 @@
                 android:text="Hear Workload" />
         </LinearLayout>
 
-        <LinearLayout
+        <GridLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:columnCount="@integer/action_buttons_columns">
 
             <Button
                 android:id="@+id/button_start_test"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:backgroundTint="@xml/button_color_selector"
                 android:backgroundTintMode="src_atop"
                 android:onClick="startTest"
@@ -160,14 +167,14 @@
             <Button
                 android:id="@+id/button_stop_test"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:backgroundTint="@xml/button_color_selector"
                 android:backgroundTintMode="src_atop"
                 android:onClick="stopTest"
                 android:text="@string/stopAudio" />
-
-        </LinearLayout>
+        </GridLayout>
 
         <TextView
             android:id="@+id/status_text_view"
@@ -188,4 +195,5 @@
             android:textSize="18sp"
             android:textStyle="bold" />
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_cold_start_latency.xml b/apps/OboeTester/app/src/main/res/layout/activity_cold_start_latency.xml
index 063e02055..5c93fb91f 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_cold_start_latency.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_cold_start_latency.xml
@@ -28,6 +28,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:id="@+id/buttonGrid"
         android:layout_width="match_parent"
@@ -57,10 +63,10 @@
         </RadioGroup>
 
 
-        <LinearLayout
+        <GridLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:columnCount="@integer/main_grid_columns">
 
             <CheckBox
                 android:id="@+id/checkbox_mmap"
@@ -85,7 +91,7 @@
                 android:layout_marginRight="8sp"
                 android:text="EXCLUSIVE"
                 android:checked="true" />
-        </LinearLayout>
+        </GridLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -141,28 +147,30 @@
 
         </LinearLayout>
 
-        <LinearLayout
+        <GridLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:columnCount="@integer/action_buttons_columns">
 
             <Button
                 android:id="@+id/button_start_test"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:backgroundTint="@color/button_tint"
                 android:onClick="onStartColdStartLatencyTest"
-                android:text="Start Test" />
+                android:text="Start" />
             <Button
                 android:id="@+id/button_stop_test"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:backgroundTint="@color/button_tint"
                 android:onClick="onStopColdStartLatencyTest"
-                android:text="Stop Test" />
-        </LinearLayout>
+                android:text="Stop" />
+        </GridLayout>
 
         <ScrollView
             android:id="@+id/text_log_scroller"
@@ -179,4 +187,5 @@
         </ScrollView>
 
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_data_paths.xml b/apps/OboeTester/app/src/main/res/layout/activity_data_paths.xml
index 590c11fb9..ba0d724b6 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_data_paths.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_data_paths.xml
@@ -28,6 +28,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:id="@+id/buttonGrid"
         android:layout_width="match_parent"
@@ -168,4 +174,5 @@
             android:orientation="vertical" />
 
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_error_callback.xml b/apps/OboeTester/app/src/main/res/layout/activity_error_callback.xml
index d6b29603d..5e0c337a3 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_error_callback.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_error_callback.xml
@@ -28,13 +28,24 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin">
+
     <GridLayout
         android:id="@+id/buttonGrid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:columnCount="1"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
         app:layout_constraintTop_toBottomOf="@+id/title_bar">
 
         <Button
@@ -57,4 +68,6 @@
             />
 
     </GridLayout>
+    </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_external_tap_to_tone.xml b/apps/OboeTester/app/src/main/res/layout/activity_external_tap_to_tone.xml
index 7df9c72f1..4a8ca6813 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_external_tap_to_tone.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_external_tap_to_tone.xml
@@ -27,6 +27,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -151,4 +157,5 @@
                 />
         </FrameLayout>
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_extra_tests.xml b/apps/OboeTester/app/src/main/res/layout/activity_extra_tests.xml
index 206b87697..61912bf76 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_extra_tests.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_extra_tests.xml
@@ -28,13 +28,24 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin">
+
     <GridLayout
         android:id="@+id/buttonGrid"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:columnCount="2"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:columnCount="@integer/main_grid_columns"
         app:layout_constraintTop_toBottomOf="@+id/title_bar">
 
         <Button
@@ -142,9 +153,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_columnWeight="1"
+            android:layout_columnSpan="@integer/main_grid_columns"
             android:layout_gravity="fill"
             android:backgroundTint="@color/button_tint"
             android:onClick="onLaunchReverseJniTest"
             android:text="Reverse JNI" />
     </GridLayout>
+    </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_main.xml b/apps/OboeTester/app/src/main/res/layout/activity_main.xml
index 314c89179..d48d8ef4f 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_main.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_main.xml
@@ -29,6 +29,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -47,7 +53,7 @@
             android:id="@+id/buttonGrid"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:columnCount="2" >
+            android:columnCount="@integer/main_grid_columns" >
 
             <Button
                 android:id="@+id/buttonTestOutput"
@@ -263,4 +269,5 @@
             android:ems="10"
             android:text="V?" />
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_rapid_cycle.xml b/apps/OboeTester/app/src/main/res/layout/activity_rapid_cycle.xml
index 1548c8f6b..afd6ae661 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_rapid_cycle.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_rapid_cycle.xml
@@ -28,6 +28,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:id="@+id/buttonGrid"
         android:layout_width="match_parent"
@@ -68,28 +74,30 @@
                 android:text="AAudio" />
         </RadioGroup>
 
-        <LinearLayout
+        <GridLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:columnCount="@integer/action_buttons_columns">
 
             <Button
                 android:id="@+id/button_start_test"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:backgroundTint="@color/button_tint"
                 android:onClick="onStartCycleTest"
                 android:text="Start Test" />
             <Button
                 android:id="@+id/button_stop_test"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:backgroundTint="@color/button_tint"
                 android:onClick="onStopCycleTest"
                 android:text="Stop Test" />
-        </LinearLayout>
+        </GridLayout>
 
         <TextView
             android:id="@+id/text_callback_status"
@@ -101,4 +109,5 @@
             android:text="@string/init_status" />
 
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_reverse_jni.xml b/apps/OboeTester/app/src/main/res/layout/activity_reverse_jni.xml
index 6409874f1..9355849ac 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_reverse_jni.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_reverse_jni.xml
@@ -28,6 +28,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -81,4 +87,5 @@
             android:gravity="bottom"
             android:text="@string/init_status" />
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_routing_crash.xml b/apps/OboeTester/app/src/main/res/layout/activity_routing_crash.xml
index d66eac388..7e89722b5 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_routing_crash.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_routing_crash.xml
@@ -28,6 +28,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:id="@+id/buttonGrid"
         android:layout_width="match_parent"
@@ -64,28 +70,30 @@
         </RadioGroup>
 
 
-        <LinearLayout
+        <GridLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:columnCount="@integer/action_buttons_columns">
 
             <Button
                 android:id="@+id/button_start_test"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:backgroundTint="@color/button_tint"
                 android:onClick="onStartRoutingTest"
                 android:text="Start Test" />
             <Button
                 android:id="@+id/button_stop_test"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:backgroundTint="@color/button_tint"
                 android:onClick="onStopRoutingTest"
                 android:text="Stop Test" />
-        </LinearLayout>
+        </GridLayout>
 
         <TextView
             android:id="@+id/text_callback_status"
@@ -97,4 +105,5 @@
             android:text="@string/init_status" />
 
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_rt_latency.xml b/apps/OboeTester/app/src/main/res/layout/activity_rt_latency.xml
index 33f54dae1..0f0b958b6 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_rt_latency.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_rt_latency.xml
@@ -81,6 +81,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:measureWithLargestChild="true"
             android:orientation="horizontal">
 
             <Button
@@ -89,7 +90,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:onClick="onMeasure"
-                android:text="@string/measure"
+                android:text="@string/test"
                 android:textSize="10sp" />
 
             <Button
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_test_disconnect.xml b/apps/OboeTester/app/src/main/res/layout/activity_test_disconnect.xml
index 3c099cdc8..077420ee8 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_test_disconnect.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_test_disconnect.xml
@@ -27,6 +27,12 @@
 
     </LinearLayout>
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:fillViewport="true">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -73,28 +79,29 @@
                 android:text="Inputs" />
         </LinearLayout>
 
-        <LinearLayout
+        <GridLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:columnCount="@integer/action_buttons_columns">
 
             <Button
                 android:id="@+id/button_fail"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:onClick="onFailTest"
                 android:text="@string/failTest" />
 
             <Button
                 android:id="@+id/button_skip"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
+                android:layout_columnWeight="1"
+                android:layout_gravity="fill"
                 android:onClick="onSkipTest"
                 android:text="@string/skipTest" />
-
-        </LinearLayout>
+        </GridLayout>
 
         <com.mobileer.oboetester.AutomatedTestRunner
             android:id="@+id/auto_test_runner"
@@ -102,4 +109,5 @@
             android:layout_height="match_parent"
             android:orientation="vertical" />
     </LinearLayout>
+    </ScrollView>
 </LinearLayout>
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_test_input.xml b/apps/OboeTester/app/src/main/res/layout/activity_test_input.xml
index ad94a10ec..0340f1550 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_test_input.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_test_input.xml
@@ -31,7 +31,8 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:fillViewport="true"
         tools:context="com.mobileer.oboetester.TestInputActivity"
         >
diff --git a/apps/OboeTester/app/src/main/res/layout/activity_test_output.xml b/apps/OboeTester/app/src/main/res/layout/activity_test_output.xml
index 412281e99..3b9960650 100644
--- a/apps/OboeTester/app/src/main/res/layout/activity_test_output.xml
+++ b/apps/OboeTester/app/src/main/res/layout/activity_test_output.xml
@@ -32,7 +32,8 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         android:fillViewport="true"
         tools:context="com.mobileer.oboetester.TestOutputActivity"
         >
diff --git a/apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml b/apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml
index 31303c097..d499fdd70 100644
--- a/apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml
+++ b/apps/OboeTester/app/src/main/res/layout/merge_audio_common.xml
@@ -31,16 +31,16 @@
         android:gravity="center"
         android:orientation="horizontal" />
 
-    <LinearLayout
+    <GridLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:columnCount="@integer/audio_buttons_columns">
 
         <Button
             android:id="@+id/button_open"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_columnWeight="1"
             android:backgroundTint="@xml/button_color_selector"
             android:backgroundTintMode="src_atop"
             android:onClick="openAudio"
@@ -51,7 +51,7 @@
             android:id="@+id/button_start"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_columnWeight="1"
             android:backgroundTint="@xml/button_color_selector"
             android:backgroundTintMode="src_atop"
             android:onClick="startAudio"
@@ -62,7 +62,7 @@
             android:id="@+id/button_pause"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_columnWeight="1"
             android:backgroundTint="@xml/button_color_selector"
             android:backgroundTintMode="src_atop"
             android:onClick="pauseAudio"
@@ -73,7 +73,7 @@
             android:id="@+id/button_flush"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_columnWeight="1"
             android:backgroundTint="@xml/button_color_selector"
             android:backgroundTintMode="src_atop"
             android:onClick="flushAudio"
@@ -84,7 +84,7 @@
             android:id="@+id/button_stop"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_columnWeight="1"
             android:backgroundTint="@xml/button_color_selector"
             android:backgroundTintMode="src_atop"
             android:onClick="stopAudio"
@@ -95,7 +95,7 @@
             android:id="@+id/button_release"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_columnWeight="1"
             android:backgroundTint="@xml/button_color_selector"
             android:backgroundTintMode="src_atop"
             android:onClick="releaseAudio"
@@ -106,13 +106,13 @@
             android:id="@+id/button_close"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_columnWeight="1"
             android:backgroundTint="@xml/button_color_selector"
             android:backgroundTintMode="src_atop"
             android:onClick="closeAudio"
             android:text="@string/closeAudio"
             android:textSize="12sp" />
-    </LinearLayout>
+    </GridLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/apps/OboeTester/app/src/main/res/values-watch/dimens.xml b/apps/OboeTester/app/src/main/res/values-watch/dimens.xml
new file mode 100644
index 000000000..5a7013c5d
--- /dev/null
+++ b/apps/OboeTester/app/src/main/res/values-watch/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="activity_horizontal_margin">6dp</dimen>
+    <dimen name="activity_vertical_margin">6dp</dimen>
+</resources>
diff --git a/apps/OboeTester/app/src/main/res/values-watch/integers.xml b/apps/OboeTester/app/src/main/res/values-watch/integers.xml
new file mode 100644
index 000000000..50f661f71
--- /dev/null
+++ b/apps/OboeTester/app/src/main/res/values-watch/integers.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="main_grid_columns">1</integer>
+    <integer name="audio_buttons_columns">3</integer>
+    <integer name="action_buttons_columns">1</integer>
+</resources>
diff --git a/apps/OboeTester/app/src/main/res/values/integers.xml b/apps/OboeTester/app/src/main/res/values/integers.xml
new file mode 100644
index 000000000..dd9f9df3b
--- /dev/null
+++ b/apps/OboeTester/app/src/main/res/values/integers.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="main_grid_columns">2</integer>
+    <integer name="audio_buttons_columns">7</integer>
+    <integer name="action_buttons_columns">2</integer>
+</resources>
diff --git a/apps/OboeTester/app/src/main/res/values/strings.xml b/apps/OboeTester/app/src/main/res/values/strings.xml
index 3edbabf57..9ccfcb663 100644
--- a/apps/OboeTester/app/src/main/res/values/strings.xml
+++ b/apps/OboeTester/app/src/main/res/values/strings.xml
@@ -13,7 +13,7 @@
     <string name="closeAudio">Close</string>
     <string name="recordAudio">Record</string>
     <string name="playAudio">Play</string>
-    <string name="measure">Measure</string>
+    <string name="test">Test</string>
     <string name="cancel">Cancel</string>
     <string name="scan">Scan</string>
     <string name="clear">Clear</string>
@@ -280,7 +280,7 @@
     <string name="cpu_affinity">CPUs:</string>
 
     <string name="src_prompt">SRC:</string>
-    <string name="average">Average</string>
+    <string name="average">Avg</string>
     <string name="failTest">Fail</string>
     <string name="skipTest">Skip</string>
     <string name="test_datapath_instructions">Attach peripherals\nVolume up, [START]</string>
diff --git a/apps/OboeTester/app/src/watch/AndroidManifest.xml b/apps/OboeTester/app/src/watch/AndroidManifest.xml
new file mode 100644
index 000000000..9824de042
--- /dev/null
+++ b/apps/OboeTester/app/src/watch/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-feature
+        android:name="android.hardware.type.watch"
+        android:required="true" />
+
+    <application>
+        <meta-data
+            android:name="com.google.android.wearable.standalone"
+            android:value="true" />
+    </application>
+</manifest>