diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java
index b070b3e44..3fb0da0c6 100644
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -581,10 +581,6 @@ public class DBHelper extends SQLiteOpenHelper {
         return getLoyaltyCardCursor(database, "");
     }
 
-    public static Cursor getAllLoyaltyCardCursor(SQLiteDatabase database){
-        return database.query(LoyaltyCardDbIds.TABLE,null,null,null,null,null,null);
-    }
-
     /**
      * Returns a cursor to all loyalty cards with the filter text in either the store or note.
      *
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 04af02c06..a7854962d 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -227,7 +227,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             setContentView(R.layout.main_activity);
         }
         else{
-            setTitle(R.string.archive);
+            setTitle(R.string.archiveList);
             setContentView(R.layout.archive_activity);
         }
         // XXX color patching has to be done again after setting splash screen
diff --git a/app/src/main/res/menu/card_longclick_menu.xml b/app/src/main/res/menu/card_longclick_menu.xml
index 064832dbb..4190dce92 100644
--- a/app/src/main/res/menu/card_longclick_menu.xml
+++ b/app/src/main/res/menu/card_longclick_menu.xml
@@ -2,20 +2,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/action_copy_to_clipboard"
-        android:title="@string/copy_to_clipboard"
-        android:icon="@drawable/ic_copy"
-        android:titleCondensed="@string/copy_to_clipboard"
-        app:showAsAction="ifRoom"/>
-
-    <item
-        android:id="@+id/action_share"
-        android:title="@string/share"
-        android:icon="@drawable/ic_share"
-        android:titleCondensed="@string/share"
-        app:showAsAction="ifRoom"/>
-
     <item
         android:id="@+id/action_edit"
         android:icon="@drawable/ic_edit"
@@ -23,6 +9,32 @@
         android:titleCondensed="@string/editCardTitle"
         app:showAsAction="ifRoom"/>
 
+    <item
+        android:id="@+id/action_copy_to_clipboard"
+        android:icon="@drawable/ic_copy"
+        android:title="@string/copy_to_clipboard"
+        android:titleCondensed="@string/copy_to_clipboard"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_share"
+        android:icon="@drawable/ic_share"
+        android:title="@string/share"
+        android:titleCondensed="@string/share"
+        app:showAsAction="ifRoom"/>
+
+    <item
+        android:id="@+id/action_star"
+        android:title="@string/star"
+        android:titleCondensed="@string/star"
+        app:showAsAction="never"/>
+
+    <item
+        android:id="@+id/action_unstar"
+        android:title="@string/unstar"
+        android:titleCondensed="@string/unstar"
+        app:showAsAction="never"/>
+
     <item
         android:id="@+id/action_archive"
         android:title="@string/archive"
@@ -35,24 +47,10 @@
         android:titleCondensed="@string/unarchive"
         app:showAsAction="never"/>
 
-    <item
-        android:id="@+id/action_star"
-        android:title="@string/star"
-        android:titleCondensed="@string/star"
-        app:showAsAction="ifRoom"/>
-
-    <item
-        android:id="@+id/action_unstar"
-        android:title="@string/unstar"
-        android:titleCondensed="@string/unstar"
-        app:showAsAction="ifRoom"/>
-
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete"
         android:titleCondensed="@string/delete"
-        app:showAsAction="ifRoom"/>
-
-
+        app:showAsAction="never"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 25d409eb3..eb568fd3f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -276,6 +276,6 @@
     <string name="unarchive">Unarchive</string>
     <string name="archived">Card archived</string>
     <string name="unarchived">Card unarchived</string>
-    <string name="archiveList">Archive list</string>
+    <string name="archiveList">Archive</string>
     <string name="overflowMenu" translatable="false">Overflow menu</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
index 632c42568..001ad9d15 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java
@@ -168,15 +168,8 @@ public class LoyaltyCardCursorAdapterTest {
 
         assertEquals(3, DBHelper.getLoyaltyCardCount(mDatabase));
 
-        Cursor cursor = DBHelper.getAllLoyaltyCardCursor(mDatabase);
-        assertEquals(3, cursor.getCount());
-
-        cursor.moveToFirst();
-        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
-        cursor.moveToNext();
-        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
-        cursor.moveToNext();
-        System.out.println(LoyaltyCard.toLoyaltyCard(cursor).store);
+        Cursor cursor = DBHelper.getLoyaltyCardCursor(mDatabase, "", null, DBHelper.LoyaltyCardOrder.Alpha, DBHelper.LoyaltyCardOrderDirection.Ascending, DBHelper.LoyaltyCardArchiveFilter.Unarchived);
+        assertEquals(1, cursor.getCount());
 
         assertTrue(cursor.moveToFirst());
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
@@ -187,6 +180,9 @@ public class LoyaltyCardCursorAdapterTest {
         assertEquals(View.GONE, star.getVisibility());
         assertEquals(View.GONE, archive.getVisibility());
 
+        cursor = DBHelper.getLoyaltyCardCursor(mDatabase, "", null, DBHelper.LoyaltyCardOrder.Alpha, DBHelper.LoyaltyCardOrderDirection.Ascending, DBHelper.LoyaltyCardArchiveFilter.Archived);
+        assertEquals(2, cursor.getCount());
+
         assertTrue(cursor.moveToNext());
         loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
         assertEquals("storeB", loyaltyCard.store);