From 987e8da04fddb25b8aec8161b160da886766c640 Mon Sep 17 00:00:00 2001
From: Igor I <ivanov.i@istt.kz>
Date: Fri, 2 Aug 2024 20:09:01 +0500
Subject: [PATCH] =?UTF-8?q?+=D0=9F=D0=BE=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |    4 +-
 .../kz/istt/locust/LocustHealthActivity.java  |   58 +-
 .../main/res/drawable/spinner_background.xml  |   22 +
 .../layout-land/activity_locust_health.xml    |   28 +-
 .../layout-large/activity_locust_health.xml   | 1404 +++++++++++------
 .../res/layout/activity_locust_health.xml     |    2 -
 app/src/main/res/values/dimens.xml            |    3 +
 app/src/main/res/values/styles.xml            |   10 +
 8 files changed, 1050 insertions(+), 481 deletions(-)
 create mode 100644 app/src/main/res/drawable/spinner_background.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 2cc1613..9b3f235 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-08-02T01:17:10.757633800Z">
+        <DropdownSelection timestamp="2024-08-02T15:07:00.024875400Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\igor\.android\avd\Pixel_Tablet_API_34.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_Tablet_API_33.avd" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
index a006378..a788254 100644
--- a/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
+++ b/app/src/main/java/kz/istt/locust/LocustHealthActivity.java
@@ -1394,9 +1394,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 					llRiskHouseInformed.setVisibility(View.VISIBLE);
 				}else{
 					edtRiskHouseDistance.setText("");
-					((dbfields.AutoCompleteTextViewDB)spiRiskHouseBufferZones).setValue(null);
-					((dbfields.AutoCompleteTextViewDB)spiRiskHouseImpact).setValue(null);
-					((dbfields.AutoCompleteTextViewDB)spiRiskHouseInformed).setValue(null);
+					((selectDB)spiRiskHouseBufferZones).setValue(null);
+					((selectDB)spiRiskHouseImpact).setValue(null);
+					((selectDB)spiRiskHouseInformed).setValue(null);
 					llRiskHouseDistance.setVisibility(View.GONE);
 					llRiskHouseBufferZones.setVisibility(View.GONE);
 					llRiskHouseImpact.setVisibility(View.GONE);
@@ -1455,8 +1455,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 					llRiskWaterImpact.setVisibility(View.VISIBLE);
 				}else{
 					edtRiskWaterDistance.setText("");
-					((dbfields.AutoCompleteTextViewDB)spiRiskWaterBufferZones).setValue(null);
-					((dbfields.AutoCompleteTextViewDB)spiRiskWaterImpact).setValue(null);
+					((selectDB)spiRiskWaterBufferZones).setValue(null);
+					((selectDB)spiRiskWaterImpact).setValue(null);
 					llRiskWaterDistance.setVisibility(View.GONE);
 					llRiskWaterBufferZones.setVisibility(View.GONE);
 					llRiskWaterImpact.setVisibility(View.GONE);
@@ -1510,9 +1510,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 					llRiskApiaryImpact.setVisibility(View.VISIBLE);
 				}else{
 					edtRiskApiaryDistance.setText("");
-					((dbfields.AutoCompleteTextViewDB)spiRiskApiaryInformed).setValue(null);
+					((selectDB)spiRiskApiaryInformed).setValue(null);
 					edtRiskApiaryMeasure.setText("");
-					((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalInform).setValue(null);
+					((selectDB)spiRiskAgriculturalInform).setValue(null);
 					llRiskApiaryDistance.setVisibility(View.GONE);
 					llRiskApiaryInformed.setVisibility(View.GONE);
 					llRiskApiaryMeasure.setVisibility(View.GONE);
@@ -1563,8 +1563,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 				}else{
 					edtRiskAgriculturalName.setText("");
 					edtRiskAgriculturalPhase.setText("");
-					((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalToxic).setValue(null);
-					((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalInform).setValue(null);
+					((selectDB)spiRiskAgriculturalToxic).setValue(null);
+					((selectDB)spiRiskAgriculturalInform).setValue(null);
 					llRiskAgriculturalName.setVisibility(View.GONE);
 					llRiskAgriculturalPhase.setVisibility(View.GONE);
 					llRiskAgriculturalToxic.setVisibility(View.GONE);
@@ -1624,9 +1624,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 					llRiskSilkTreesImpact.setVisibility(View.VISIBLE);
 				}else{
 					edtRiskSilkDistance.setText("");
-					((dbfields.AutoCompleteTextViewDB)spiRiskSilkInform).setValue(null);
+					((selectDB)spiRiskSilkInform).setValue(null);
 					edtRiskSilkTreesMeasure.setText("");
-					((dbfields.AutoCompleteTextViewDB)spiRiskSilkTreesImpact).setValue(null);
+					((selectDB)spiRiskSilkTreesImpact).setValue(null);
 					llRiskSilkDistance.setVisibility(View.GONE);
 					llRiskSilkInform.setVisibility(View.GONE);
 					llRiskSilkTreesMeasure.setVisibility(View.GONE);
@@ -1670,7 +1670,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 				if(((selectDB)spiRiskPastures).getValue() != null && ((selectDB)spiRiskPastures).getValue().equals("1")) {
 					llRiskPasturesInform.setVisibility(View.VISIBLE);
 				}else{
-					((dbfields.AutoCompleteTextViewDB)spiRiskPasturesInform).setValue(null);
+					((selectDB)spiRiskPasturesInform).setValue(null);
 					llRiskPasturesInform.setVisibility(View.GONE);
 				}
 			}
@@ -1706,8 +1706,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 				}else{
 					edtRiskParkType.setText("");
 					edtRiskParkDistance.setText("");
-					((dbfields.AutoCompleteTextViewDB)spiRiskParkBufferZones).setValue(null);
-					((dbfields.AutoCompleteTextViewDB)spiRiskParkImpact).setValue(null);
+					((selectDB)spiRiskParkBufferZones).setValue(null);
+					((selectDB)spiRiskParkImpact).setValue(null);
 
 					llRiskParkType.setVisibility(View.GONE);
 					llRiskParkDistance.setVisibility(View.GONE);
@@ -3241,9 +3241,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 			llRiskHouseInformed.setVisibility(View.VISIBLE);
 		}else{
 			edtRiskHouseDistance.setText("");
-			((dbfields.AutoCompleteTextViewDB)spiRiskHouseBufferZones).setValue(null);
-			((dbfields.AutoCompleteTextViewDB)spiRiskHouseImpact).setValue(null);
-			((dbfields.AutoCompleteTextViewDB)spiRiskHouseInformed).setValue(null);
+			((selectDB)spiRiskHouseBufferZones).setValue(null);
+			((selectDB)spiRiskHouseImpact).setValue(null);
+			((selectDB)spiRiskHouseInformed).setValue(null);
 			llRiskHouseDistance.setVisibility(View.GONE);
 			llRiskHouseBufferZones.setVisibility(View.GONE);
 			llRiskHouseImpact.setVisibility(View.GONE);
@@ -3261,8 +3261,10 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 			llRiskWaterImpact.setVisibility(View.VISIBLE);
 		}else{
 			edtRiskWaterDistance.setText("");
-			((dbfields.AutoCompleteTextViewDB)spiRiskWaterBufferZones).setValue(null);
-			((dbfields.AutoCompleteTextViewDB)spiRiskWaterImpact).setValue(null);
+
+			((fieldDB)spiRiskWaterBufferZones).setValue(null);
+			((fieldDB)spiRiskWaterImpact).setValue(null);
+
 			llRiskWaterDistance.setVisibility(View.GONE);
 			llRiskWaterBufferZones.setVisibility(View.GONE);
 			llRiskWaterImpact.setVisibility(View.GONE);
@@ -3281,9 +3283,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 			llRiskApiaryImpact.setVisibility(View.VISIBLE);
 		}else{
 			edtRiskApiaryDistance.setText("");
-			((dbfields.AutoCompleteTextViewDB)spiRiskApiaryInformed).setValue(null);
+			((selectDB)spiRiskApiaryInformed).setValue(null);
 			edtRiskApiaryMeasure.setText("");
-			((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalInform).setValue(null);
+			((selectDB)spiRiskAgriculturalInform).setValue(null);
 			llRiskApiaryDistance.setVisibility(View.GONE);
 			llRiskApiaryInformed.setVisibility(View.GONE);
 			llRiskApiaryMeasure.setVisibility(View.GONE);
@@ -3304,8 +3306,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		}else{
 			edtRiskAgriculturalName.setText("");
 			edtRiskAgriculturalPhase.setText("");
-			((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalToxic).setValue(null);
-			((dbfields.AutoCompleteTextViewDB)spiRiskAgriculturalInform).setValue(null);
+			((fieldDB)spiRiskAgriculturalToxic).setValue(null);
+			((fieldDB)spiRiskAgriculturalInform).setValue(null);
 			llRiskAgriculturalName.setVisibility(View.GONE);
 			llRiskAgriculturalPhase.setVisibility(View.GONE);
 			llRiskAgriculturalToxic.setVisibility(View.GONE);
@@ -3325,9 +3327,9 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 			llRiskSilkTreesImpact.setVisibility(View.VISIBLE);
 		}else{
 			edtRiskSilkDistance.setText("");
-			((dbfields.AutoCompleteTextViewDB)spiRiskSilkInform).setValue(null);
+			((fieldDB)spiRiskSilkInform).setValue(null);
 			edtRiskSilkTreesMeasure.setText("");
-			((dbfields.AutoCompleteTextViewDB)spiRiskSilkTreesImpact).setValue(null);
+			((fieldDB)spiRiskSilkTreesImpact).setValue(null);
 			llRiskSilkDistance.setVisibility(View.GONE);
 			llRiskSilkInform.setVisibility(View.GONE);
 			llRiskSilkTreesMeasure.setVisibility(View.GONE);
@@ -3340,7 +3342,7 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		if(value != null && value.equals("1")) {
 			llRiskPasturesInform.setVisibility(View.VISIBLE);
 		}else{
-			((dbfields.AutoCompleteTextViewDB)spiRiskPasturesInform).setValue(null);
+			((fieldDB)spiRiskPasturesInform).setValue(null);
 			llRiskPasturesInform.setVisibility(View.GONE);
 		}
 
@@ -3357,8 +3359,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
 		}else{
 			edtRiskParkType.setText("");
 			edtRiskParkDistance.setText("");
-			((dbfields.AutoCompleteTextViewDB)spiRiskParkBufferZones).setValue(null);
-			((dbfields.AutoCompleteTextViewDB)spiRiskParkImpact).setValue(null);
+			((fieldDB)spiRiskParkBufferZones).setValue(null);
+			((fieldDB)spiRiskParkImpact).setValue(null);
 
 			llRiskParkType.setVisibility(View.GONE);
 			llRiskParkDistance.setVisibility(View.GONE);
diff --git a/app/src/main/res/drawable/spinner_background.xml b/app/src/main/res/drawable/spinner_background.xml
new file mode 100644
index 0000000..2007346
--- /dev/null
+++ b/app/src/main/res/drawable/spinner_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent"/>
+            <stroke
+                android:width="0dp"
+                android:color="@android:color/transparent"/>
+        </shape>
+    </item>
+    <item android:bottom="0dp" android:right="0dp" android:left="0dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent"/>
+            <stroke android:width="1dp" android:color="@android:color/darker_gray"/>
+        </shape>
+    </item>
+    <item android:right="8dp" android:gravity="end|center_vertical">
+        <bitmap
+            android:src="@android:drawable/arrow_down_float"
+            android:gravity="center"/>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout-land/activity_locust_health.xml b/app/src/main/res/layout-land/activity_locust_health.xml
index c5cbb3f..eb982da 100644
--- a/app/src/main/res/layout-land/activity_locust_health.xml
+++ b/app/src/main/res/layout-land/activity_locust_health.xml
@@ -3918,6 +3918,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskHouseImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -3935,6 +3936,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskHouseInformed"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -3998,6 +4000,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskWaterDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4023,6 +4026,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskWaterBufferZones"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4040,6 +4044,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskWaterImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4104,6 +4109,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskApiaryDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4129,6 +4135,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskApiaryInformed"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4146,6 +4153,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskApiaryMeasure"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4171,6 +4179,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskApiaryImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4210,6 +4219,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskAgriculturalName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4235,6 +4245,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskAgriculturalPhase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4260,6 +4271,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskAgriculturalToxic"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4277,6 +4289,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskAgriculturalInform"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4292,8 +4305,6 @@
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
-
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -4342,6 +4353,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskSilkDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4367,6 +4379,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskSilkInform"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4384,6 +4397,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskSilkTreesMeasure"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4409,6 +4423,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskSilkTreesImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4448,6 +4463,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskPasturesInform"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4511,6 +4527,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskParkType"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4521,7 +4538,6 @@
                     android:layout_weight="1"
                     android:background="@color/transparent"
                     app:boxBackgroundColor="@color/transparent">
-
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/edtRiskParkType"
                         android:layout_width="match_parent"
@@ -4537,6 +4553,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskParkDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4562,6 +4579,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskParkBufferZones"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4579,6 +4597,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskParkImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4634,6 +4653,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskProbeAnalysisName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -4644,7 +4664,6 @@
                     android:layout_weight="1"
                     android:background="@color/transparent"
                     app:boxBackgroundColor="@color/transparent">
-
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/edtRiskProbeAnalysisName"
                         android:layout_width="match_parent"
@@ -4660,6 +4679,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskProbeAnalysisNumber"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
diff --git a/app/src/main/res/layout-large/activity_locust_health.xml b/app/src/main/res/layout-large/activity_locust_health.xml
index 3262011..d73ff8e 100644
--- a/app/src/main/res/layout-large/activity_locust_health.xml
+++ b/app/src/main/res/layout-large/activity_locust_health.xml
@@ -5,8 +5,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/gradient_example"
     android:paddingBottom="@dimen/activity_vertical_margin"
-
-
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".LocustHealthActivity">
 
@@ -42,24 +40,39 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
+                android:layout_height="wrap_content"
+                android:enabled="false"
+                android:focusable="false">
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvCountry"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Country"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiCountry"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -68,20 +81,33 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvRegion"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Region"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRegion"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -90,17 +116,18 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvArea"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Area"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-
+                    android:textStyle="bold"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <EditText
                     android:id="@+id/edtArea"
                     android:layout_width="0dp"
@@ -109,7 +136,14 @@
                     android:importantForAutofill="no"
                     android:autofillHints=""
                     android:ems="10"
-                    android:inputType="text" />
+                    android:inputType="text"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -118,23 +152,33 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvVillage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Name_of_the_village"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:enabled="false"
+                    android:focusable="false"/>
 	            <EditText
 	                android:id="@+id/edtVillage"
 	                android:layout_width="match_parent"
 	                android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:importantForAutofill="no"
                     android:autofillHints=""
-	                android:ems="10" />
+	                android:ems="10"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -143,16 +187,18 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Name_of_control_team_leader"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <EditText
                     android:id="@+id/edtObserver"
                     android:hint=""
@@ -161,7 +207,14 @@
                     android:layout_weight="1"
                     android:importantForAutofill="no"
                     android:autofillHints=""
-                    android:ems="10" />
+                    android:ems="10"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -170,24 +223,26 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Date"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <dbfields.DateTimeText
                     android:id="@+id/edtDate"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:enabled="false"
                     android:hint=""
-                    android:inputType="date" />
-
+                    android:inputType="date"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <EditText
                     android:id="@+id/edtTimeZone"
                     android:layout_width="wrap_content"
@@ -197,7 +252,9 @@
                     android:importantForAutofill="no"
                     android:autofillHints=""
                     android:hint=""
-                    android:visibility="invisible" />
+                    android:visibility="invisible"
+                    android:enabled="false"
+                    android:focusable="false"/>
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnGetDate"
@@ -212,7 +269,14 @@
                     app:icon="@drawable/ic_clock"
                     app:iconGravity="textStart"
                     app:iconPadding="0dp"
-                    app:iconSize="24dp" />
+                    app:iconSize="24dp"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -224,16 +288,18 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvLatCenter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Lat_center"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <EditText
                     android:id="@+id/edtLatCenter"
                     android:layout_width="wrap_content"
@@ -242,21 +308,24 @@
                     android:importantForAutofill="no"
                     android:autofillHints=""
                     android:ems="10"
+                    android:inputType="numberDecimal"
                     android:enabled="false"
-                    android:inputType="numberDecimal" />
+                    android:focusable="false"/>
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvLonCenter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Lon_center"
                     android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <EditText
                     android:id="@+id/edtLonCenter"
                     android:layout_width="wrap_content"
@@ -265,8 +334,9 @@
                     android:importantForAutofill="no"
                     android:autofillHints=""
                     android:ems="10"
+                    android:inputType="numberDecimal"
                     android:enabled="false"
-                    android:inputType="numberDecimal" />
+                    android:focusable="false"/>
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnGetGPSCenter"
@@ -281,7 +351,9 @@
                     app:icon="@drawable/ic_location"
                     app:iconGravity="textStart"
                     app:iconPadding="0dp"
-                    app:iconSize="24dp" />
+                    app:iconSize="24dp"
+                    android:enabled="false"
+                    android:focusable="false"/>
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnDelGPSCenter"
                     style="@style/Widget.MaterialComponents.Button.Icon"
@@ -295,17 +367,37 @@
                     app:icon="@drawable/ic_delete"
                     app:iconGravity="textStart"
                     app:iconPadding="0dp"
-                    app:iconSize="24dp" />
+                    app:iconSize="24dp"
+                    android:enabled="false"
+                    android:focusable="false"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
-            <ListView
-                android:id="@+id/latlonList"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:orientation="horizontal"
+                android:divider="@drawable/spacer_medium"
+                android:showDividers="middle">
+                <ListView
+                    android:id="@+id/latlonList"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -348,9 +440,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -373,9 +465,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -424,9 +516,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -442,7 +534,9 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiFrmLocustDelFilled"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -467,9 +561,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -493,9 +587,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -542,20 +636,29 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvVegType"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Vegetation_type"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiVegType"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -564,9 +667,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -582,6 +685,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -590,20 +698,29 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvVegCover"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Del_Vegetation_cover"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiVegCover"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -617,7 +734,6 @@
                     android:layout_height="wrap_content"
                     android:text="@string/Crop_name"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-
                 <EditText
                     android:id="@+id/edtVegCrop"
                     android:layout_width="0dp"
@@ -627,6 +743,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -649,9 +770,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvInsName"
                     android:layout_width="wrap_content"
@@ -668,6 +789,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -741,9 +867,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvInsActiveSubstance"
                     android:layout_width="wrap_content"
@@ -760,6 +886,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -768,9 +899,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvInsConcentration"
                     android:layout_width="wrap_content"
@@ -787,6 +918,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -795,19 +931,28 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Formulation"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiInsFormulation"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -821,7 +966,6 @@
                     android:layout_height="wrap_content"
                     android:text="@string/Dose_rate_l_of_commercial_product_ha"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-
                 <EditText
                     android:id="@+id/edtInsDose"
                     android:layout_width="0dp"
@@ -831,6 +975,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -840,12 +989,21 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Commercial_product_diluted"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiInsDiluted"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -866,20 +1024,23 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
-
                 <TextView
                     android:id="@+id/tvInsRate"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Rate_of_working_solution_l_ha"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-
                 <EditText
                     android:id="@+id/edtInsRate"
                     android:layout_width="0dp"
@@ -889,6 +1050,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -898,12 +1064,15 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Condition_of_the_insecticide_containers_or_bags"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiInsContainerState"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -928,13 +1097,14 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvWeaTimeStart"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Time_start"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
@@ -942,17 +1112,20 @@
                     android:id="@+id/spiWeaTimeStart"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvWeaTimeEnd"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Time_end"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
@@ -960,7 +1133,14 @@
                     android:id="@+id/spiWeaTimeEnd"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1001,6 +1181,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1012,6 +1197,7 @@
                     android:id="@+id/tvWindDirectionStart"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Wind_direction_start"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -1019,12 +1205,15 @@
                     android:id="@+id/spiWindDirectionStart"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
 
                 <TextView
                     android:id="@+id/tvWindDirectionEnd"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Wind_direction_end"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -1032,7 +1221,14 @@
                     android:id="@+id/spiWindDirectionEnd"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1044,6 +1240,7 @@
                     android:id="@+id/tvSprayDirectionStart"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Spray_direction_start"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -1051,12 +1248,15 @@
                     android:id="@+id/spiSprayDirectionStart"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
 
                 <TextView
                     android:id="@+id/tvSprayDirectionEnd"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Spray_direction_end"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
@@ -1064,7 +1264,14 @@
                     android:id="@+id/spiSprayDirectionEnd"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1089,20 +1296,29 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvLocSpecies"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Locust_type"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiLocSpecies"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1111,20 +1327,29 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvLocHoppers"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Hopper_stages"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiLocHoppers"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1133,9 +1358,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvLocDensity"
                     android:layout_width="wrap_content"
@@ -1152,6 +1377,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1160,19 +1390,28 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Main_purpose_of_treatment"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiMainPurpose"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1196,20 +1435,29 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvSprPlatform"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Spray_platform"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatform"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1221,13 +1469,22 @@
                     android:id="@+id/tvSprPlatformA"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Spray_platform_a"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatformA"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1239,13 +1496,22 @@
                     android:id="@+id/tvSprPlatformG"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Ground"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatformG"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1257,27 +1523,33 @@
                     android:id="@+id/tvSprPlatformH"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Spray_platform_h"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprPlatformH"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
-
                 <TextView
                     android:id="@+id/tvSprManufacturer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Spray_manufacturer_model"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-
                 <EditText
                     android:id="@+id/edtSprManufacturer"
                     android:layout_width="0dp"
@@ -1287,6 +1559,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1310,6 +1587,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1320,13 +1602,16 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Mechanical_safety_any_insecticide_leakage_observed"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprLeak"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1356,12 +1641,15 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Spray_system_atomisers_or_nozzles_damaged"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprDamage"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1390,19 +1678,28 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Type_of_treatment"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprBarrier"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1411,9 +1708,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvSprBarrierSpace"
                     android:layout_width="wrap_content"
@@ -1430,6 +1727,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1438,9 +1740,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvSprSpeed"
                     android:layout_width="wrap_content"
@@ -1457,6 +1759,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
 
@@ -1469,13 +1776,22 @@
                     android:id="@+id/tvSprPlatformG"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Ground_marking"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprMarking"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1484,9 +1800,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -1502,6 +1818,11 @@
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1524,6 +1845,36 @@
                     android:inputType="numberDecimal" />
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_star"
+                    android:contentDescription="@null"
+                    android:layout_gravity="center_vertical"/>
+                <TextView
+                    android:id="@+id/tvInsUsedVolume"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/Total_volume_of_working_solution_actually_applied_l"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="bold"/>
+                <EditText
+                    android:id="@+id/edtInsUsedVolume"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="10"
+                    android:inputType="numberDecimal" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -1562,7 +1913,9 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSprObservation"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1612,9 +1965,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -1624,7 +1977,9 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiCalibrConsumptionCheck"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1691,19 +2046,22 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Droplet_deposition_verified_during_this_monitoring_visit"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiCalibrPrecipitation"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -1822,7 +2180,9 @@
                         android:id="@+id/spiEffControl"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"/>
+                        android:layout_weight="1"
+                        style="@style/SpinnerStyle"
+                        android:minHeight="@dimen/minHeight"/>
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/btnEffControl"
                         style="@style/Widget.MaterialComponents.Button.Icon"
@@ -1839,6 +2199,11 @@
                         app:iconPadding="0dp"
                         app:iconSize="20dp"
                         app:cornerRadius="20dp"/>
+                    <View
+                        android:layout_width="@dimen/activity_vertical_margin"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0"
+                        android:background="@color/button_pink_normal_start"/>
                 </LinearLayout>
 
                 <LinearLayout
@@ -1848,12 +2213,21 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:text="@string/Type_of_assessed_biological_impact"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
                         android:id="@+id/spiEffTypeImpact"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        style="@style/SpinnerStyle"
+                        android:minHeight="@dimen/minHeight"/>
+                    <View
+                        android:layout_width="@dimen/activity_vertical_margin"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0"
+                        android:background="@color/button_pink_normal_start"/>
                 </LinearLayout>
 
                 <LinearLayout
@@ -1862,9 +2236,9 @@
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_star"
-                        android:contentDescription="@null"
-                        android:layout_gravity="center_vertical"/>
+                        android:contentDescription="@null"/>
                     <TextView
                         android:id="@+id/tvEffMortality"
                         android:layout_width="wrap_content"
@@ -1880,6 +2254,11 @@
                         android:autofillHints=""
                         android:ems="10"
                         android:inputType="numberDecimal" />
+                    <View
+                        android:layout_width="@dimen/activity_vertical_margin"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0"
+                        android:background="@color/button_pink_normal_start"/>
                 </LinearLayout>
 
                 <LinearLayout
@@ -1888,9 +2267,9 @@
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_star"
-                        android:contentDescription="@null"
-                        android:layout_gravity="center_vertical"/>
+                        android:contentDescription="@null"/>
                     <TextView
                         android:id="@+id/tvEffTime"
                         android:layout_width="wrap_content"
@@ -1908,6 +2287,11 @@
                         android:ems="10"
                         android:hint="@string/Hours"
                         android:inputType="numberDecimal" />
+                    <View
+                        android:layout_width="@dimen/activity_vertical_margin"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0"
+                        android:background="@color/button_pink_normal_start"/>
                 </LinearLayout>
 
                 <LinearLayout
@@ -1917,12 +2301,21 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:text="@string/Method_of_biological_efficiency_estimation"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
                         android:id="@+id/spiEffMethod"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        style="@style/SpinnerStyle"
+                        android:minHeight="@dimen/minHeight"/>
+                    <View
+                        android:layout_width="@dimen/activity_vertical_margin"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0"
+                        android:background="@color/button_pink_normal_start"/>
                 </LinearLayout>
 
                 <LinearLayout
@@ -1932,6 +2325,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:text="@string/Control_efficacy_conducted_monitoring_team"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
@@ -1939,6 +2333,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
+                        style="@style/SpinnerStyle"
+                        android:minHeight="@dimen/minHeight"
                         />
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/btnEffControl2"
@@ -1965,12 +2361,15 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:text="@string/Type_of_assessed_biological_impact"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
                         android:id="@+id/spiEffTypeImpact2"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        style="@style/SpinnerStyle"
+                        android:minHeight="@dimen/minHeight"/>
                 </LinearLayout>
 
                 <LinearLayout
@@ -2019,12 +2418,15 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
                         android:text="@string/Method_of_biological_efficiency_estimation"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
                     <dbfields.SpinnerDB
                         android:id="@+id/spiEffMethod2"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
+                        android:layout_height="wrap_content"
+                        style="@style/SpinnerStyle"
+                        android:minHeight="@dimen/minHeight"/>
                 </LinearLayout>
 
             </LinearLayout>
@@ -2050,9 +2452,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <dbfields.TextViewHTML
                     android:id="@+id/tvClothing"
                     android:layout_width="wrap_content"
@@ -2062,86 +2464,88 @@
                     android:textStyle="bold" />
             </LinearLayout>
 
-            <GridLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:columnCount="3"
-                android:rowCount="3"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-
-                <CheckBox
-                    android:id="@+id/cbSafClothingGoggles"
-                    android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+                <GridLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Goggles" />
-
-                <CheckBox
-                    android:id="@+id/cbSafClothingMasks"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Masks" />
-
-                <CheckBox
-                    android:id="@+id/cbSafClothingGloves"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Gloves" />
-
-                <CheckBox
-                    android:id="@+id/cbSafClothingOveralls"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Overalls" />
-
-                <CheckBox
-                    android:id="@+id/cbSafClothingCaps"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Caps" />
-
-                <CheckBox
-                    android:id="@+id/cbSafClothingBoots"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Boots" />
-
-                <CheckBox
-                    android:id="@+id/cbSafClothingAbsent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="2"
-                    android:text="@string/Protection_is_absent" />
-
-                <EditText
-                    android:id="@+id/edtClothing"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_row="2"
-                    android:importantForAutofill="no"
-                    android:autofillHints=""
-                    android:visibility="invisible" />
-            </GridLayout>
+                    android:layout_weight="1"
+                    android:columnCount="3"
+                    android:rowCount="3"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <CheckBox
+                        android:id="@+id/cbSafClothingGoggles"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="0"
+                        android:layout_row="0"
+                        android:text="@string/Goggles" />
+                    <CheckBox
+                        android:id="@+id/cbSafClothingMasks"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="1"
+                        android:layout_row="0"
+                        android:text="@string/Masks" />
+                    <CheckBox
+                        android:id="@+id/cbSafClothingGloves"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="2"
+                        android:layout_row="0"
+                        android:text="@string/Gloves" />
+                    <CheckBox
+                        android:id="@+id/cbSafClothingOveralls"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="0"
+                        android:layout_row="1"
+                        android:text="@string/Overalls" />
+                    <CheckBox
+                        android:id="@+id/cbSafClothingCaps"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="1"
+                        android:layout_row="1"
+                        android:text="@string/Caps" />
+                    <CheckBox
+                        android:id="@+id/cbSafClothingBoots"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="2"
+                        android:layout_row="1"
+                        android:text="@string/Boots" />
+                    <CheckBox
+                        android:id="@+id/cbSafClothingAbsent"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="0"
+                        android:layout_row="2"
+                        android:text="@string/Protection_is_absent" />
+                    <EditText
+                        android:id="@+id/edtClothing"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_column="1"
+                        android:layout_row="2"
+                        android:importantForAutofill="no"
+                        android:autofillHints=""
+                        android:visibility="invisible" />
+                </GridLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -2149,20 +2553,23 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvProtectiveClothingClean"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Protective_clothing_clean_and_in_good_state"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiHlthProtectiveClothingClean"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2207,7 +2614,9 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiHlthClothingReserve"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2257,12 +2666,15 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Cholinesterase_inhibition_measured_during_this_monitoring_visit"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiHlthInhibition"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2271,9 +2683,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <dbfields.TextViewHTML
                     android:id="@+id/tvOperatorExposedInsecticide"
                     android:layout_width="wrap_content"
@@ -2290,20 +2702,26 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiOperatorExposedInsecticide"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
-
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/If_yes_describe_what_happened_description"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-
                 <EditText
                     android:id="@+id/edtDescription"
                     android:layout_width="0dp"
@@ -2312,6 +2730,11 @@
                     android:importantForAutofill="no"
                     android:autofillHints=""
                     android:inputType="text" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2356,9 +2779,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:id="@+id/tvEmptyContainers"
                     android:layout_width="wrap_content"
@@ -2368,77 +2791,80 @@
                     android:textStyle="bold"/>
             </LinearLayout>
 
-            <GridLayout
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:columnCount="3"
-                android:rowCount="2"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-
-                <CheckBox
-                    android:id="@+id/cbTripleRinsed"
-                    android:layout_width="wrap_content"
+                android:layout_height="wrap_content" >
+                <GridLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Farmer" />
-
-                <CheckBox
-                    android:id="@+id/cbPunctured"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Shepherd" />
-
-                <CheckBox
-                    android:id="@+id/cbTakenBackToBase"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_gravity="left|top"
-                    android:layout_row="0"
-                    android:text="@string/Beekeeper" />
-
-                <CheckBox
-                    android:id="@+id/cbLeftInField"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="0"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Villager" />
-
-                <CheckBox
-                    android:id="@+id/cbBuried"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="1"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Official" />
-
-                <CheckBox
-                    android:id="@+id/cbBurned"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_gravity="left|top"
-                    android:layout_row="1"
-                    android:text="@string/Other" />
-
-                <EditText
-                    android:id="@+id/edtSafEmptyContainers"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_column="2"
-                    android:layout_row="0"
-                    android:importantForAutofill="no"
-                    android:autofillHints=""
-                    android:visibility="invisible" />
-            </GridLayout>
+                    android:layout_weight="1"
+                    android:columnCount="3"
+                    android:rowCount="2"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <CheckBox
+                        android:id="@+id/cbTripleRinsed"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="0"
+                        android:layout_row="0"
+                        android:text="@string/Farmer" />
+                    <CheckBox
+                        android:id="@+id/cbPunctured"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="1"
+                        android:layout_row="0"
+                        android:text="@string/Shepherd" />
+                    <CheckBox
+                        android:id="@+id/cbTakenBackToBase"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="2"
+                        android:layout_row="0"
+                        android:text="@string/Beekeeper" />
+                    <CheckBox
+                        android:id="@+id/cbLeftInField"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="0"
+                        android:layout_row="1"
+                        android:text="@string/Villager" />
+                    <CheckBox
+                        android:id="@+id/cbBuried"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="1"
+                        android:layout_row="1"
+                        android:text="@string/Official" />
+                    <CheckBox
+                        android:id="@+id/cbBurned"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left|top"
+                        android:layout_column="2"
+                        android:layout_row="1"
+                        android:text="@string/Other" />
+                    <EditText
+                        android:id="@+id/edtSafEmptyContainers"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_column="2"
+                        android:layout_row="0"
+                        android:importantForAutofill="no"
+                        android:autofillHints=""
+                        android:visibility="invisible" />
+                </GridLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -2446,9 +2872,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -2464,7 +2890,9 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSafObservedPollution"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2498,19 +2926,28 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Effect_on_non_terget_organism"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSafNonTarget"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2520,22 +2957,22 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/If_yes_where_and_what_type_of_effect"
+                    android:text="@string/If_Yes_type_of_organisms_and_effects_description"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <EditText
                     android:id="@+id/edtSafNonTargetEffect"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_weight="1"
                     android:importantForAutofill="no"
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="text" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
 
@@ -2545,9 +2982,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -2562,7 +2999,9 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiSafNonTarget2"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2634,62 +3073,75 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
-                <dbfields.TextViewHTML
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="3"
-                    android:text="@string/Other_environmental_or_health_incident_reported_that_might_have_been_caused_by_the_treatment"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <dbfields.SpinnerDB
-                    android:id="@+id/spiSafIncident"
+                android:layout_height="wrap_content">
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:minWidth="10dp" />
+                    android:orientation="vertical">
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:src="@drawable/ic_star"
+                        android:contentDescription="@null"/>
+                    <dbfields.TextViewHTML
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/Other_environmental_or_health_incident_reported_that_might_have_been_caused_by_the_treatment"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textStyle="bold" />
+                    </LinearLayout>
+                    <dbfields.SpinnerDB
+                        android:id="@+id/spiSafIncident"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minWidth="10dp"
+                        style="@style/SpinnerStyle"
+                        android:minHeight="@dimen/minHeight"/>
+                </LinearLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/If_Yes_type_of_incident_and_reported_by_whom_description"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
-                <EditText
-                    android:id="@+id/edtSafIncidentEffect"
+                android:layout_height="wrap_content">
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:importantForAutofill="no"
-                    android:autofillHints=""
-                    android:ems="10"
-                    android:inputType="text"
-                    android:minWidth="10dp" />
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/activity_horizontal_margin">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/If_Yes_type_of_incident_and_reported_by_whom_description"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                    <EditText
+                        android:id="@+id/edtSafIncidentEffect"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:importantForAutofill="no"
+                        android:autofillHints=""
+                        android:ems="10"
+                        android:inputType="text"
+                        android:minWidth="10dp" />
+                </LinearLayout>
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -2711,7 +3163,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:minWidth="10dp" />
+                    android:minWidth="10dp"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -2742,6 +3196,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="40dp"
+                    android:layout_weight="1"
                     android:paddingLeft="10dp"
                     android:textColor="@color/text_title"
                     android:gravity="left|center"
@@ -2758,10 +3213,16 @@
                     android:id="@+id/edtComments"
                     android:layout_width="match_parent"
                     android:layout_height="150dp"
+                    android:layout_weight="1"
                     android:importantForAutofill="no"
                     android:autofillHints=""
                     android:ems="10"
                     android:inputType="textMultiLine" />
+                <View
+                    android:layout_width="@dimen/activity_vertical_margin"
+                    android:layout_height="match_parent"
+                    android:layout_weight="0"
+                    android:background="@color/button_pink_normal_start"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -2790,7 +3251,9 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiMapTreatment"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -2885,9 +3348,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -2904,7 +3367,9 @@
                     android:id="@+id/spiRiskHouse"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnRiskHouse"
                     style="@style/Widget.MaterialComponents.Button.Icon"
@@ -2924,20 +3389,16 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskHouseDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Distance_from_the_closest_edge_of_the_treated_area_m_to_the_nearest_housing"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <EditText
                     android:id="@+id/edtRiskHouseDistance"
                     android:layout_width="match_parent"
@@ -2951,64 +3412,71 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskHouseBufferZones"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Were_buffer_zones_respected"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskHouseBufferZones"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskHouseImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Was_exposure_of_the_dwellings_housing_probable"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskHouseImpact"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
+
             <LinearLayout
+                android:id="@+id/llRiskHouseInformed"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Were_inhabitants_informed_about_the_insecticide_application"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskHouseInformed"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -3025,7 +3493,9 @@
                     android:id="@+id/spiRiskWater"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnRiskWater"
                     style="@style/Widget.MaterialComponents.Button.Icon"
@@ -3045,20 +3515,16 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskWaterDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Distance_from_the_closest_edge_of_the_treated_area_m_to_the_nearest_surface_water"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <EditText
                     android:id="@+id/edtRiskWaterDistance"
                     android:layout_width="match_parent"
@@ -3072,6 +3538,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskWaterBufferZones"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
@@ -3083,32 +3550,37 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskWaterBufferZones"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskWaterImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Was_exposure_of_the_surface_water_probable"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskWaterImpact"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -3125,7 +3597,9 @@
                     android:id="@+id/spiRiskApiary"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnRiskApiary"
                     style="@style/Widget.MaterialComponents.Button.Icon"
@@ -3145,19 +3619,17 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskApiaryDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Distance_from_the_closest_edge_of_the_treated_area_m_to_the_apiary"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
+
                 <EditText
                     android:id="@+id/edtRiskApiaryDistance"
                     android:layout_width="match_parent"
@@ -3171,36 +3643,36 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskApiaryInformed"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Were_beekeepers_informed_about_the_insecticide_application"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskApiaryInformed"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
 
             <LinearLayout
+                android:id="@+id/llRiskApiaryMeasure"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Which_measures_were_taken_to_reduce_the_risks_for_honeybees"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <EditText
                     android:id="@+id/edtRiskApiaryMeasure"
                     android:layout_width="match_parent"
@@ -3214,18 +3686,22 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskApiaryImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Was_exposure_of_honeybees_probable"
                     android:textAppearance="?android:attr/textAppearanceSmall"/>
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskApiaryImpact"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
@@ -3234,9 +3710,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -3251,10 +3727,13 @@
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskAgricultural"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskAgriculturalName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
@@ -3275,6 +3754,7 @@
                     android:minWidth="10dp" />
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskAgriculturalPhase"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
@@ -3295,43 +3775,50 @@
                     android:minWidth="10dp" />
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskAgriculturalToxic"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Phytotoxicity_observed"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskAgriculturalToxic"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskAgriculturalInform"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Were_farmers_informed_about_pre_harvest_intervals"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskAgriculturalInform"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" >
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -3348,7 +3835,9 @@
                     android:id="@+id/spiRiskSilk"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnRiskSilk"
                     style="@style/Widget.MaterialComponents.Button.Icon"
@@ -3368,6 +3857,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskSilkDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
@@ -3389,33 +3879,34 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/llRiskSilkInform"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Were_silkworm_breeders_informed_about_the_insecticide_application"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskSilkInform"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskSilkTreesMeasure"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Which_measures_were_taken_to_reduce_the_exposure_of_mulberry_trees"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
                 <EditText
                     android:id="@+id/edtRiskSilkTreesMeasure"
                     android:layout_width="match_parent"
@@ -3428,18 +3919,22 @@
                     android:minWidth="10dp" />
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskSilkTreesImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Was_exposure_of_mulberry_trees_probable"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskSilkTreesImpact"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -3447,38 +3942,41 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Any_grassland_or_grazing_land_treated"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskPastures"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskPasturesInform"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/Were_shepherds_informed_about_re_entry_period_for_livestock"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingLeft="@dimen/activity_horizontal_margin">
+
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskPasturesInform"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -3486,9 +3984,9 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -3504,7 +4002,9 @@
                     android:id="@+id/spiRiskPark"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btnRiskPark"
                     style="@style/Widget.MaterialComponents.Button.Icon"
@@ -3523,6 +4023,7 @@
                     app:cornerRadius="20dp"/>
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskParkType"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
@@ -3543,8 +4044,10 @@
                     android:minWidth="10dp" />
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskParkDistance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
@@ -3562,33 +4065,42 @@
                     android:inputType="text"
                     android:minWidth="10dp" />
             </LinearLayout>
+
             <LinearLayout
+                android:id="@+id/llRiskParkBufferZones"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Were_buffer_zones_respected"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskParkBufferZones"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskParkImpact"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Was_exposure_of_the_ecologically_sensitive_areas_probable"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskParkImpact"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
@@ -3610,24 +4122,25 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_star"
-                    android:contentDescription="@null"
-                    android:layout_gravity="center_vertical"/>
+                    android:contentDescription="@null"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:text="@string/Samples_taken_for_residue_analysis"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textStyle="bold" />
                 <dbfields.SpinnerDB
                     android:id="@+id/spiRiskProbeAnalysis"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content"
+                    style="@style/SpinnerStyle"
+                    android:minHeight="@dimen/minHeight"/>
             </LinearLayout>
-
-
-
             <LinearLayout
+                android:id="@+id/llRiskProbeAnalysisName"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
@@ -3648,6 +4161,7 @@
                     android:minWidth="10dp" />
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/llRiskProbeAnalysisNumber"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="@dimen/activity_horizontal_margin">
diff --git a/app/src/main/res/layout/activity_locust_health.xml b/app/src/main/res/layout/activity_locust_health.xml
index 1ada9bd..e28ed96 100644
--- a/app/src/main/res/layout/activity_locust_health.xml
+++ b/app/src/main/res/layout/activity_locust_health.xml
@@ -4466,7 +4466,6 @@
                         android:layout_height="wrap_content" />
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -4832,7 +4831,6 @@
                     android:layout_weight="1"
                     android:background="@color/transparent"
                     app:boxBackgroundColor="@color/transparent">
-
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/edtRiskProbeAnalysisName"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9ff23e4..3f3845d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,4 +11,7 @@
 
 
     <dimen name="font_size">20sp</dimen>
+
+
+    <dimen name="minHeight">40dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8f7c30a..28d4b13 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -46,4 +46,14 @@
         <item name="android:colorAccent">@color/colorPrimaryDark</item>
     </style>
 
+    <style name="SpinnerStyle" parent="Widget.AppCompat.Spinner.Underlined">
+        <item name="android:background">@drawable/spinner_background</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingStart">16dp</item>
+        <item name="android:paddingEnd">16dp</item>
+        <item name="android:popupBackground">@android:color/white</item>
+    </style>
+
+
 </resources>
\ No newline at end of file