diff --git a/README.md b/README.md
index b5559152c63414d19131399a9d187e2f61ebf8ce..ff20adac7bf29765dc392868b99d706a74c4ddf1 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,112 @@
-# IF3210-2024-Android-DGR
-
-
-
-## OWASP ANALYSIS
+<!-- LOGO -->
+<br />
+<div align="center">
+  <image src="assets%2Fic_bondoman_logo.png" alt="Logo" width="120" height="120">
+
+  <h3 align="center">BondoMan</h3>
+
+  <p align="center">
+    Tubes 1 of Platform-Based Application Development (IF2211) 
+    <br />
+    <br />
+  </p>
+</div>
+
+<!-- TABLE OF CONTENTS -->
+<details>
+  <summary>Table of Contents</summary>
+  <ol>
+    <li>
+        <a href="#about-the-project">About The Project</a>
+        <ul>
+            <li><a href="#specification">Specification</a></li>
+            <li><a href="#built-with">Built With</a></li>
+            <li><a href="#owasp">OWASP</a></li>
+        </ul>
+    </li>
+    <li>
+        <a href="#usage">How to Use?</a>
+    </li>
+    <li>
+        <a href="#authors">Author</a>
+    </li>
+  </ol>
+</details>
+<br/>
+<br/>
+
+<!-- ABOUT THE PROJECT -->
+## About The Project
+
+<image src="assets%2Fbondoman-preview.jpg" alt="Logo" width="250">
+
+Tubes 1 of Tubes 1 of Platform-Based Application Development (IF2211). A financial management app to track income, expense, and saving transactions. 
+<br/>
+<br/>
+
+### Specification
+
+* Navigation
+  * Header
+  * Bottom navigation bar
+* Authentication
+  * Login
+  * Background service that checks JWT expiration 
+  * Logout
+* Transaction CRUD
+  * View transaction details including its location using Google Maps
+  * Add new transaction with automated date and location data
+  * Update transaction
+  * Delete transaction
+* List of transactions
+  * Transaction data are stored locally in a Room database
+  * View all transactions as transaction list
+  * Overall statistics including balance, cashflow, and growth
+  * Display list using recycler view for optimization
+* Bill scan
+  * Add a new transaction entry by capturing a physical bill using a android's camera (Dummy OCR)
+* Graphs
+  * Statistics are represented by graphic charts
+  * The statistics include total income, expenses, and savings within each period of time, displayed using line charts
+* Export
+  * Transaction data can be exported into a spreadsheet with the format of .xlsx or .xls
+* Share
+  * Transaction data can be shared through GMail as a spreadsheet file with the format of .xlsx or .xls
+* Network sensing
+  * Bondoman uses semi-online system that lets user use the app without having to be always connected to the internet 
+  * Bondoman can detect current network status and alert the user if internet connection is unavailable
+* Broadcast receiver
+  * Preferences settings includes randomize transaction to set a random initial data whenever user add a new transaction
+* Profile
+  * [BONUS] User can customize their profile, including profile picture with optional twibbon overlay
+* Security
+  * [BONUS] OWASP analysis
+<br/>
+<br/>
+
+### Built with
+
+#### Tech stack
+* ![Kotlin][Kotlin]
+
+#### Libraries
+* Jetpack Compose
+* KSP
+* Dagger Hilt
+* Safe Args
+* Life Cycle
+* Retrofit
+* Moshi
+* OkHTTP3
+* Room
+* CameraX
+* AndroidMP
+* GMS
+* POI
+<br/>
+<br/>
+
+### OWASP Analysis
 OWASP analysis is a security analysis that is used to identify the security risks in an application. The analysis is based on the OWASP Top 10, which is a list of the 10 most critical security risks in web applications. The analysis is performed by scanning the application for vulnerabilities and then reporting on the findings. The goal of the analysis is to identify and fix any security risks in the application before they can be exploited by attackers.
 
 in this project we will analyze:
@@ -13,7 +117,7 @@ in this project we will analyze:
 Let's start the analysis!
 
 
-### 1. Insufficient Input/Output Validation
+#### **1. Insufficient Input/Output Validation**
 Insufficient input/output validation is a security risk that occurs when an application does not properly validate user input or output. This can lead to a variety of security risks, including injection attacks, cross-site scripting, and other vulnerabilities. To mitigate this risk, it is important to validate all user input and output to ensure that it is safe and secure.
 in this part i will make an example of insufficient input/output validation with the following part below:
 
@@ -21,22 +125,23 @@ in this part i will make an example of insufficient input/output validation with
 
 we will make an example with fill the email and password with "1'or'1'='1" to show all user that registered in the application.
 
