diff --git a/app/build.gradle b/app/build.gradle
index dd1dbbb..e886109 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,9 +13,9 @@ android {
     defaultConfig {
         applicationId "kz.istt.locust"
         minSdkVersion 15
-        versionCode 110
-        versionName "3.0.7"
-        targetSdkVersion 34
+        versionCode 113
+        versionName "3.0.9"
+        targetSdkVersion 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
diff --git a/app/src/main/res/layout-land/activity_locust.xml b/app/src/main/res/layout-land/activity_locust.xml
index 9a50d08..c552d7c 100644
--- a/app/src/main/res/layout-land/activity_locust.xml
+++ b/app/src/main/res/layout-land/activity_locust.xml
@@ -7,6 +7,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
+    android:fitsSystemWindows="true"
     android:screenOrientation="portrait"
     tools:context=".LocustActivity">
 
diff --git a/app/src/main/res/layout-land/activity_locust_del.xml b/app/src/main/res/layout-land/activity_locust_del.xml
index 5071997..de67ddf 100644
--- a/app/src/main/res/layout-land/activity_locust_del.xml
+++ b/app/src/main/res/layout-land/activity_locust_del.xml
@@ -7,6 +7,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustDelActivity">
 
     <ScrollView
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 497be14..e328687 100644
--- a/app/src/main/res/layout-land/activity_locust_health.xml
+++ b/app/src/main/res/layout-land/activity_locust_health.xml
@@ -6,6 +6,7 @@
     android:background="@drawable/gradient_example"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustHealthActivity">
 
     <ScrollView
diff --git a/app/src/main/res/layout-large/activity_locust.xml b/app/src/main/res/layout-large/activity_locust.xml
index e85c6de..2a8b28c 100644
--- a/app/src/main/res/layout-large/activity_locust.xml
+++ b/app/src/main/res/layout-large/activity_locust.xml
@@ -7,6 +7,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     android:screenOrientation="portrait"
     tools:context=".LocustActivity">
 
diff --git a/app/src/main/res/layout-large/activity_locust_del.xml b/app/src/main/res/layout-large/activity_locust_del.xml
index 90ca2cf..803913b 100644
--- a/app/src/main/res/layout-large/activity_locust_del.xml
+++ b/app/src/main/res/layout-large/activity_locust_del.xml
@@ -7,6 +7,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustDelActivity">
 
     <ScrollView
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 2c77806..7789845 100644
--- a/app/src/main/res/layout-large/activity_locust_health.xml
+++ b/app/src/main/res/layout-large/activity_locust_health.xml
@@ -6,6 +6,7 @@
     android:background="@drawable/gradient_example"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustHealthActivity">
 
     <ScrollView
diff --git a/app/src/main/res/layout/activity_image_pick.xml b/app/src/main/res/layout/activity_image_pick.xml
index bf36632..c7bcff6 100644
--- a/app/src/main/res/layout/activity_image_pick.xml
+++ b/app/src/main/res/layout/activity_image_pick.xml
@@ -6,6 +6,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     android:background="@drawable/gradient_example"
     tools:context=".ImagePickActivity" >
 
diff --git a/app/src/main/res/layout/activity_locust.xml b/app/src/main/res/layout/activity_locust.xml
index 70ce44d..9dd70d1 100644
--- a/app/src/main/res/layout/activity_locust.xml
+++ b/app/src/main/res/layout/activity_locust.xml
@@ -7,6 +7,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     android:screenOrientation="portrait"
     tools:context=".LocustActivity">
 
diff --git a/app/src/main/res/layout/activity_locust_del.xml b/app/src/main/res/layout/activity_locust_del.xml
index a9c7e64..f985f84 100644
--- a/app/src/main/res/layout/activity_locust_del.xml
+++ b/app/src/main/res/layout/activity_locust_del.xml
@@ -7,6 +7,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustDelActivity">
 
     <ScrollView
@@ -2524,6 +2525,9 @@
 
             </LinearLayout>
         </LinearLayout>
+
+
+
     </ScrollView>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_locust_del_list.xml b/app/src/main/res/layout/activity_locust_del_list.xml
index 416b78c..d45a997 100644
--- a/app/src/main/res/layout/activity_locust_del_list.xml
+++ b/app/src/main/res/layout/activity_locust_del_list.xml
@@ -9,6 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustDelListActivity" >
 
     <LinearLayout
diff --git a/app/src/main/res/layout/activity_locust_health.xml b/app/src/main/res/layout/activity_locust_health.xml
index 686d47d..2ebc9e8 100644
--- a/app/src/main/res/layout/activity_locust_health.xml
+++ b/app/src/main/res/layout/activity_locust_health.xml
@@ -6,6 +6,7 @@
     android:background="@drawable/gradient_example"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustHealthActivity">
 
     <ScrollView
diff --git a/app/src/main/res/layout/activity_locust_health_list.xml b/app/src/main/res/layout/activity_locust_health_list.xml
index 741471f..3db33c1 100644
--- a/app/src/main/res/layout/activity_locust_health_list.xml
+++ b/app/src/main/res/layout/activity_locust_health_list.xml
@@ -9,6 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustHealthListActivity" >
 
     <LinearLayout
diff --git a/app/src/main/res/layout/activity_locust_list.xml b/app/src/main/res/layout/activity_locust_list.xml
index 363324e..0f1fb9e 100644
--- a/app/src/main/res/layout/activity_locust_list.xml
+++ b/app/src/main/res/layout/activity_locust_list.xml
@@ -8,6 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustListActivity" >
 
     <LinearLayout
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0847a09..7244140 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="10dp"
+    android:fitsSystemWindows="true"
     android:background="@drawable/gradient_example"
     tools:context=".MainActivity" >
 
diff --git a/app/src/main/res/layout/activity_scan.xml b/app/src/main/res/layout/activity_scan.xml
index 8fb0587..2951b55 100644
--- a/app/src/main/res/layout/activity_scan.xml
+++ b/app/src/main/res/layout/activity_scan.xml
@@ -9,6 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     tools:context=".LocustDelListActivity" >
 
     <LinearLayout
diff --git a/app/src/main/res/layout/activity_setup.xml b/app/src/main/res/layout/activity_setup.xml
index 343b558..bac4238 100644
--- a/app/src/main/res/layout/activity_setup.xml
+++ b/app/src/main/res/layout/activity_setup.xml
@@ -7,6 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:fitsSystemWindows="true"
     android:configChanges = "orientation|keyboard"
     tools:context=".SetupActivity" >