diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index 68daeff39..be87bcce9 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -32,9 +32,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     private static final int SELECT_BARCODE_REQUEST = 1;
 
     EditText storeFieldEdit;
-    TextView storeFieldView;
     EditText noteFieldEdit;
-    TextView noteFieldView;
     TextView cardIdFieldView;
     View cardIdDivider;
     View cardIdTableRow;
@@ -80,9 +78,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         db = new DBHelper(this);
 
         storeFieldEdit = findViewById(R.id.storeNameEdit);
-        storeFieldView = findViewById(R.id.storeNameView);
         noteFieldEdit = findViewById(R.id.noteEdit);
-        noteFieldView = findViewById(R.id.noteView);
         cardIdFieldView = findViewById(R.id.cardIdView);
         cardIdDivider = findViewById(R.id.cardIdDivider);
         cardIdTableRow = findViewById(R.id.cardIdTableRow);
@@ -129,13 +125,11 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             if(storeFieldEdit.getText().length() == 0)
             {
                 storeFieldEdit.setText(loyaltyCard.store);
-                storeFieldView.setText(loyaltyCard.store);
             }
 
             if(noteFieldEdit.getText().length() == 0)
             {
                 noteFieldEdit.setText(loyaltyCard.note);
-                noteFieldView.setText(loyaltyCard.note);
             }
 
             if(cardIdFieldView.getText().length() == 0)
@@ -151,9 +145,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             if(updateLoyaltyCard)
             {
                 setTitle(R.string.editCardTitle);
-
-                storeFieldView.setVisibility(View.GONE);
-                noteFieldView.setVisibility(View.GONE);
             }
             else
             {
@@ -168,9 +159,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         else
         {
             setTitle(R.string.addCardTitle);
-
-            storeFieldView.setVisibility(View.GONE);
-            noteFieldView.setVisibility(View.GONE);
         }
 
         if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml
index 8e2a6da93..f03f5395f 100644
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -72,14 +72,6 @@
                             android:textSize="@dimen/inputSize"
                             android:layout_toEndOf="@id/storeNameField"/>
 
-                        <TextView
-                            android:id="@+id/storeNameView"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/storeNameField"/>
                     </RelativeLayout>
 
                     <View
@@ -128,15 +120,6 @@
                             android:padding="@dimen/inputPadding"
                             android:textSize="@dimen/inputSize"
                             android:layout_toEndOf="@id/noteField"/>
-
-                        <TextView
-                            android:id="@+id/noteView"
-                            android:layout_height="wrap_content"
-                            android:layout_width="match_parent"
-                            android:padding="@dimen/inputPadding"
-                            android:textSize="@dimen/inputSize"
-                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/noteField"/>
                     </RelativeLayout>
 
                     <View