-![input_ouput_insufficient_1.png](assets%2Finput_ouput_insufficient_1.png)
+<image src="assets%2Finput_ouput_insufficient_1.png" width="250">
 
 API will response some issue that inform the email and password is invalid and the user can't login to the application. without appearing all user that registered in the application.
 
-![input_ouput_insufficient_2.png](assets%2Finput_ouput_insufficient_2.png)
+<image src="assets%2Finput_ouput_insufficient_2.png" height="250">
 
 **b. improper or no input validation**
 
 in this part we will not filling anything in page new transaction and click the button "Add Transaction" to show the error message that inform the user to fill the form.
 
-![input_ouput_insufficient_3.png](assets%2Finput_ouput_insufficient_3.png)
+<image src="assets%2Finput_ouput_insufficient_3.png" width="250">
 
 the application will show toast message that inform the user to fill the form and the application still running and not crash.
+<br />
+<br />
 
-
-### 2. Security Misconfiguration
+#### **2. Security Misconfiguration**
 
 Security misconfiguration is a security risk that occurs when an application is not properly configured to protect against security threats. This can include things like default passwords, unnecessary services, and other configuration issues that can be exploited by attackers. To mitigate this risk, it is important to ensure that the application is properly configured and that all security settings are up to date.
 
@@ -44,13 +149,14 @@ In this part i will make an example of security misconfiguration about make an n
 
 in this application the user should give the permission to access the camera and location to use the feature in the application. if the user not give the permission the application will not run the feature that need the permission.
 
-
-![missconfiguration_security_1.png](assets%2Fmissconfiguration_security_1.png)  ![missconfiguration_security_2.png](assets%2Fmissconfiguration_security_2.png)
+<image src="assets%2Fmissconfiguration_security_1.png" width="250">
+<image src="assets%2Fmissconfiguration_security_2.png" width="250">
 
 so for what is the feature that need the permission, its because to ensure the user data is safe and secure. the application will not access the camera and location without the user permission.
+<br/>
+<br/>
 
-
-### 3. Insecure Data Storage
+#### **3. Insecure Data Storage**
 
 Insecure data storage is a security risk that occurs when an application does not properly store sensitive data. This can include things like storing passwords in plain text, using weak encryption, or not properly securing data at rest. To mitigate this risk, it is important to ensure that all sensitive data is properly encrypted and stored securely.
 
@@ -58,15 +164,273 @@ In this application that have 2 important data that need to be stored securely,
 the email and token JWT will be stored in root directory with random name and encrypted with RSA encryption by keystore.
 so the token and the email will be stored securely and can't be accessed by other application without key.
 
-![insecure_datastore_1.png](assets%2Finsecure_datastore_1.png)
-![insecure_datastore_2.png](assets%2Finsecure_datastore_2.png)
+<image src="assets%2Finsecure_datastore_1.png" height="250">
+
+<image src="assets%2Finsecure_datastore_2.png" height="250">
 
 if the user fill something in the email and token file application will denied the access to the file and the application will not crash, but it will go to login page instead.
 
 like this example below:
-![insecure_datastore_3.png](assets%2Finsecure_datastore_3.png)
-![insecure_datastore_4.png](assets%2Finsecure_datastore_4.png)
+<image src="assets%2Finsecure_datastore_3.png" height="250">
+
+<image src="assets%2Finsecure_datastore_4.png" height="250">
 
 and the application will response like this:
