diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/TestUtils.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/TestUtils.java
index 4425ad673..0812e2e82 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/TestUtils.java
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/TestUtils.java
@@ -1,6 +1,7 @@
 package org.kiwix.kiwixmobile.testutils;
 
 import android.Manifest;
+import android.app.LauncherActivity;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.support.test.InstrumentationRegistry;
@@ -42,13 +43,17 @@ public class TestUtils {
   }
 
   public static Matcher<Object> withContent(final String content) {
-    return new BoundedMatcher<Object, Book>(Book.class) {
+    return new BoundedMatcher<Object, Object>(Object.class) {
       @Override
-      public boolean matchesSafely(Book myObj) {
-        if (myObj.getUrl() != null) {
-          return myObj.getUrl().contains(content);
+      public boolean matchesSafely(Object myObj) {
+        if (!(myObj instanceof Book)) {
+          return false;
+        }
+        Book book = (Book) myObj;
+        if (book.getUrl() != null) {
+          return book.getUrl().contains(content);
         } else {
-          return myObj.file.getPath().contains(content);
+          return book.file.getPath().contains(content);
         }
       }
 
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/library/LibraryAdapter.java b/app/src/main/java/org/kiwix/kiwixmobile/library/LibraryAdapter.java
index 4fc1b7191..6fdb53c0f 100755
--- a/app/src/main/java/org/kiwix/kiwixmobile/library/LibraryAdapter.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/library/LibraryAdapter.java
@@ -107,7 +107,7 @@ public class LibraryAdapter extends BaseAdapter {
 
   @Override
   public Object getItem(int i) {
-    return listItems.get(i);
+    return listItems.get(i).data;
   }
 
   @Override
@@ -118,6 +118,9 @@ public class LibraryAdapter extends BaseAdapter {
   @Override
   public View getView(int position, View convertView, ViewGroup parent) {
     ViewHolder holder;
+    if (position + 1 >= listItems.size()) {
+      return convertView;
+    }
     ListItem item = listItems.get(position);
 
     if (item.type == LIST_ITEM_TYPE_BOOK) {
@@ -248,9 +251,9 @@ public class LibraryAdapter extends BaseAdapter {
             .filter(book -> !LibraryFragment.downloadingBooks.contains(book))
             .toList().toBlocking().single();
 
-        listItems.add(new ListItem("In your language:", LIST_ITEM_TYPE_DIVIDER));
+        listItems.add(new ListItem(context.getResources().getString(R.string.your_languages), LIST_ITEM_TYPE_DIVIDER));
         addBooks(selectedLanguages);
-        listItems.add(new ListItem("In other languages:", LIST_ITEM_TYPE_DIVIDER));
+        listItems.add(new ListItem(context.getResources().getString(R.string.other_languages), LIST_ITEM_TYPE_DIVIDER));
         addBooks(unselectedLanguages);
       } else {
         List<Book> selectedLanguages = Observable.from(allBooks)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 625e1d674..e97230f84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -187,4 +187,6 @@
   <string name="external_link_popup_dialog_title">Entering External Link</string>
   <string name="external_link_popup_dialog_message">You are entering an external link. This could lead to additional costs for data transfer or will just not work when you are offline. Do you want to continue?</string>
   <string name="do_not_ask_anymore">Do not ask anymore</string>
+  <string name="your_languages">Selected languages:</string>
+  <string name="other_languages">Other languages:</string>
 </resources>