diff --git a/examples/tv-app/android/App/.idea/gradle.xml b/examples/tv-app/android/App/.idea/gradle.xml
index 021d59beb6e1eb..c55cb656581f0b 100644
--- a/examples/tv-app/android/App/.idea/gradle.xml
+++ b/examples/tv-app/android/App/.idea/gradle.xml
@@ -14,7 +14,6 @@
             <option value="$PROJECT_DIR$/platform-app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/examples/tv-app/android/App/platform-app/src/main/res/layout/activity_main.xml b/examples/tv-app/android/App/platform-app/src/main/res/layout/activity_main.xml
index 32ba7adc3e1af2..c7727d9f33ebb3 100644
--- a/examples/tv-app/android/App/platform-app/src/main/res/layout/activity_main.xml
+++ b/examples/tv-app/android/App/platform-app/src/main/res/layout/activity_main.xml
@@ -6,30 +6,38 @@
     android:layout_height="match_parent"
     tools:context="com.matter.tv.server.MainActivity">
 
-    <androidx.fragment.app.FragmentContainerView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/fragment_container_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    </androidx.fragment.app.FragmentContainerView>
-
     <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/relativeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:gravity="bottom"
         android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="parent">
+
+        <ScrollView
+            android:id="@+id/scrollView2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_above="@+id/bottom_navigation">
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/fragment_container_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:name="com.matter.tv.server.fragments.QrCodeFragment"
+                tools:layout="@layout/fragment_qr_code" />
+        </ScrollView>
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
-            android:gravity="bottom"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom= "true"
-            app:menu="@layout/bottom_navigation_menu" />
+            android:layout_alignParentBottom="true"
+            android:gravity="bottom"
+            app:menu="@menu/bottom_navigation_menu" />
 
     </RelativeLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/tv-app/android/App/platform-app/src/main/res/layout/fragment_qr_code.xml b/examples/tv-app/android/App/platform-app/src/main/res/layout/fragment_qr_code.xml
index 12ef37602374e6..33ea01bbade8c8 100644
--- a/examples/tv-app/android/App/platform-app/src/main/res/layout/fragment_qr_code.xml
+++ b/examples/tv-app/android/App/platform-app/src/main/res/layout/fragment_qr_code.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".fragments.QrCodeFragment">
 
@@ -10,9 +10,10 @@
         android:id="@+id/qrCodeTxt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="20dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginTop="20dp" />
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
         android:id="@+id/qrCodeImg"
@@ -44,7 +45,7 @@
 
     <Button
         android:id="@+id/OnOffBtn"
-        android:text="OnOff"
+        android:text="On / Off"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@+id/resetBtn"
@@ -57,9 +58,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@+id/OnOffBtn"
-        android:layout_marginTop="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_margin="20dp"
         android:maxHeight="2dp"
         android:minHeight="2dp"
         android:max="100"
         />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/tv-app/android/App/platform-app/src/main/res/layout/bottom_navigation_menu.xml b/examples/tv-app/android/App/platform-app/src/main/res/menu/bottom_navigation_menu.xml
similarity index 100%
rename from examples/tv-app/android/App/platform-app/src/main/res/layout/bottom_navigation_menu.xml
rename to examples/tv-app/android/App/platform-app/src/main/res/menu/bottom_navigation_menu.xml