diff --git a/app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/FindBarcodelessAbstractProduct.kt b/app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/FindBarcodelessAbstractProduct.kt
index 32ab155..ef5da60 100644
--- a/app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/FindBarcodelessAbstractProduct.kt
+++ b/app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/FindBarcodelessAbstractProduct.kt
@@ -18,7 +18,7 @@ class FindBarcodelessAbstractProduct() : AppCompatActivity() {
         binding = ActivityFindBarcodelessAbstractProductBinding.inflate(layoutInflater)
 
         val ft = supportFragmentManager.beginTransaction()
-        val fragment = StorageFragment.newInstance("barcodeless", arrayOf("", "             "))
+        val fragment = StorageFragment.newInstance("barcodeless", arrayOf("", "             ", " "))
         ft.replace(R.id.content, fragment)
         ft.commit()
 
diff --git a/app/src/main/java/org/foxarmy/barcodescannerforemployees/database/AbstractProductDAO.kt b/app/src/main/java/org/foxarmy/barcodescannerforemployees/database/AbstractProductDAO.kt
index a1b75d0..8cfd903 100644
--- a/app/src/main/java/org/foxarmy/barcodescannerforemployees/database/AbstractProductDAO.kt
+++ b/app/src/main/java/org/foxarmy/barcodescannerforemployees/database/AbstractProductDAO.kt
@@ -308,7 +308,7 @@ class AbstractProductDAO(private val dbHelper: DBStorageController) {
             }
 
             "barcodeless" -> {
-                selection = "${AbstractProductContract.AbstractProductEntry.BARCODE} = ? OR ${AbstractProductContract.AbstractProductEntry.BARCODE} = ?"
+                selection = "${AbstractProductContract.AbstractProductEntry.BARCODE} = ? OR ${AbstractProductContract.AbstractProductEntry.BARCODE} = ? OR ${AbstractProductContract.AbstractProductEntry.BARCODE} = ?"
                 selectionArgs = filter
             }
         }
diff --git a/app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/StorageFragment.kt b/app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/StorageFragment.kt
index 071359d..dacf52b 100644
--- a/app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/StorageFragment.kt
+++ b/app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/StorageFragment.kt
@@ -194,7 +194,7 @@ class StorageFragment : Fragment() {
             val args = Bundle()
             args.putString("filterBy", filterBy)
             args.putStringArray("filter", filter)
-            fragment.setArguments(args)
+            fragment.arguments = args
 
             return fragment
         }
diff --git a/app/src/main/res/layout/activity_find_barcodeless_abstract_product.xml b/app/src/main/res/layout/activity_find_barcodeless_abstract_product.xml
index ad84073..9f7eb20 100644
--- a/app/src/main/res/layout/activity_find_barcodeless_abstract_product.xml
+++ b/app/src/main/res/layout/activity_find_barcodeless_abstract_product.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
+<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"
-        tools:context=".fragments.ShelfFragment"
-        android:id="@+id/content">
+        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">
 
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
+    <androidx.core.widget.NestedScrollView
+            android:layout_height="0dp"
+            tools:context=".fragments.ShelfFragment"
+            android:id="@+id/content" android:layout_width="0dp" app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent">
+
+    </androidx.core.widget.NestedScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b7f2426..1fb4140 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -39,12 +39,13 @@
             <androidx.viewpager.widget.ViewPager
                     android:id="@+id/tab_viewpager"
                     android:layout_width="0dp"
-                    android:layout_height="777dp"
+                    android:layout_height="0dp"
                     app:layout_behavior="@string/appbar_scrolling_view_behavior" android:layout_gravity="bottom"
                     android:layout_marginTop="2dp"
                     app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
                     app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="6dp"
-                    app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="6dp"/>
+                    app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="6dp"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/new_element_fab"
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/content_storage.xml b/app/src/main/res/layout/content_storage.xml
deleted file mode 100644
index 3e4fe9c..0000000
--- a/app/src/main/res/layout/content_storage.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" android:id="@+id/storageLayout">
-
-    <fragment
-            android:id="@+id/nav_host_fragment_content_storage"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:defaultNavHost="true"
-            app:navGraph="@navigation/nav_graph_main"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_shelf.xml b/app/src/main/res/layout/fragment_shelf.xml
index 83a3c85..630c76b 100644
--- a/app/src/main/res/layout/fragment_shelf.xml
+++ b/app/src/main/res/layout/fragment_shelf.xml
@@ -26,7 +26,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" app:layout_constraintTop_toBottomOf="@+id/spinner"
                 android:layout_marginTop="32dp" app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" android:id="@+id/scrollView">
+                app:layout_constraintEnd_toEndOf="parent" android:id="@+id/scrollView"
+                app:layout_constraintBottom_toBottomOf="parent">
             <androidx.gridlayout.widget.GridLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" android:id="@+id/contentGridLayout" app:columnCount="2"
diff --git a/app/src/main/res/layout/fragment_storage.xml b/app/src/main/res/layout/fragment_storage.xml
index 188f56a..da9dd93 100644
--- a/app/src/main/res/layout/fragment_storage.xml
+++ b/app/src/main/res/layout/fragment_storage.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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"
-             android:id="@+id/fragment_storage"
-             tools:context=".fragments.StorageFragment">
-    <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+
+<androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
         <TextView
                 android:text="@string/sort_by"
@@ -16,7 +12,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 android:textAlignment="center"
-                app:layout_constraintBottom_toBottomOf="@+id/scrollView2"/>
+                app:layout_constraintBottom_toTopOf="@+id/scrollView2"/>
         <Spinner
                 android:layout_width="0dp"
                 android:layout_height="32dp" android:id="@+id/spinner"
@@ -34,15 +30,16 @@
                 android:layout_marginEnd="10dp" app:layout_constraintTop_toTopOf="parent"/>
         <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:id="@+id/scrollView2"
-                app:layout_constraintTop_toBottomOf="@+id/dropFiltersButton">
+                app:layout_constraintTop_toBottomOf="@+id/dropFiltersButton"
+                android:layout_marginTop="4dp" app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">
             <androidx.gridlayout.widget.GridLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" android:id="@+id/contentGridLayout" app:columnCount="2"
+                    android:layout_height="match_parent" android:id="@+id/contentGridLayout" app:columnCount="2"
                     app:rowCount="100" android:nestedScrollingEnabled="true">
 
             </androidx.gridlayout.widget.GridLayout>
         </ScrollView>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
\ No newline at end of file