diff --git a/app/build.gradle b/app/build.gradle
index 8f904b94..c8687bce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,6 +15,9 @@ android {
             keyPassword 'inpmiy'
             storeFile file('Integry.jks')
             storePassword 'inpmiy'
+
+            enableV3Signing true
+            enableV4Signing true
         }
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7678624d..7da50e84 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         <activity
             android:name=".MainActivity"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustPan">
+            android:windowSoftInputMode="adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.CLIENTBARCODEACTIVITY" />
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
index abf05859..34475764 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdView.java
@@ -130,6 +130,8 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
         mBindings.setViewmodel(this.mViewModel);
 
         getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        getDialog().setCanceledOnTouchOutside(false);
+
         return mBindings.getRoot();
     }
 
@@ -373,7 +375,14 @@ public class DialogInputLUProdView extends BaseDialogFragment implements DialogI
         this.mViewModel.blockedNumCnf.set(false);
         this.mViewModel.blockedPesoLordo.set(false);
 
-        this.currentNumCnf.set(mDialogInputLUProdDTO.getNumCnf());
+
+        this.mViewModel.setInitialNumCnf(mDialogInputLUProdDTO.getNumCnf());
+        this.mViewModel.setInitialPesoCollo(mDialogInputLUProdDTO.getQtaCnf());
+        this.mViewModel.setInitialPesoNetto(mDialogInputLUProdDTO.getQtaTot());
+
+        this.mViewModel.refreshPesoLordo();
+
+        this.onDataChanged();
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
index 2b7ef57a..beb11faf 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/DialogInputLUProdViewModel.java
@@ -209,6 +209,10 @@ public class DialogInputLUProdViewModel {
         return this;
     }
 