-![insecure_datastore_5.png](assets%2Finsecure_datastore_5.png)
-![insecure_datastore_6.png](assets%2Finsecure_datastore_6.png)
\ No newline at end of file
+<image src="assets%2Finsecure_datastore_5.png" height="250">
+
+<image src="assets%2Finsecure_datastore_6.png" width="250">
+<br/>
+<br/>
+
+## How To Use
+### 1. Login
+<image src="assets%2Fhtu-splash_screen.jpg" width="250">
+<image src="assets%2Fhtu-login.jpg" width="250">
+<image src="assets%2Fhtu-transaction_list.jpg" width="250">
+<br />
+
+### 2. View transaction list
+<image src="assets%2Fhtu-transaction_list.jpg" width="250">
+<br />
+
+### 3. Add new transaction
+<image src="assets%2Fhtu-transaction_list.jpg" width="250">
+<image src="assets%2Fhtu-new_transaction.jpg" width="250">
+<image src="assets%2Fhtu-new_transaction_submit.jpg" width="250">
+<br />
+
+### 4. View transaction detail
+<image src="assets%2Fhtu-new_transaction_submit.jpg" width="250">
+<image src="assets%2Fhtu-transaction_detail.jpg" width="250">
+<image src="assets%2Fhtu-map.jpg" width="250">
+<br />
+
+### 5. Edit transaction detail
+<image src="assets%2Fhtu-new_transaction_submit.jpg" width="250">
+<image src="assets%2Fhtu-edit_transaction.jpg" width="250">
+<image src="assets%2Fhtu-edit_submitted.jpg" width="250">
+<br />
+
+### 6. Delete transaction
+<image src="assets%2Fhtu-edit_submitted.jpg" width="250">
+<image src="assets%2Fhtu-delete_confirm.jpg" width="250">
+<image src="assets%2Fhtu-delete_success.jpg" width="250">
+<br />
+
+### 7. Scan bill
+<image src="assets%2Fhtu-scan.jpg" width="250">
+<image src="assets%2Fhtu-scan_sucess.jpg" width="250">
+<br />
+
+### 8. View statistics
+<image src="assets%2Fhtu-statistics.jpg" width="250">
+<br />
+
+### 9. Settings
+<image src="assets%2Fhtu-settings.jpg" width="250">
+<br />
+<br />
+
+## Author
+
+| NIM | Name | 
+| :---: | :--- |
+| 10023509 | M. Surya Dharma Khazinatul Azror | 
+| 13521019 | Ditra Rizqa Amadia | 
+| 13521005 | Bernardus Willson | 
+| 13521005 | Fahrian Afdholi | 
+
+<table>
+  <tr>
+    <th>Task item</th>
+    <th>Contributors</th>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Design</td>  
+    <td>Ditra Amadia</td>
+  </tr>
+  <tr>
+    <td>Surya Azror</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Splash screen page</td>
+    <td>Surya Azror</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Login page</td>
+    <td>Bernardus Willson</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Navigation components</td>
+    <td>Ditra Amadia</td>
+  </tr>
+
+  <tr>
+    <td rowspan="3">Transaction page</td>
+    <td>Ditra Amadia</td>
+  </tr>
+  <tr>
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Transaction details page</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Scan page</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Add trasaction page</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Statistics page</td>  
+    <td>Ditra Amadia</td>
+  </tr>
+  <tr>
+    <td>Bernardus Willson</td>
+  </tr>
+
+  <tr>
+    <td rowspan="3">Settings page</td>  
+    <td>Ditra Amadia</td>
+  </tr>
+  <tr>
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Profile page</td>  
+    <td>Ditra Amadia</td>
+  </tr>
+  <tr>
+    <td>Bernardus Willson</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Authentication</td>  
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="3">Navigation</td>  
+    <td>Ditra Amadia</td>
+  </tr>
+  <tr>
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Transaction list</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Create transaction</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">View transaction detail</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Edit transaction detail</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Delete transaction</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Bill scanning</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+  <tr>
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Statistics</td>  
+    <td>Bernardus Willson</td>
+  </tr>
+
+  <tr>
+    <td rowspan="2">Edit profile</td>  
+    <td>Ditra Amadia</td>
+  </tr>
+  <tr>
+    <td>Bernardus Willson</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Export data</td>  
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Share data</td>  
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Randomize data</td>  
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">End To End Testing</td>  
+    <td>Surya Azror</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">Documentation</td>  
+    <td>Ditra Amadia</td>
+  </tr>
+
+  <tr>
+    <td rowspan="1">OWASP Analysis</td>  
+    <td>Fahrian Afdholi</td>
+  </tr>
+
+</table>
+
+<!-- MARKDOWN LINKS & IMAGES -->
+<!-- https://www.markdownguide.org/basic-syntax/#reference-style-links -->
+[Kotlin]: https://img.shields.io/badge/kotlin-%237F52FF.svg?style=for-the-badge&logo=kotlin&logoColor=white
\ No newline at end of file
diff --git a/app/src/main/java/com/example/transactionapp/ui/screen/login/LoginActivity.kt b/app/src/main/java/com/example/transactionapp/ui/screen/login/LoginActivity.kt
index 3892c931827b3d4e12ef90f3852a5808e9b7fa04..4ea60858de3d37ef3b74f5ae3de014a8b7c38d11 100644
--- a/app/src/main/java/com/example/transactionapp/ui/screen/login/LoginActivity.kt
+++ b/app/src/main/java/com/example/transactionapp/ui/screen/login/LoginActivity.kt
@@ -64,7 +64,7 @@ class LoginActivity : AppCompatActivity() {
 
                 }
                 is LoginResponseSealed.Error -> {
-                    Toast.makeText(this, data.message, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this, "Account not found", Toast.LENGTH_SHORT).show()
                 }
                 is LoginResponseSealed.Loading -> {}
             }
