diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt
index 856d84e9c..cac53e329 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/error/ErrorActivityScreen.kt
@@ -95,13 +95,13 @@ fun ErrorActivityScreen(
         horizontalArrangement = Arrangement.SpaceEvenly
       ) {
         KiwixButton(
-          buttonTextId = R.string.crash_button_confirm,
+          buttonText = stringResource(R.string.crash_button_confirm),
           clickListener = { sendDetailsButtonClickListener.invoke() },
         )
 
         KiwixButton(
           clickListener = { noThanksButtonClickListener.invoke() },
-          buttonTextId = R.string.no_thanks
+          buttonText = stringResource(R.string.no_thanks)
         )
       }
     }
@@ -151,7 +151,7 @@ private fun CrashCheckBoxList(
 ) {
   LazyColumn(modifier = modifier) {
     itemsIndexed(checkBoxData) { _, item ->
-      CrashCheckBox(item.first to item.second)
+      CrashCheckBox(item)
     }
   }
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialogScreen.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialogScreen.kt
index 47809e15a..c6ed050bc 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialogScreen.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialogScreen.kt
@@ -69,7 +69,8 @@ fun AddNoteDialogScreen(
 ) {
   KiwixDialogTheme {
     Scaffold(
-      snackbarHost = { KiwixSnackbarHost(snackbarHostState = snackBarHostState) }
+      snackbarHost = { KiwixSnackbarHost(snackbarHostState = snackBarHostState) },
+      topBar = { KiwixAppBar(R.string.note, navigationIcon, actionMenuItems) }
     ) { paddingValues ->
       Column(
         modifier = Modifier
@@ -78,7 +79,6 @@ fun AddNoteDialogScreen(
           .imePadding()
           .padding(paddingValues),
       ) {
-        KiwixAppBar(R.string.note, navigationIcon, actionMenuItems)
         ArticleTitleText(articleTitle)
         HorizontalDivider(
           modifier = Modifier.padding(vertical = FIVE_DP),