diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ebc7b109..570a9269 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -9,6 +9,7 @@ plugins {
     id("kotlin-kapt")
     // If you use Kotlin Parcelize, uncomment the next line:
     // id("kotlin-parcelize")
+    id("com.google.android.gms.oss-licenses-plugin")
 }
 
 android {
@@ -122,6 +123,7 @@ android {
 dependencies {
     val kotlinVersion = "1.9.0"
     val materialVersion = "1.12.0"
+    val ossLicenseVersion = "17.2.1"
     val appCompatVersion = "1.7.0"
     val roomVersion = "2.7.2"
     // val jsonVersion = "20250517"
@@ -136,6 +138,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
 
     implementation("com.google.android.material:material:$materialVersion")
+    implementation("com.google.android.gms:play-services-oss-licenses:$ossLicenseVersion")
     implementation("androidx.appcompat:appcompat:$appCompatVersion")
     // viewbinding is often not explicitly needed here if buildFeatures.viewBinding = true
     // implementation("androidx.databinding:viewbinding:7.4.1")
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/AboutUsActivity.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/AboutUsActivity.kt
index 6a3c7aa9..b726c733 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/AboutUsActivity.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/ui/AboutUsActivity.kt
@@ -1,53 +1,52 @@
-package com.jeeldobariya.passcodes.ui;
+package com.jeeldobariya.passcodes.ui
 
-import android.content.Context
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.view.WindowCompat;
+import com.jeeldobariya.passcodes.databinding.ActivityAboutUsBinding
+import com.jeeldobariya.passcodes.utils.Constant
 
-import com.jeeldobariya.passcodes.R
-import com.jeeldobariya.passcodes.databinding.ActivityAboutUsBinding;
-import com.jeeldobariya.passcodes.utils.Constant;
+import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 
-public class AboutUsActivity : AppCompatActivity() {
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.net.toUri
+
+class AboutUsActivity : AppCompatActivity() {
 
   private lateinit var binding: ActivityAboutUsBinding
-  
+
   override fun onCreate(savedInstanceState: Bundle?) {
-    val sharedPrefs = getSharedPreferences(SettingsActivity.THEME_PREFS_NAME, Context.MODE_PRIVATE)
-    val savedThemeStyle = sharedPrefs.getInt(SettingsActivity.THEME_KEY, R.style.PasscodesTheme_Default)
-    setTheme(savedThemeStyle)
-    
-    super.onCreate(savedInstanceState);
-    binding = ActivityAboutUsBinding.inflate(layoutInflater);
-    setContentView(binding.root);
-
-    // Add event onclick listener
-    addOnClickListenerOnButton();
-
-    // Make window fullscreen
-    WindowCompat.setDecorFitsSystemWindows(window, false);
+    super.onCreate(savedInstanceState)
+    binding = ActivityAboutUsBinding.inflate(layoutInflater)
+    setContentView(binding.root)
+
+    binding.toolbar.setNavigationOnClickListener {
+      onBackPressedDispatcher.onBackPressed()
+    }
+
+    // Set up button click listeners
+    setupButtonListeners()
   }
 
   private fun openBrowser(url: String) {
-    val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url));
-    startActivity(browserIntent);
+    val browserIntent = Intent(Intent.ACTION_VIEW, url.toUri())
+    startActivity(browserIntent)
   }
 
-  // Added all the onclick event listiners
-  private fun addOnClickListenerOnButton() {
-    binding.viewSecurityGuidelinesBtn.setOnClickListener {
-        openBrowser(Constant.SECURITY_GUIDE_URL);
-    };
+  private fun setupButtonListeners() {
+    binding.cardSecurityGuidelines.setOnClickListener {
+      openBrowser(Constant.SECURITY_GUIDE_URL)
+    }
+
+    binding.cardChangeLog.setOnClickListener {
+      openBrowser(Constant.CHANGELOG_URL)
+    }
 
-    binding.viewChangeLogBtn.setOnClickListener {
-        openBrowser(Constant.CHANGELOG_URL);
-    };
+    binding.cardLicense.setOnClickListener {
+      startActivity(Intent(this, OssLicensesMenuActivity::class.java))
+    }
 
-    binding.viewLicenseBtn.setOnClickListener {
-        openBrowser(Constant.LICENSE_URL);
-    };
+    binding.cardReportBug.setOnClickListener {
+      openBrowser(Constant.REPORT_BUG_URL)
+    }
   }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/jeeldobariya/passcodes/utils/Constants.kt b/app/src/main/kotlin/com/jeeldobariya/passcodes/utils/Constants.kt
index 01e41ee7..d7af1c9d 100644
--- a/app/src/main/kotlin/com/jeeldobariya/passcodes/utils/Constants.kt
+++ b/app/src/main/kotlin/com/jeeldobariya/passcodes/utils/Constants.kt
@@ -2,7 +2,7 @@ package com.jeeldobariya.passcodes.utils
 
 object Constant {
     const val REPO_URL = "https://github.com/JeelDobariya38/Passcodes"
-    const val LICENSE_URL = "https://github.com/JeelDobariya38/Passcodes/blob/main/LICENSE.txt"
+    const val REPORT_BUG_URL = "https://github.com/JeelDobariya38/password-manager/issues/new?template=bug-report.md"
     const val CHANGELOG_URL = "https://github.com/JeelDobariya38/Passcodes/blob/main/changelog.md"
     const val SECURITY_GUIDE_URL = "https://github.com/JeelDobariya38/Passcodes/blob/main/docs/security_guide.md"
 }
diff --git a/app/src/main/res/drawable/ic_article.png b/app/src/main/res/drawable/ic_article.png
new file mode 100644
index 00000000..d3498a39
Binary files /dev/null and b/app/src/main/res/drawable/ic_article.png differ
diff --git a/app/src/main/res/drawable/ic_bug_report.png b/app/src/main/res/drawable/ic_bug_report.png
new file mode 100644
index 00000000..0b6f542b
Binary files /dev/null and b/app/src/main/res/drawable/ic_bug_report.png differ
diff --git a/app/src/main/res/drawable/ic_history.png b/app/src/main/res/drawable/ic_history.png
new file mode 100644
index 00000000..8a3dec1a
Binary files /dev/null and b/app/src/main/res/drawable/ic_history.png differ
diff --git a/app/src/main/res/drawable/ic_security.png b/app/src/main/res/drawable/ic_security.png
new file mode 100644
index 00000000..874e68ef
Binary files /dev/null and b/app/src/main/res/drawable/ic_security.png differ
diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml
index f502745d..0cc2147e 100644
--- a/app/src/main/res/layout/activity_about_us.xml
+++ b/app/src/main/res/layout/activity_about_us.xml
@@ -1,103 +1,230 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:paddingTop="24dp" >
+    android:background="?attr/colorSurface"
+    tools:context=".ui.AboutUsActivity">
 
-    <com.google.android.material.textview.MaterialTextView
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/topAppBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="24sp"
-        android:text="@string/textview_aboutus_headline"
-        android:textAlignment="center"
-        android:textSize="32dp" />
+        android:background="?attr/colorSurface">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16sp"
-        android:text="@string/textview_app_description"
-        android:textAlignment="center"
-        android:textSize="16dp" />
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:navigationIcon="?attr/homeAsUpIndicator"
+            app:title="@string/textview_aboutus_headline"
+            app:titleTextColor="?attr/colorOnSurface" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <com.google.android.material.textview.MaterialTextView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="16sp"
-        android:text="@string/textview_app_warning"
-        android:textAlignment="center"
-        android:textSize="16dp" />
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="40sp"
-        android:gravity="center_horizontal"
-        android:orientation="vertical" >
-
-        <com.google.android.material.textview.MaterialTextView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="6sp"
-            android:text="@string/developer_name"
-            android:textAlignment="center"
-            android:textSize="12dp" />
+            android:orientation="vertical"
+            android:padding="16dp">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="6sp"
-            android:text="@string/designer_name"
-            android:textAlignment="center"
-            android:textSize="12dp" />
+            <com.google.android.material.textview.MaterialTextView
+                style="@style/TextAppearance.Material3.TitleMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:text="@string/textview_app_description"
+                android:textAlignment="viewStart"
+                android:textColor="?attr/colorOnSurface"/>
 
-        <com.google.android.material.textview.MaterialTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="6sp"
-            android:text="@string/code_mantainer"
-            android:textAlignment="center"
-            android:textSize="12dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="24sp"
-        android:gravity="center_horizontal"
-        android:orientation="vertical" >
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/view_security_guidelines_btn"
-            android:textColor="?attr/colorTertiary"
-            app:backgroundTint="?attr/colorTertiaryContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4sp"
-            android:text="@string/view_security_guidelines_button_text"
-            android:textSize="14dp" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/view_change_log_btn"
-            android:textColor="?attr/colorTertiary"
-            app:backgroundTint="?attr/colorTertiaryContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4sp"
-            android:text="@string/view_change_log_button_text"
-            android:textSize="14dp" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/view_license_btn"
-            android:textColor="?attr/colorTertiary"
-            app:backgroundTint="?attr/colorTertiaryContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="4sp"
-            android:text="@string/view_license_button_text"
-            android:textSize="14dp" />
-    </LinearLayout>
+            <com.google.android.material.textview.MaterialTextView
+                style="@style/TextAppearance.Material3.BodyMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="24dp"
+                android:text="@string/textview_app_warning"
+                android:textAlignment="viewStart"
+                android:textColor="?attr/colorOnSurfaceVariant"/>
+
+            <GridLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:columnCount="2"
+                android:rowCount="2"
+                android:useDefaultMargins="true">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/card_security_guidelines"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_columnWeight="1"
+                    android:clickable="true"
+                    android:focusable="true"
+                    app:cardCornerRadius="16dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="16dp"
+                        android:gravity="center">
+                        <ImageView
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:src="@drawable/ic_security"
+                            app:tint="?attr/colorPrimary"
+                            android:layout_marginBottom="8dp" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/view_security_guidelines_button_text"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+                            android:textAlignment="center"/>
+                    </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/card_change_log"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_columnWeight="1"
+                    android:clickable="true"
+                    android:focusable="true"
+                    app:cardCornerRadius="16dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="16dp"
+                        android:gravity="center">
+                        <ImageView
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:src="@drawable/ic_history"
+                            app:tint="?attr/colorPrimary"
+                            android:layout_marginBottom="8dp" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/view_change_log_button_text"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+                            android:textAlignment="center"/>
+                    </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/card_license"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_columnWeight="1"
+                    android:clickable="true"
+                    android:focusable="true"
+                    app:cardCornerRadius="16dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="16dp"
+                        android:gravity="center">
+                        <ImageView
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:src="@drawable/ic_article"
+                            app:tint="?attr/colorPrimary"
+                            android:layout_marginBottom="8dp" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/view_license_button_text"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+                            android:textAlignment="center"/>
+                    </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/card_report_bug"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_columnWeight="1"
+                    android:clickable="true"
+                    android:focusable="true"
+                    app:cardCornerRadius="16dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:padding="16dp"
+                        android:gravity="center">
+                        <ImageView
+                            android:layout_width="32dp"
+                            android:layout_height="32dp"
+                            android:src="@drawable/ic_bug_report"
+                            app:tint="?attr/colorPrimary"
+                            android:layout_marginBottom="8dp" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/report_bug_button_text"
+                            android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
+                            android:textAlignment="center"/>
+                    </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
+            </GridLayout>
+
+            <com.google.android.material.textview.MaterialTextView
+                style="@style/TextAppearance.Material3.TitleMedium"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/label_contributor"
+                android:textColor="?attr/colorOnSurface"/>
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="16dp"
+                android:layout_marginBottom="8dp">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/developer_name"
+                    android:padding="16dp"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyLarge"/>
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="16dp"
+                android:layout_marginBottom="8dp">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/designer_name"
+                    android:padding="16dp"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyLarge"/>
+            </com.google.android.material.card.MaterialCardView>
 
-</LinearLayout>
\ No newline at end of file
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="16dp">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/code_maintainer"
+                    android:padding="16dp"
+                    android:textAppearance="@style/TextAppearance.Material3.BodyLarge"/>
+            </com.google.android.material.card.MaterialCardView>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c6336819..fa0ac42b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -6,7 +6,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">Entwickelt von: Jeel Dobariya</string>
     <string name="designer_name">UI/UX Design von: Hamada Issas (Native)</string>
-    <string name="code_mantainer">Codepflege &amp; Tests: Achmad Daniel (Kudanill)</string>
+    <string name="code_maintainer">Codepflege &amp; Tests: Achmad Daniel (Kudanill)</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">Beenden</string>
@@ -35,7 +35,9 @@
     <string name="setting_button_text">Einstellungen</string>
     <string name="toggle_theme_button_text">Design wechseln</string>
     <string name="label_language_setting">Sprache: </string>
+    <string name="label_contributor">Mitwirkender: </string>
     <string name="label_theme_setting">Design: </string>
+    <string name="report_bug_button_text">Fehler melden</string>
     <string name="about_us_button_text">Über uns</string>
     <string name="view_license_button_text">Lizenz anzeigen</string>
     <string name="view_security_guidelines_button_text">Sicherheitsrichtlinien</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fb178c2e..4527ee0f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -5,7 +5,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">Desarrollado por: Dobariya Jeel</string>
     <string name="designer_name">Diseño UI/UX por: Hamada Issas (Native)</string>
-    <string name="code_mantainer">Mantenimiento de código y pruebas: Achmad Daniel (Kudanill)</string>
+    <string name="code_maintainer">Mantenimiento de código y pruebas: Achmad Daniel (Kudanill)</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">Salir</string>
@@ -34,7 +34,9 @@
     <string name="setting_button_text">Ajustes</string>
     <string name="toggle_theme_button_text">Cambiar Tema</string>
     <string name="label_language_setting">Idioma: </string>
+    <string name="label_contributor">Colaborador: </string>
     <string name="label_theme_setting">Temas: </string>
+    <string name="report_bug_button_text">Informar un error</string>
     <string name="about_us_button_text">Sobre Nosotros</string>
     <string name="view_license_button_text">Ver Licencia</string>
     <string name="view_security_guidelines_button_text">Ver Seguridad</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 506ac27b..91ca610e 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -6,7 +6,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">डेवलप किया गया: जीत डोबरिया</string>
     <string name="designer_name">यूआई/यूएक्स डिजाइन: हामदा इस्सास (नेटिव)</string>
-    <string name="code_mantainer">कोड मेंटेनेंस और टेस्टिंग: अहमद डेनियल (कुडानिल)</string>
+    <string name="code_maintainer">कोड मेंटेनेंस और टेस्टिंग: अहमद डेनियल (कुडानिल)</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">बंद करें</string>
@@ -35,7 +35,9 @@
     <string name="setting_button_text">सेटिंग्स</string>
     <string name="toggle_theme_button_text">थीम बदलें</string>
     <string name="label_language_setting">भाषा: </string>
+    <string name="label_contributor">योगदानकर्ता: </string>
     <string name="label_theme_setting">थीम: </string>
+    <string name="report_bug_button_text">रिपोर्ट बग</string>
     <string name="about_us_button_text">हमारे बारे में</string>
     <string name="view_license_button_text">लाइसेंस देखें</string>
     <string name="view_security_guidelines_button_text">सिक्योरिटी गाइडलाइंस</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 5f0c204f..6cb1c129 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -6,7 +6,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">Dikembangkan oleh: Jeel Dobariya</string>
     <string name="designer_name">Desain UI/UX oleh: Hamada Issas (Native)</string>
-    <string name="code_mantainer">Pemeliharaan &amp; Pengujian Kode: Achmad Daniel (Kudanill)</string>
+    <string name="code_maintainer">Tester: Achmad Daniel (Kudanill)</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">Keluar</string>
@@ -35,7 +35,9 @@
     <string name="setting_button_text">Pengaturan</string>
     <string name="toggle_theme_button_text">Ganti Tema</string>
     <string name="label_language_setting">Bahasa: </string>
+    <string name="label_contributor">Kontributor: </string>
     <string name="label_theme_setting">Tema: </string>
+    <string name="report_bug_button_text">Laporkan Bug</string>
     <string name="about_us_button_text">Tentang Kami</string>
     <string name="view_license_button_text">Lihat Lisensi</string>
     <string name="view_security_guidelines_button_text">Panduan Keamanan</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 1a852c6b..3bc170b9 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -6,7 +6,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">開発者：Jeel Dobariya</string>
     <string name="designer_name">UI/UXデザイン：Hamada Issas（Native）</string>
-    <string name="code_mantainer">コード管理・テスト：Achmad Daniel（Kudanill）</string>
+    <string name="code_maintainer">コード管理・テスト：Achmad Daniel（Kudanill）</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">終了</string>
@@ -35,7 +35,9 @@
     <string name="setting_button_text">設定</string>
     <string name="toggle_theme_button_text">テーマ切替</string>
     <string name="label_language_setting">言語：</string>
+    <string name="label_contributor">寄稿者: </string>
     <string name="label_theme_setting">テーマ：</string>
+    <string name="report_bug_button_text">バグ報告</string>
     <string name="about_us_button_text">アプリについて</string>
     <string name="view_license_button_text">ライセンスを見る</string>
     <string name="view_security_guidelines_button_text">セキュリティガイドライン</string>
diff --git a/app/src/main/res/values-ko/string.xml b/app/src/main/res/values-ko/string.xml
index af921d05..ad6a3a4a 100644
--- a/app/src/main/res/values-ko/string.xml
+++ b/app/src/main/res/values-ko/string.xml
@@ -6,7 +6,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">개발자: Jeel Dobariya</string>
     <string name="designer_name">UI/UX 디자인: Hamada Issas (Native)</string>
-    <string name="code_mantainer">코드 유지보수 및 테스트: Achmad Daniel (Kudanill)</string>
+    <string name="code_maintainer">코드 유지보수 및 테스트: Achmad Daniel (Kudanill)</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">종료</string>
@@ -35,7 +35,9 @@
     <string name="setting_button_text">설정</string>
     <string name="toggle_theme_button_text">테마 전환</string>
     <string name="label_language_setting">언어: </string>
+    <string name="label_contributor">기여자: </string>
     <string name="label_theme_setting">테마: </string>
+    <string name="report_bug_button_text">버그 보고</string>
     <string name="about_us_button_text">앱 정보</string>
     <string name="view_license_button_text">라이선스 보기</string>
     <string name="view_security_guidelines_button_text">보안 지침 보기</string>
diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml
index ef756684..22e8b872 100644
--- a/app/src/main/res/values-kr/strings.xml
+++ b/app/src/main/res/values-kr/strings.xml
@@ -5,7 +5,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">Jaejak: Dobariya Jeel</string>
     <string name="designer_name">UI/UX Design: Hamada Issas (Native)</string>
-    <string name="code_mantainer">Code Maintenance &amp; Test: Achmad Daniel (Kudanill)</string>
+    <string name="code_maintainer">Code Maintenance &amp; Test: Achmad Daniel (Kudanill)</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">Jeolryo</string>
@@ -34,7 +34,9 @@
     <string name="setting_button_text">Seoljeong</string>
     <string name="toggle_theme_button_text">Tema Byeongyeong</string>
     <string name="label_language_setting">Eon-eo: </string>
+    <string name="label_contributor">Gibuja: </string>
     <string name="label_theme_setting">Tema: </string>
+    <string name="report_bug_button_text">Beogeu Singo</string>
     <string name="about_us_button_text">Ulineun Nuguinga</string>
     <string name="view_license_button_text">Laiseonse Bogi</string>
     <string name="view_security_guidelines_button_text">Anjeon Jichim Bogi</string>
diff --git a/app/src/main/res/values-vi/string.xml b/app/src/main/res/values-vi/string.xml
index e72ab62b..d7de7e75 100644
--- a/app/src/main/res/values-vi/string.xml
+++ b/app/src/main/res/values-vi/string.xml
@@ -6,7 +6,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">Phát triển bởi: Jeel Dobariya</string>
     <string name="designer_name">Thiết kế UI/UX: Hamada Issas (Native)</string>
-    <string name="code_mantainer">Bảo trì &amp; Kiểm thử mã: Achmad Daniel (Kudanill)</string>
+    <string name="code_maintainer">Bảo trì &amp; Kiểm thử mã: Achmad Daniel (Kudanill)</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">Thoát</string>
@@ -35,7 +35,9 @@
     <string name="setting_button_text">Cài đặt</string>
     <string name="toggle_theme_button_text">Chuyển giao diện</string>
     <string name="label_language_setting">Ngôn ngữ: </string>
+    <string name="label_contributor">Người đóng góp: </string>
     <string name="label_theme_setting">Giao diện: </string>
+    <string name="report_bug_button_text">Báo cáo lỗi</string>
     <string name="about_us_button_text">Giới thiệu</string>
     <string name="view_license_button_text">Xem giấy phép</string>
     <string name="view_security_guidelines_button_text">Hướng dẫn bảo mật</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index fa1d75f7..e83c5932 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -6,7 +6,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">开发者：Jeel Dobariya</string>
     <string name="designer_name">UI/UX 设计：Hamada Issas（Native）</string>
-    <string name="code_mantainer">代码维护与测试：Achmad Daniel（Kudanill）</string>
+    <string name="code_maintainer">代码维护与测试：Achmad Daniel（Kudanill）</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">退出</string>
@@ -35,7 +35,9 @@
     <string name="setting_button_text">设置</string>
     <string name="toggle_theme_button_text">切换主题</string>
     <string name="label_language_setting">语言：</string>
+    <string name="label_contributor">贡献者: </string>
     <string name="label_theme_setting">主题：</string>
+    <string name="report_bug_button_text">报告错误</string>
     <string name="about_us_button_text">关于我们</string>
     <string name="view_license_button_text">查看许可证</string>
     <string name="view_security_guidelines_button_text">查看安全指南</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 17c6e12b..6f99dbdb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <!-- Contributor Names -->
     <string name="developer_name">Developed by: Dobariya Jeel</string>
     <string name="designer_name">UI/UX Design by: Hamada Issas (Native)</string>
-    <string name="code_mantainer">Code Maintenance &amp; Testing: Achmad Daniel (Kudanill)</string>
+    <string name="code_maintainer">Code Maintenance &amp; Testing: Achmad Daniel (Kudanill)</string>
 
     <!-- Main Activity -->
     <string name="quit_button_text">Quit</string>
@@ -35,10 +35,12 @@
     <string name="setting_button_text">Settings</string>
     <string name="toggle_theme_button_text">Toggle Theme</string>
     <string name="label_language_setting">Language: </string>
+    <string name="label_contributor">Contributor: </string>
     <string name="label_theme_setting">Themes: </string>
+    <string name="report_bug_button_text">Report Bug</string>
     <string name="about_us_button_text">About Us</string>
     <string name="view_license_button_text">View License</string>
-    <string name="view_security_guidelines_button_text">View Security Guidelines</string>
+    <string name="view_security_guidelines_button_text">Security Guidelines</string>
     <string name="view_change_log_button_text">View Changelog</string>
 
     <!-- Headline of Activity -->
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e6814d9b..39b506a9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,13 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal() // Recommended for fetching Gradle plugins
     }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "com.google.android.gms.oss-licenses-plugin") {
+                useModule("com.google.android.gms:oss-licenses-plugin:0.10.6")
+            }
+        }
+    }
 }
 
 // Defines all modules in your project