diff --git a/app/src/main/java/com/example/transactionapp/ui/screen/mainmenu/MainActivity.kt b/app/src/main/java/com/example/transactionapp/ui/screen/mainmenu/MainActivity.kt
index dfd73aa1fc1989d8100ddf487a36a99bb466c62b..173a16c11594edd8d2da0d4727e512461e2c60b7 100644
--- a/app/src/main/java/com/example/transactionapp/ui/screen/mainmenu/MainActivity.kt
+++ b/app/src/main/java/com/example/transactionapp/ui/screen/mainmenu/MainActivity.kt
@@ -121,6 +121,7 @@ class MainActivity : AppCompatActivity() {
                 db.getStatisticByMonth(Date())
                 
                 navController.navigate(R.id.transaction)
+                navigationViewModel.navigate("transaction")
                 db.resetAddTransactionStatus()
                 db.changeAddStatus(false)
             }
diff --git a/assets/bondoman-preview.jpg b/assets/bondoman-preview.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1e9f5f814cd21abfff2eb0b01426e51c0d652f6f
Binary files /dev/null and b/assets/bondoman-preview.jpg differ
diff --git a/assets/htu-delete_confirm.jpg b/assets/htu-delete_confirm.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c3155ce72e0b791eec6066532be7a5282f30a318
Binary files /dev/null and b/assets/htu-delete_confirm.jpg differ
diff --git a/assets/htu-delete_success.jpg b/assets/htu-delete_success.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fb2d196ad204bea64afa2bc25c4a932ed1e1bd53
Binary files /dev/null and b/assets/htu-delete_success.jpg differ
diff --git a/assets/htu-edit_submitted.jpg b/assets/htu-edit_submitted.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..da6a38e4833bf6c3b29db788e66911fe37757608
Binary files /dev/null and b/assets/htu-edit_submitted.jpg differ
diff --git a/assets/htu-edit_transaction.jpg b/assets/htu-edit_transaction.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c09691254528bcafab6d220db8e76884df2e3729
Binary files /dev/null and b/assets/htu-edit_transaction.jpg differ
diff --git a/assets/htu-login.jpg b/assets/htu-login.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e4de27932e8a46232bbf32fdac712f7be8ad38fe
Binary files /dev/null and b/assets/htu-login.jpg differ
diff --git a/assets/htu-map.jpg b/assets/htu-map.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b94cec5760debb993eb365a7ba978d9e1ff7f02b
Binary files /dev/null and b/assets/htu-map.jpg differ
diff --git a/assets/htu-new_transaction.jpg b/assets/htu-new_transaction.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a2be70b4feeeaaf7c348d24a5bbcc7f3a9d18ef9
Binary files /dev/null and b/assets/htu-new_transaction.jpg differ
diff --git a/assets/htu-new_transaction_submit.jpg b/assets/htu-new_transaction_submit.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2e9641624a8107487335160123af57acfe11d68b
Binary files /dev/null and b/assets/htu-new_transaction_submit.jpg differ
diff --git a/assets/htu-scan.jpg b/assets/htu-scan.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6477ffdddef4ae137dbcd31a5d59b8e924329096
Binary files /dev/null and b/assets/htu-scan.jpg differ
diff --git a/assets/htu-scan_sucess.jpg b/assets/htu-scan_sucess.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..09b26434376840b5023bbc6930dc0b95560ee5aa
Binary files /dev/null and b/assets/htu-scan_sucess.jpg differ
diff --git a/assets/htu-settings.jpg b/assets/htu-settings.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a4c980840eaa8d369cd7a2ddade182274b8de493
Binary files /dev/null and b/assets/htu-settings.jpg differ
diff --git a/assets/htu-splash_screen.jpg b/assets/htu-splash_screen.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..56aadfd7afa261e877e78e53d31a76a4dd61650a
Binary files /dev/null and b/assets/htu-splash_screen.jpg differ
diff --git a/assets/htu-statistics.jpg b/assets/htu-statistics.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a4ed9e13a158ec4db1147ca9e901519465a9935d
Binary files /dev/null and b/assets/htu-statistics.jpg differ
diff --git a/assets/htu-transaction_detail.jpg b/assets/htu-transaction_detail.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7f3b2997f99328414cfbe10a996dfd09ac4c8b4f
Binary files /dev/null and b/assets/htu-transaction_detail.jpg differ
diff --git a/assets/htu-transaction_list.jpg b/assets/htu-transaction_list.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5b7c90c5466b3d68290309f64c4eb4a05253eead
Binary files /dev/null and b/assets/htu-transaction_list.jpg differ
diff --git a/assets/ic_bondoman_logo.png b/assets/ic_bondoman_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..be11a9f8d8f6362b29e48bf66b67e831ac489877
Binary files /dev/null and b/assets/ic_bondoman_logo.png differ