diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..7875fa9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+- OS: [e.g. Windows]
+- BundleTool Jar Version: [e.g. 1.0.0]
+- BundleTool-UI Version: [e.g. 1.0.0]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..11fc491
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
index 620676a..7b8cf25 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,51 @@
-# Bundle Tool UI - Desktop (IN DEVELOPMENT)
+<div align="center">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/iammohdzaki/AabToApk-Desktop/blob/main/assets/bundletool-white.png">
+    <img alt="BundleTool-UI logo" src="https://github.com/iammohdzaki/AabToApk-Desktop/blob/main/assets/bundleTool-black.png" width="40%">
+  </picture>
+</div>
+<br><br>
 
+<div align="center">
+
+[![CodeQL](https://github.com/iammohdzaki/BundleToolUI-Desktop/actions/workflows/codeql.yml/badge.svg)](https://github.com/iammohdzaki/BundleToolUI-Desktop/actions/workflows/codeql.yml)
+[![kotlin_lint](https://github.com/iammohdzaki/BundleToolUI-Desktop/actions/workflows/kotlin_lint.yml/badge.svg)](https://github.com/iammohdzaki/BundleToolUI-Desktop/actions/workflows/kotlin_lint.yml)
+[![Run Tests](https://github.com/iammohdzaki/BundleToolUI-Desktop/actions/workflows/workflow.yml/badge.svg)](https://github.com/iammohdzaki/BundleToolUI-Desktop/actions/workflows/workflow.yml)
+![GitHub Issues or Pull Requests](https://img.shields.io/github/issues-closed/iammohdzaki/BundleToolUI-Desktop)
+![GitHub Issues or Pull Requests](https://img.shields.io/github/issues/iammohdzaki/BundleToolUI-Desktop)
+![GitHub Release](https://img.shields.io/github/v/release/iammohdzaki/BundleToolUI-Desktop)
+![GitHub Repo stars](https://img.shields.io/github/stars/iammohdzaki/BundleToolUI-Desktop?style=flat-square)
+![GitHub commit activity](https://img.shields.io/github/commit-activity/m/iammohdzaki/BundleToolUI-Desktop)
+</div>
+
+<h1 align="center">Android APK to AAB Converter</h1>
+<div align="center">
 Bundle Tool UI - Desktop is an open-source tool built with Kotlin and Desktop Compose that allows users to convert Android App Bundles (AAB) to Android Package (APK) files using Google's [BundleTool](https://github.com/google/bundletool).
+</div>
+</br>
 
-![ATA](https://github.com/iammohdzaki/AabToApk-Desktop/blob/main/screenshots/ata.png)
+<p align="center">
+    <a href="https://github.com/iammohdzaki/BundleToolUI-Desktop/issues/new?assignees=&labels=bug&projects=&template=bug_report.md&title=%F0%9F%90%9B+Bug+Report%3A+">Report Bug</a>
+    ·
+    <a href="https://github.com/iammohdzaki/BundleToolUI-Desktop/issues/new?assignees=&labels=enhancement&projects=&template=feature_request.md&title=%F0%9F%9A%80+Feature%3A+">Request Feature</a>
+  </p>
+
+<div align="center">
+<img src='https://github.com/iammohdzaki/AabToApk-Desktop/blob/main/assets/ata.png' width=50% height=50% alt="BundleTool-UI">
+</div>
 
 ## FEATURES
+* __AAB to APK Conversion__:Convert Android App Bundles (AAB) to Android Package (APK) files.
+* __User Interface__: Simple and intuitive user interface built with Desktop Compose.
+* __Signing Configuration__: Enable users to specify signing information, including debug or release signing, keystore paths, and passwords.
+* __Platform Compatibility__: Cross-platform support for Windows,(not yet) macOS, and (in progress) Linux.
+* __Auto Save Jar Paths__: Enable users to save jar path for future use.
+* __Bundle Tool CLI Options__: Enable users to use CLI options from BundleTool.
+* __ADB Support__: Enable users to configure ADB to generate APKs based on connected device serial id.
 
-- Convert Android App Bundles (AAB) to Android Package (APK) files.
-- Simple and intuitive user interface built with Desktop Compose.
-- Cross-platform support for Windows, macOS, and Linux.
+## Getting Started
+
+To run BundleToolUI-Desktop on your system, download compressed build based on your OS and run .exe file.
 
 ## CONTRIBUTING
 
diff --git a/screenshots/ata.png b/assets/ata.png
similarity index 100%
rename from screenshots/ata.png
rename to assets/ata.png
diff --git a/assets/bundleTool-black.png b/assets/bundleTool-black.png
new file mode 100644
index 0000000..04daf3b
Binary files /dev/null and b/assets/bundleTool-black.png differ
diff --git a/assets/bundletool-white.png b/assets/bundletool-white.png
new file mode 100644
index 0000000..bff1a34
Binary files /dev/null and b/assets/bundletool-white.png differ