diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
index e136b531..0aa0ccaa 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
@@ -125,8 +125,6 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
         mBindings.bottomSheetLuContent.setListener(this);
         mBottomSheetFragmentLUContentViewModel.setListener(this);
 
-        this.addExtraItemsEnabled.set(SettingsManager.iDB().isFlagCanAddExtraItemSpedizione());
-
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
@@ -386,6 +384,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUCreated(MtbColt mtbColt) {
+        this.addExtraItemsEnabled.set(SettingsManager.iDB().isFlagCanAddExtraItemSpedizione());
         noLUPresent.set(false);
         FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT);
 
@@ -394,7 +393,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
 
     @Override
     public void onLUClosed() {
-
+        this.addExtraItemsEnabled.set(false);
         noLUPresent.set(true);
         this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java
index 20352711..0ec1dccb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java
@@ -800,6 +800,10 @@ public class SpedizioneViewModel {
         BigDecimal qtaColDaPrelevare = null;
         BigDecimal qtaCnfDaPrelevare = null;
 
+        BigDecimal initialNumCnf = null;
+        BigDecimal initialQtaCnf = null;
+        BigDecimal initialQtaTot = null;
+
         String partitaMag = null;
         Date dataScad = null;
 
@@ -829,11 +833,17 @@ public class SpedizioneViewModel {
                 partitaMag = manualPickDTO.getMtbPartitaMag().getPartitaMag();
                 dataScad = manualPickDTO.getMtbPartitaMag().getDataScadD();
             }
+        } else {
+            initialNumCnf = BigDecimal.ONE;
+            initialQtaCnf = mtbAart.getQtaCnf();
+            initialQtaTot = UtilityBigDecimal.multiply(initialNumCnf, initialQtaCnf);
         }
 
         this.sendOnItemDispatched(
                 pickingObjectDTO,
-                null, null, null,
+                initialNumCnf,
+                initialQtaCnf,
+                initialQtaTot,
                 null,
                 null,
                 null,
@@ -1034,7 +1044,7 @@ public class SpedizioneViewModel {
         this.sendOnLoadingStarted();
 
         final MtbColr mtbColr = new MtbColr()
-                .setCodMart(pickingObjectDTO.getSitArtOrdDTO().getCodMart())
+                .setCodMart(pickingObjectDTO.getMtbAart().getCodMart())
                 .setPartitaMag(partitaMag)
                 .setDataScadPartita(dataScad)
                 .setQtaCol(qtaTot)
diff --git a/app/src/main/res/layout/activity_spedizione.xml b/app/src/main/res/layout/activity_spedizione.xml
index 8459aff9..4bd2e7ba 100644
--- a/app/src/main/res/layout/activity_spedizione.xml
+++ b/app/src/main/res/layout/activity_spedizione.xml
@@ -76,7 +76,8 @@
                                 android:background="@drawable/ripple_effect"
                                 app:singleClick="@{() -> spedizioneView.startManualSearch()}"
                                 android:src="@drawable/ic_black_barcode"
-                                android:tint="@color/colorPrimaryGray" />
+                                android:tint="@color/colorPrimaryGray"
+                                android:visibility="@{BuildConfig.DEBUG ? View.VISIBLE : View.GONE}" />
 
 
                             <androidx.appcompat.widget.AppCompatImageButton
@@ -87,7 +88,8 @@
                                 android:background="@drawable/ripple_effect"
                                 app:singleClick="@{() -> spedizioneView.startCameraBarcode()}"
                                 android:src="@drawable/ic_photo_camera_black_24dp"
-                                android:tint="@color/colorPrimaryGray" />
+                                android:tint="@color/colorPrimaryGray"
+                                android:visibility="@{BuildConfig.DEBUG ? View.VISIBLE : View.GONE}" />
 
                         </androidx.appcompat.widget.Toolbar>
 
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
index b7dcace5..73e0bd5a 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
@@ -38,24 +38,22 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@android:color/white">
+                    android:background="@android:color/white"
+                    android:orientation="vertical">
 
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/title_layout"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="66dp"
                         android:background="@color/colorAccent"
                         android:paddingStart="16dp"
                         android:paddingTop="8dp"
                         android:paddingEnd="8dp"
-                        android:paddingBottom="8dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent">
+                        android:paddingBottom="8dp">
 
 
                         <View
@@ -128,271 +126,270 @@
                             app:strokeColor="@color/red_600" />
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
-                    <LinearLayout
-                        android:id="@+id/lu_detail_layout"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/title_layout">
 
-                        <TextView
-                            style="@style/AppTheme.NewMaterial.Text"
-                            android:layout_width="wrap_content"
+                    <androidx.core.widget.NestedScrollView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <androidx.appcompat.widget.LinearLayoutCompat
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
-                            android:layout_marginTop="10dp"
-                            android:text="@string/details_text"
-                            android:textAllCaps="true"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
+                            android:orientation="vertical">
 
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:padding="15dp">
+                            android:orientation="vertical">
 
-                            <androidx.constraintlayout.widget.ConstraintLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <androidx.constraintlayout.widget.Guideline
-                                    android:id="@+id/guideline1"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical"
-                                    app:layout_constraintGuide_percent="0.40" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="8dp"
-                                    android:text="@string/date_text"
-                                    android:textColor="@android:color/black"
-                                    app:layout_constraintEnd_toStartOf="@+id/guideline1"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:id="@+id/articoli_in_collo_details_date"
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="0dp"
-                                    android:layout_height="0dp"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintEnd_toEndOf="parent"
-                                    app:layout_constraintStart_toStartOf="@+id/guideline1"
-                                    app:layout_constraintTop_toTopOf="parent"
-                                    tools:text="TextView" />
-
-                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-                            <androidx.constraintlayout.widget.ConstraintLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <androidx.constraintlayout.widget.Guideline
-                                    android:id="@+id/guideline2"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical"
-                                    app:layout_constraintGuide_percent="0.40" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:id="@+id/articoli_in_collo_details_posizione"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="8dp"
-                                    android:text="@string/position_text"
-                                    android:textColor="@android:color/black"
-                                    app:layout_constraintEnd_toStartOf="@+id/guideline2"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="0dp"
-                                    android:layout_height="0dp"
-                                    android:text="@{viewModel.mtbColt.posizione}"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintEnd_toEndOf="parent"
-                                    app:layout_constraintStart_toStartOf="@+id/guideline2"
-                                    app:layout_constraintTop_toTopOf="parent"
-                                    tools:text="TextView" />
-
-                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-                            <androidx.constraintlayout.widget.ConstraintLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <androidx.constraintlayout.widget.Guideline
-                                    android:id="@+id/guideline3"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical"
-                                    app:layout_constraintGuide_percent="0.40" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="8dp"
-                                    android:text="@string/prepared_by_text"
-                                    android:textColor="@android:color/black"
-                                    app:layout_constraintEnd_toStartOf="@+id/guideline3"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="0dp"
-                                    android:layout_height="0dp"
-                                    android:text="@{viewModel.mtbColt.preparatoDa}"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintEnd_toEndOf="parent"
-                                    app:layout_constraintStart_toStartOf="@+id/guideline3"
-                                    app:layout_constraintTop_toTopOf="parent"
-                                    tools:text="TextView" />
-
-                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-                            <androidx.constraintlayout.widget.ConstraintLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content">
-
-                                <androidx.constraintlayout.widget.Guideline
-                                    android:id="@+id/guideline4"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="vertical"
-                                    app:layout_constraintGuide_percent="0.40" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginStart="8dp"
-                                    android:text="@string/customer"
-                                    android:textColor="@android:color/black"
-                                    app:layout_constraintEnd_toStartOf="@+id/guideline4"
-                                    app:layout_constraintStart_toStartOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:layout_width="0dp"
-                                    android:layout_height="0dp"
-                                    android:text="@{viewModel.mtbColt.ragSocCliente}"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintEnd_toEndOf="parent"
-                                    app:layout_constraintStart_toStartOf="@+id/guideline4"
-                                    app:layout_constraintTop_toTopOf="parent"
-                                    tools:text="TextView" />
-
-                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                        </LinearLayout>
-
-
-                    </LinearLayout>
-
-
-                    <View
-                        android:id="@+id/separator_view"
-                        android:layout_width="0dp"
-                        android:layout_height="1dp"
-                        android:layout_marginTop="24dp"
-                        android:background="#ededed"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/lu_detail_layout" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/separator_view">
-
-                        <TextView
-                            style="@style/AppTheme.NewMaterial.Text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="10dp"
-                            android:layout_marginTop="10dp"
-                            android:text="@string/already_read_articles"
-                            android:textAllCaps="true"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold" />
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:paddingTop="14dp">
+                            <TextView
+                                style="@style/AppTheme.NewMaterial.Text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="10dp"
+                                android:layout_marginTop="10dp"
+                                android:text="@string/details_text"
+                                android:textAllCaps="true"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
 
                             <LinearLayout
                                 android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_marginTop="16dp"
-                                android:layout_marginBottom="16dp"
-                                android:gravity="center"
+                                android:layout_height="wrap_content"
                                 android:orientation="vertical"
-                                android:padding="16dp"
-                                android:visibility="@{viewModel.mtbColt == null || viewModel.mtbColt.mtbColr.size() == 0 ? View.VISIBLE : View.GONE}">
+                                android:padding="15dp">
 
-                                <androidx.appcompat.widget.AppCompatImageView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:src="@drawable/ic_info_78dp"
-                                    android:tint="@color/empty_view_gray" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text"
+                                <androidx.constraintlayout.widget.ConstraintLayout
                                     android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="center"
-                                    android:text="@string/empty_rows_in_mtbcolt"
-                                    android:textColor="@color/empty_view_gray"
-                                    android:textSize="20sp" />
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline1"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/date_text"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline1"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:id="@+id/articoli_in_collo_details_date"
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline1"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline2"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:id="@+id/articoli_in_collo_details_posizione"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/position_text"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.posizione}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline2"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline3"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/prepared_by_text"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline3"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.preparatoDa}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline3"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                                <androidx.constraintlayout.widget.ConstraintLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content">
+
+                                    <androidx.constraintlayout.widget.Guideline
+                                        android:id="@+id/guideline4"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:orientation="vertical"
+                                        app:layout_constraintGuide_percent="0.40" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginStart="8dp"
+                                        android:text="@string/customer"
+                                        android:textColor="@android:color/black"
+                                        app:layout_constraintEnd_toStartOf="@+id/guideline4"
+                                        app:layout_constraintStart_toStartOf="parent"
+                                        app:layout_constraintTop_toTopOf="parent" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:layout_width="0dp"
+                                        android:layout_height="0dp"
+                                        android:text="@{viewModel.mtbColt.ragSocCliente}"
+                                        app:layout_constraintBottom_toBottomOf="parent"
+                                        app:layout_constraintEnd_toEndOf="parent"
+                                        app:layout_constraintStart_toStartOf="@+id/guideline4"
+                                        app:layout_constraintTop_toTopOf="parent"
+                                        tools:text="TextView" />
+
+                                </androidx.constraintlayout.widget.ConstraintLayout>
+
 
                             </LinearLayout>
 
 
-                            <com.linearlistview.LinearListView
-                                android:id="@+id/linear_listview"
+                        </LinearLayout>
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:layout_marginTop="24dp"
+                            android:background="#ededed" />
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <TextView
+                                style="@style/AppTheme.NewMaterial.Text"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="10dp"
+                                android:layout_marginTop="10dp"
+                                android:text="@string/already_read_articles"
+                                android:textAllCaps="true"
+                                android:textColor="@android:color/black"
+                                android:textStyle="bold" />
+
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:clickable="true"
-                                android:focusable="true"
                                 android:orientation="vertical"
-                                app:dividerThickness="0.5dp" />
+                                android:paddingTop="14dp">
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginTop="16dp"
+                                    android:layout_marginBottom="16dp"
+                                    android:gravity="center"
+                                    android:orientation="vertical"
+                                    android:padding="16dp"
+                                    android:visibility="@{viewModel.mtbColt == null || viewModel.mtbColt.mtbColr.size() == 0 ? View.VISIBLE : View.GONE}">
+
+                                    <androidx.appcompat.widget.AppCompatImageView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:src="@drawable/ic_info_78dp"
+                                        android:tint="@color/empty_view_gray" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:gravity="center"
+                                        android:text="@string/empty_rows_in_mtbcolt"
+                                        android:textColor="@color/empty_view_gray"
+                                        android:textSize="20sp" />
+
+                                </LinearLayout>
+
+
+                                <com.linearlistview.LinearListView
+                                    android:id="@+id/linear_listview"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:clickable="true"
+                                    android:focusable="true"
+                                    android:orientation="vertical"
+                                    app:dividerThickness="0.5dp" />
+
+
+                            </LinearLayout>
 
 
                         </LinearLayout>
+                        </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                    </LinearLayout>
+                    </androidx.core.widget.NestedScrollView>
 
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
             </androidx.cardview.widget.CardView>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-
-
         <View
-            android:visibility="gone"
             android:id="@+id/bottom_sheet__mtb_colr_edit__background"
-            android:background="#99000000"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:background="#99000000"
+            android:visibility="gone" />
 
         <it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView
             android:id="@+id/bottom_sheet__mtb_colr_edit"
@@ -400,6 +397,6 @@
             android:layout_height="wrap_content"
             app:behavior_hideable="true"
             app:behavior_peekHeight="0dp"
-            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior"/>
+            app:layout_behavior=".view.bottom_sheet__base.AutoCloseBottomSheetBehavior" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file