+    public void refreshPesoLordo() {
+        this.internalPesoLordo = this.calcPesoLordo();
+    }
+
     private BigDecimal calcPesoLordo() {
         BigDecimal taraPed = internalTaraPed != null ? internalTaraPed : BigDecimal.ZERO;
         return UtilityBigDecimal.multiply(this.internalNumCnf, this.internalPesoCollo.add(internalTaraCol)).add(taraPed);
diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
index 34954166..776865bc 100644
--- a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
@@ -34,9 +34,10 @@
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:orientation="vertical"
             android:background="@color/full_white">
 
             <androidx.appcompat.widget.Toolbar
@@ -68,13 +69,10 @@
 
 
             <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
-                android:orientation="vertical"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/toolbar">
+                android:orientation="vertical">
 
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -164,7 +162,7 @@
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/input_num_cnf_layout"
                         style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:enabled="@{view.enabledNumCnf}"
@@ -187,7 +185,7 @@
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/input_qta_cnf_layout"
                         style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:enabled="@{view.enabledQtaCnf}"
@@ -211,7 +209,7 @@
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/input_qta_tot_layout"
                         style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:enabled="@{view.enabledQtaTot}"
@@ -244,7 +242,7 @@
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/input_tara_ped_layout"
                         style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:enabled="@{view.enabledTaraPed}"
@@ -269,7 +267,7 @@
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/input_tara_col_layout"
                         style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:enabled="@{view.enabledTaraCol}"
@@ -293,13 +291,12 @@
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/input_peso_lordo_layout"
                         style="@style/TextInputLayout.OutlinePrimary"
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:enabled="@{view.enabledPesoLordo}"
                         android:focusableInTouchMode="false"
-                        android:imeOptions="actionDone"
-                        tools:layout_weight="1">
+                        android:imeOptions="actionDone">
 
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/input_peso_lordo_text"
@@ -359,7 +356,7 @@
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
 
     </androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/dialog_input_lu_prod.xml b/app/src/main/res/layout/dialog_input_lu_prod.xml
index 1b466f1c..05f57e04 100644
--- a/app/src/main/res/layout/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout/dialog_input_lu_prod.xml
@@ -23,9 +23,10 @@
     </data>
 
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
         android:background="@color/full_white">
 
         <androidx.appcompat.widget.Toolbar
@@ -56,14 +57,11 @@
 
 
         <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
             android:layout_marginTop="8dp"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar">
+            android:orientation="vertical">
 
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -153,7 +151,7 @@
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_num_cnf_layout"
                     style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:enabled="@{view.enabledNumCnf}"
                     android:focusableInTouchMode="false"
@@ -176,7 +174,7 @@
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_qta_cnf_layout"
                     style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:enabled="@{view.enabledQtaCnf}"
@@ -200,7 +198,7 @@
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_qta_tot_layout"
                     style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:enabled="@{view.enabledQtaTot}"
@@ -233,7 +231,7 @@
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_tara_ped_layout"
                     style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:enabled="@{view.enabledTaraPed}"
@@ -258,7 +256,7 @@
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_tara_col_layout"
                     style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:enabled="@{view.enabledTaraCol}"
@@ -282,7 +280,7 @@
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/input_peso_lordo_layout"
                     style="@style/TextInputLayout.OutlinePrimary"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:enabled="@{view.enabledPesoLordo}"
@@ -348,6 +346,6 @@
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
index 3d5544e3..061f4ca0 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
@@ -16,22 +16,22 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@drawable/ripple_effect"
         android:orientation="horizontal"
         android:paddingStart="2dp"
-        android:paddingEnd="4dp"
-        android:background="@drawable/ripple_effect">
+        android:paddingEnd="4dp">
 
         <RelativeLayout
             android:id="@+id/ordine_lavorazione_main_list_group_item_container_root"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:background="@color/full_white"
+            android:gravity="center_vertical"
             android:paddingStart="2dp"
             android:paddingTop="8dp"
             android:paddingEnd="8dp"
-            android:paddingBottom="8dp"
-            android:gravity="center_vertical"
-            android:layout_gravity="center_vertical">
+            android:paddingBottom="8dp">
 
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -43,87 +43,82 @@
                 android:src="@drawable/ic_play_circle_filled_24dp"
                 android:tint="@color/blue_700" />
 
-            <RelativeLayout
-                android:layout_width="wrap_content"
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_toEndOf="@id/ordine_state_icon">
+                android:layout_toEndOf="@id/ordine_state_icon"
+                android:orientation="vertical">
 
-                <androidx.appcompat.widget.LinearLayoutCompat
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:layout_height="wrap_content">
 
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/pre_first_row"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            tools:text="Cons 07 nov 2018" />
-
-                    </RelativeLayout>
-
-                    <RelativeLayout
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/pre_first_row"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical">
+                        android:layout_alignParentEnd="true"
+                        tools:text="Cons 07 nov 2018" />
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/right_descrizione"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:textColor="#000"
-                            tools:text="EUROGROUP ITALIA SRL"
-                            android:gravity="center_vertical"
-                            android:ellipsize="end"
-                            android:maxLines="1"/>
+                </RelativeLayout>
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/descrizione"
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_toStartOf="@id/descrizione"
-                            android:ellipsize="end"
-                            android:maxLines="1"
-                            android:textColor="#000"
-                            tools:text="N° 39" />
-                    </RelativeLayout>
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/right_descrizione"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:textColor="#000"
+                        tools:text="EUROGROUP ITALIA SRL" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/descrizione"
+                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentStart="true"
+                        android:layout_toStartOf="@id/descrizione"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textColor="#000"
+                        tools:text="N° 39" />
+                </RelativeLayout>
 
 
-                    <RelativeLayout
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/right_sub_descrizione"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentEnd="true"
+                        tools:text="Cod Jcom" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/sub_descrizione"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
+                        android:layout_height="wrap_content"
+                        android:layout_toStartOf="@id/right_sub_descrizione"
+                        android:paddingEnd="6dp"
+                        tools:text="TextView" />
+                </RelativeLayout>
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/right_sub_descrizione"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            tools:text="Cod Jcom" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/sub_descrizione"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_toStartOf="@id/right_sub_descrizione"
-                            android:paddingEnd="6dp"
-                            tools:text="TextView" />
-                    </RelativeLayout>
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-            </RelativeLayout>
         </RelativeLayout>
 
     </androidx.appcompat.widget.LinearLayoutCompat>