diff --git a/androidHyperskillApp/src/main/res/layout/fragment_stage_step_wrapper.xml b/androidHyperskillApp/src/main/res/layout/fragment_stage_step_wrapper.xml
index d8a6b9cb08..5ae1f7b733 100644
--- a/androidHyperskillApp/src/main/res/layout/fragment_stage_step_wrapper.xml
+++ b/androidHyperskillApp/src/main/res/layout/fragment_stage_step_wrapper.xml
@@ -12,12 +12,13 @@
         layout="@layout/view_stage_implementation_appbar" />
 
     <FrameLayout
+        android:id="@+id/stepPracticeContainer"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:fillViewport="true"
         android:scrollbars="vertical"
         app:layout_constraintTop_toBottomOf="@+id/stageImplementationAppBar"
-        app:layout_constraintBottom_toTopOf="@+id/stepQuizFillBlanksOptionsRecycler">
+        app:layout_constraintBottom_toTopOf="@+id/stepQuizFillBlanksOptionsContainer">
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/stagePracticeContainer"
diff --git a/androidHyperskillApp/src/main/res/layout/fragment_step_practice.xml b/androidHyperskillApp/src/main/res/layout/fragment_step_practice.xml
index 4625f2ec0f..db00ca8fa9 100644
--- a/androidHyperskillApp/src/main/res/layout/fragment_step_practice.xml
+++ b/androidHyperskillApp/src/main/res/layout/fragment_step_practice.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <include
@@ -44,6 +45,8 @@
     </androidx.core.widget.NestedScrollView>
 
     <include
-        layout="@layout/layout_step_quiz_fill_blanks_options"/>
+        layout="@layout/layout_step_quiz_fill_blanks_options"
+        android:visibility="gone"
+        tools:visibility="visible"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/androidHyperskillApp/src/main/res/layout/layout_step_quiz_code_keyboard_extension.xml b/androidHyperskillApp/src/main/res/layout/layout_step_quiz_code_keyboard_extension.xml
index b0d6cefd25..0e2c341453 100644
--- a/androidHyperskillApp/src/main/res/layout/layout_step_quiz_code_keyboard_extension.xml
+++ b/androidHyperskillApp/src/main/res/layout/layout_step_quiz_code_keyboard_extension.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/stepQuizCodeKeyboardExtensionRecycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="bottom" />
\ No newline at end of file
+    app:layout_constraintBottom_toBottomOf="parent"/>
\ No newline at end of file