diff --git a/README.md b/README.md
index 94de179f73ca959534d35ad1a1d0f10dde50d276..6f685d15b886a3d19f3e61cf2023c21a53ea6068 100644
--- a/README.md
+++ b/README.md
@@ -30,26 +30,27 @@ Bondoman is compatible with Android devices running on API 29 (Android 10) up to
 3. [PhilJay MPAndroid Chart](https://github.com/PhilJay/MPAndroidChart)
 
 ## Screenshots
-![login screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_125810.png?ref_type=heads)
-![login with input screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_130040.png?ref_type=heads)
-![home screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_130701.png?ref_type=heads)
-![transaction list screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131031.png?ref_type=heads)
-![transaction detail screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131235.png?ref_type=heads)
-![add transaction screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131411.png?ref_type=heads)
-![add transaction search location screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131500.png?ref_type=heads)
-![edit transaction screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131400.png?ref_type=heads)
-![scan options screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131107.png?ref_type=heads)
-![scan camera screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131146.png?ref_type=heads)
-![scan choose image screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131326.png?ref_type=heads)
-![scan result screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131218.png?ref_type=heads)
-![chart screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131044.png?ref_type=heads)
-![settings screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131053.png?ref_type=heads)
-![save transaction list screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131728.png?ref_type=heads)
-![send transaction list screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131758.png?ref_type=heads)
-![send transaction list email screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131821.png?ref_type=heads)
-![randomize transaction screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_131852.png?ref_type=heads)
-![twibbon screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_132022.png?ref_type=heads)
-![twibbon result screenshot](https://gitlab.informatika.org/if3210-2024-kkk/if3210-2024-android-kkk/-/blob/development/screenshot/Screenshot_20240402_132031.png?ref_type=heads)
+
+![login screenshot](screenshot/1_login.png)
+![login with input screenshot](screenshot/2_login_input.png)
+![home screenshot](screenshot/3_home.png)
+![transaction list screenshot](screenshot/4_transaction_list.png)
+![transaction detail screenshot](screenshot/5_detail_transaction.png)
+![add transaction screenshot](screenshot/6_add_transaction.png)
+![add transaction search location screenshot](screenshot7_add_transaction_location.png)
+![edit transaction screenshot](screenshot/8_edit_transaction.png)
+![scan options screenshot](screenshot/9_scan_options.png)
+![scan camera screenshot](screenshot/10_scan_camera.png)
+![scan choose image screenshot](screenshot/12_scan_select_picture.png)
+![scan result screenshot](screenshot/13_scan_result.png)
+![chart screenshot](screenshot/14_chart.png)
+![settings screenshot](screenshot/15_settings.png)
+![save transaction list screenshot](screenshot/16_save_transaction_list.png)
+![send transaction list screenshot](screenshot/18_send_transaction_list.png)
+![send transaction list email screenshot](screenshot/19_send_transaction_list_email.png)
+![randomize transaction screenshot](screenshot/20_randomize_transaction.png)
+![twibbon screenshot](screenshot/21_twibbon.png)
+![twibbon result screenshot](screenshot/22_twibbon_save.png)
 
 
 ## OWASP
diff --git a/app/src/main/res/layout/activity_add_transaction.xml b/app/src/main/res/layout/activity_add_transaction.xml
index e1562b5b76c6aaba7721b3b4a39470eaef359ded..6d5a82301a0ce791bfcb498c85ee5ade4a3a467b 100644
--- a/app/src/main/res/layout/activity_add_transaction.xml
+++ b/app/src/main/res/layout/activity_add_transaction.xml
@@ -42,7 +42,7 @@
                 android:textSize="16sp"
                 android:background="@drawable/roundstyle_xsm"
                 android:backgroundTint="@color/gray_container"
-                android:padding="10dp"/>
+                android:padding="14dp"/>
         </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
@@ -66,7 +66,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/roundstyle_xsm"
                 android:backgroundTint="@color/gray_container"
-                android:padding="10dp">
+                android:padding="14dp">
                 <TextView
                     android:id="@+id/prefixCurrency"
                     android:layout_width="wrap_content"
@@ -115,7 +115,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/roundstyle_xsm"
                 android:backgroundTint="@color/gray_container"
-                android:padding="10dp"
+                android:padding="15dp"
                 android:textSize="16sp"
                 android:popupBackground="@color/gray_container"
                 android:popupTheme="@style/SpinnerPopupStyle"/>
diff --git a/app/src/main/res/layout/activity_edit_transaction.xml b/app/src/main/res/layout/activity_edit_transaction.xml
index 4919bb6e935165290d7349b934f5b5b7cca0c1b9..7dd4e2fe5c46134a39c7ed26c77841a1ad624b1b 100644
--- a/app/src/main/res/layout/activity_edit_transaction.xml
+++ b/app/src/main/res/layout/activity_edit_transaction.xml
@@ -42,7 +42,7 @@
                 android:textSize="16sp"
                 android:background="@drawable/roundstyle_xsm"
                 android:backgroundTint="@color/gray_container"
-                android:padding="10dp"
+                android:padding="14dp"
                 android:autofillHints="Transaction title" />
         </LinearLayout>
         <LinearLayout
@@ -67,7 +67,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/roundstyle_xsm"
                 android:backgroundTint="@color/gray_container"
-                android:padding="10dp">
+                android:padding="14dp">
                 <TextView
                     android:id="@+id/prefixCurrency"
                     android:layout_width="wrap_content"
@@ -116,7 +116,7 @@
                 android:layout_height="wrap_content"
                 android:background="@drawable/roundstyle_xsm"
                 android:backgroundTint="@color/gray_container"
-                android:padding="10dp"
+                android:padding="15dp"
                 android:textSize="16sp"
                 android:popupBackground="@color/gray_container"
                 android:popupTheme="@style/SpinnerPopupStyle"/>
diff --git a/screenshot/Screenshot_20240402_131146.png b/screenshot/10_scan_camera.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131146.png
rename to screenshot/10_scan_camera.png
diff --git a/screenshot/Screenshot_20240402_131206.png b/screenshot/11_scan_camera_result.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131206.png
rename to screenshot/11_scan_camera_result.png
diff --git a/screenshot/Screenshot_20240402_131326.png b/screenshot/12_scan_select_picture.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131326.png
rename to screenshot/12_scan_select_picture.png
diff --git a/screenshot/Screenshot_20240402_131218.png b/screenshot/13_scan_result.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131218.png
rename to screenshot/13_scan_result.png
diff --git a/screenshot/Screenshot_20240402_131044.png b/screenshot/14_chart.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131044.png
rename to screenshot/14_chart.png
diff --git a/screenshot/Screenshot_20240402_131053.png b/screenshot/15_settings.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131053.png
rename to screenshot/15_settings.png
diff --git a/screenshot/Screenshot_20240402_131728.png b/screenshot/16_save_transaction_list.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131728.png
rename to screenshot/16_save_transaction_list.png
diff --git a/screenshot/Screenshot_20240402_131747.png b/screenshot/17_save_transaction_list_success.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131747.png
rename to screenshot/17_save_transaction_list_success.png
diff --git a/screenshot/Screenshot_20240402_131758.png b/screenshot/18_send_transaction_list.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131758.png
rename to screenshot/18_send_transaction_list.png
diff --git a/screenshot/Screenshot_20240402_131821.png b/screenshot/19_send_transaction_list_email.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131821.png
rename to screenshot/19_send_transaction_list_email.png
diff --git a/screenshot/Screenshot_20240402_125810.png b/screenshot/1_login.png
similarity index 100%
rename from screenshot/Screenshot_20240402_125810.png
rename to screenshot/1_login.png
diff --git a/screenshot/Screenshot_20240402_131852.png b/screenshot/20_randomize_transaction.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131852.png
rename to screenshot/20_randomize_transaction.png
diff --git a/screenshot/Screenshot_20240402_132022.png b/screenshot/21_twibbon.png
similarity index 100%
rename from screenshot/Screenshot_20240402_132022.png
rename to screenshot/21_twibbon.png
diff --git a/screenshot/Screenshot_20240402_132031.png b/screenshot/22_twibbon_save.png
similarity index 100%
rename from screenshot/Screenshot_20240402_132031.png
rename to screenshot/22_twibbon_save.png
diff --git a/screenshot/Screenshot_20240402_130040.png b/screenshot/2_login_input.png
similarity index 100%
rename from screenshot/Screenshot_20240402_130040.png
rename to screenshot/2_login_input.png
diff --git a/screenshot/Screenshot_20240402_130701.png b/screenshot/3_home.png
similarity index 100%
rename from screenshot/Screenshot_20240402_130701.png
rename to screenshot/3_home.png
diff --git a/screenshot/Screenshot_20240402_131031.png b/screenshot/4_transaction_list.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131031.png
rename to screenshot/4_transaction_list.png
diff --git a/screenshot/Screenshot_20240402_131235.png b/screenshot/5_detail_transaction.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131235.png
rename to screenshot/5_detail_transaction.png
diff --git a/screenshot/Screenshot_20240402_131411.png b/screenshot/6_add_transaction.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131411.png
rename to screenshot/6_add_transaction.png
diff --git a/screenshot/Screenshot_20240402_131500.png b/screenshot/7_add_transaction_location.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131500.png
rename to screenshot/7_add_transaction_location.png
diff --git a/screenshot/Screenshot_20240402_131400.png b/screenshot/8_edit_transaction.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131400.png
rename to screenshot/8_edit_transaction.png
diff --git a/screenshot/Screenshot_20240402_131107.png b/screenshot/9_scan_options.png
similarity index 100%
rename from screenshot/Screenshot_20240402_131107.png
rename to screenshot/9_scan_options.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144951.png b/screenshot/accessibility_testing/10_transaction_location_search.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144951.png
rename to screenshot/accessibility_testing/10_transaction_location_search.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_145004.png b/screenshot/accessibility_testing/11_transaction_location_clear.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_145004.png
rename to screenshot/accessibility_testing/11_transaction_location_clear.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_145012.png b/screenshot/accessibility_testing/12_transaction_save_button.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_145012.png
rename to screenshot/accessibility_testing/12_transaction_save_button.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_145407.png b/screenshot/accessibility_testing/13_chart_container.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_145407.png
rename to screenshot/accessibility_testing/13_chart_container.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_145431.png b/screenshot/accessibility_testing/14_chart_insight_text.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_145431.png
rename to screenshot/accessibility_testing/14_chart_insight_text.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_145502.png b/screenshot/accessibility_testing/15_twibbon_camera_button.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_145502.png
rename to screenshot/accessibility_testing/15_twibbon_camera_button.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_145520.png b/screenshot/accessibility_testing/16_twibbon_retake_button.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_145520.png
rename to screenshot/accessibility_testing/16_twibbon_retake_button.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144556.png b/screenshot/accessibility_testing/1_navbar.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144556.png
rename to screenshot/accessibility_testing/1_navbar.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144501.png b/screenshot/accessibility_testing/2_home_see_all_button.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144501.png
rename to screenshot/accessibility_testing/2_home_see_all_button.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144648.png b/screenshot/accessibility_testing/3_action_bar_title.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144648.png
rename to screenshot/accessibility_testing/3_action_bar_title.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144700.png b/screenshot/accessibility_testing/4_action_bar.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144700.png
rename to screenshot/accessibility_testing/4_action_bar.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144708.png b/screenshot/accessibility_testing/5_transaction_amount.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144708.png
rename to screenshot/accessibility_testing/5_transaction_amount.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144727.png b/screenshot/accessibility_testing/6_transaction_location_button.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144727.png
rename to screenshot/accessibility_testing/6_transaction_location_button.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144738.png b/screenshot/accessibility_testing/7_transaction_delete_button.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144738.png
rename to screenshot/accessibility_testing/7_transaction_delete_button.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144750.png b/screenshot/accessibility_testing/8_transaction_edit_button.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144750.png
rename to screenshot/accessibility_testing/8_transaction_edit_button.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144910.png b/screenshot/accessibility_testing/9_transaction_text_field.png
similarity index 100%
rename from screenshot/accessibility_testing/Screenshot_20240331_144910.png
rename to screenshot/accessibility_testing/9_transaction_text_field.png
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144859.png b/screenshot/accessibility_testing/Screenshot_20240331_144859.png
deleted file mode 100644
index c9ba51e1811ac197157774474fb6a2baf42f2592..0000000000000000000000000000000000000000
Binary files a/screenshot/accessibility_testing/Screenshot_20240331_144859.png and /dev/null differ
diff --git a/screenshot/accessibility_testing/Screenshot_20240331_144922.png b/screenshot/accessibility_testing/Screenshot_20240331_144922.png
deleted file mode 100644
index 0dcc134358d52556be078eb7fb8baf25d119633c..0000000000000000000000000000000000000000
Binary files a/screenshot/accessibility_testing/Screenshot_20240331_144922.png and /dev/null differ