diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 6877b137..c4b759ce 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -21,6 +21,7 @@
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.integration.android.IntentIntegrator;
@@ -74,9 +75,12 @@ public void onResume()
             }
         }
 
-        final EditText storeField = (EditText) findViewById(R.id.storeName);
-        final EditText noteField = (EditText) findViewById(R.id.note);
-        final EditText cardIdField = (EditText) findViewById(R.id.cardId);
+        final EditText storeFieldEdit = (EditText) findViewById(R.id.storeNameEdit);
+        final TextView storeFieldView = (TextView) findViewById(R.id.storeNameView);
+        final EditText noteFieldEdit = (EditText) findViewById(R.id.noteEdit);
+        final TextView noteFieldView = (TextView) findViewById(R.id.noteView);
+        final EditText cardIdFieldEdit = (EditText) findViewById(R.id.cardIdEdit);
+        final TextView cardIdFieldView = (TextView) findViewById(R.id.cardIdView);
         final EditText barcodeTypeField = (EditText) findViewById(R.id.barcodeType);
         final ImageView barcodeImage = (ImageView) findViewById(R.id.barcode);
         final View barcodeIdLayout = findViewById(R.id.barcodeIdLayout);
@@ -95,19 +99,22 @@ public void onResume()
         {
             final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
 
-            if(storeField.getText().length() == 0)
+            if(storeFieldEdit.getText().length() == 0)
             {
-                storeField.setText(loyaltyCard.store);
+                storeFieldEdit.setText(loyaltyCard.store);
+                storeFieldView.setText(loyaltyCard.store);
             }
 
-            if(noteField.getText().length() == 0)
+            if(noteFieldEdit.getText().length() == 0)
             {
-                noteField.setText(loyaltyCard.note);
+                noteFieldEdit.setText(loyaltyCard.note);
+                noteFieldView.setText(loyaltyCard.note);
             }
 
-            if(cardIdField.getText().length() == 0)
+            if(cardIdFieldEdit.getText().length() == 0)
             {
-                cardIdField.setText(loyaltyCard.cardId);
+                cardIdFieldEdit.setText(loyaltyCard.cardId);
+                cardIdFieldView.setText(loyaltyCard.cardId);
             }
 
             if(barcodeTypeField.getText().length() == 0)
@@ -115,15 +122,13 @@ public void onResume()
                 barcodeTypeField.setText(loyaltyCard.barcodeType);
             }
 
-            if(viewLoyaltyCard)
-            {
-                storeField.setEnabled(false);
-                noteField.setEnabled(false);
-            }
-
             if(updateLoyaltyCard)
             {
                 setTitle(R.string.editCardTitle);
+
+                storeFieldView.setVisibility(View.GONE);
+                noteFieldView.setVisibility(View.GONE);
+                cardIdFieldView.setVisibility(View.GONE);
             }
             else
             {
@@ -132,25 +137,33 @@ public void onResume()
                 saveButton.setVisibility(View.GONE);
                 cancelButton.setVisibility(View.GONE);
                 setTitle(R.string.viewCardTitle);
+
+                storeFieldEdit.setVisibility(View.GONE);
+                noteFieldEdit.setVisibility(View.GONE);
+                cardIdFieldEdit.setVisibility(View.GONE);
             }
         }
         else
         {
             setTitle(R.string.addCardTitle);
+
+            storeFieldView.setVisibility(View.GONE);
+            noteFieldView.setVisibility(View.GONE);
+            cardIdFieldView.setVisibility(View.GONE);
         }
 
-        if(cardIdField.getText().length() == 0)
+        if(cardIdFieldEdit.getText().length() == 0)
         {
             barcodeIdLayout.setVisibility(View.GONE);
         }
 
         barcodeTypeLayout.setVisibility(View.GONE);
 
-        if(cardIdField.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
+        if(cardIdFieldEdit.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
         {
             String formatString = barcodeTypeField.getText().toString();
             final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
-            final String cardIdString = cardIdField.getText().toString();
+            final String cardIdString = cardIdFieldEdit.getText().toString();
 
             if(barcodeImage.getHeight() == 0)
             {
@@ -218,9 +231,9 @@ public void onClick(View v)
             @Override
             public void onClick(final View v)
             {
-                String store = storeField.getText().toString();
-                String note = noteField.getText().toString();
-                String cardId = cardIdField.getText().toString();
+                String store = storeFieldEdit.getText().toString();
+                String note = noteFieldEdit.getText().toString();
+                String cardId = cardIdFieldEdit.getText().toString();
                 String barcodeType = barcodeTypeField.getText().toString();
 
                 if(store.isEmpty())
@@ -364,8 +377,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent)
             Log.i(TAG, "Read barcode id: " + contents);
             Log.i(TAG, "Read format: " + format);
 
-            final EditText cardIdField = (EditText) findViewById(R.id.cardId);
-            cardIdField.setText(contents);
+            for(TextView view : new TextView[]{
+                    (EditText) findViewById(R.id.cardIdEdit),
+                    (TextView) findViewById(R.id.cardIdView)})
+            {
+                view.setText(contents);
+            }
+
             final EditText barcodeTypeField = (EditText) findViewById(R.id.barcodeType);
             barcodeTypeField.setText(format);
             onResume();
diff --git a/app/src/main/res/layout/loyalty_card_view_activity.xml b/app/src/main/res/layout/loyalty_card_view_activity.xml
index c42b0213..aeead689 100644
--- a/app/src/main/res/layout/loyalty_card_view_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_view_activity.xml
@@ -29,79 +29,92 @@
                       android:layout_width="fill_parent"
                       android:layout_height="wrap_content">
             <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
+                          android:padding="10dip"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
-                <TextView android:textSize="16.0sp"
+                <TextView android:textSize="@dimen/text_size_medium"
                           android:textStyle="bold"
                           android:layout_gravity="center_vertical"
-                          android:paddingStart="20.0dip"
-                          android:paddingEnd="20.0dip"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
+                          android:paddingStart="20.0dip"
+                          android:paddingEnd="20.0dip"
                           android:labelFor="@+id/storeName"
                           android:text="@string/storeName" />
-                <LinearLayout android:orientation="vertical"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content">
-                    <EditText android:id="@+id/storeName"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content"
-                              android:inputType="text"/>
-                </LinearLayout>
+                <EditText android:id="@+id/storeNameEdit"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:inputType="text"
+                          android:textSize="@dimen/text_size_medium"/>
+                <TextView android:id="@+id/storeNameView"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:paddingTop="10dip"
+                          android:paddingBottom="10dip"
+                          android:textSize="@dimen/text_size_medium"
+                          android:textIsSelectable="true"/>
             </LinearLayout>
             <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
+                          android:padding="10dip"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content">
-                <TextView android:textSize="16.0sp"
+                <TextView android:textSize="@dimen/text_size_medium"
                           android:textStyle="bold"
                           android:layout_gravity="center_vertical"
-                          android:paddingStart="20.0dip"
-                          android:paddingEnd="20.0dip"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
+                          android:paddingStart="20.0dip"
+                          android:paddingEnd="20.0dip"
                           android:labelFor="@+id/note"
                           android:text="@string/note" />
-                <LinearLayout android:orientation="vertical"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content">
-                    <EditText android:id="@+id/note"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content"
-                              android:inputType="text"/>
-                </LinearLayout>
+                <EditText android:id="@+id/noteEdit"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:inputType="text"
+                          android:textSize="@dimen/text_size_medium"/>
+                <TextView android:id="@+id/noteView"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:paddingTop="10dip"
+                          android:paddingBottom="10dip"
+                          android:textSize="@dimen/text_size_medium"
+                          android:textIsSelectable="true"/>
             </LinearLayout>
             <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
+                          android:padding="10dip"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content"
                           android:id="@+id/barcodeIdLayout">
-                <TextView android:textSize="16.0sp"
+                <TextView android:textSize="@dimen/text_size_medium"
                           android:textStyle="bold"
                           android:layout_gravity="center_vertical"
-                          android:paddingStart="20.0dip"
-                          android:paddingEnd="20.0dip"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
+                          android:paddingStart="20.0dip"
+                          android:paddingEnd="20.0dip"
                           android:labelFor="@+id/cardId"
                           android:text="@string/cardId" />
-                <EditText android:id="@+id/cardId"
+                <EditText android:id="@+id/cardIdEdit"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content"
                           android:enabled="false"
-                          android:inputType="text"/>
+                          android:inputType="text"
+                          android:textSize="@dimen/text_size_medium"/>
+                <TextView android:id="@+id/cardIdView"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:paddingTop="10dip"
+                          android:paddingBottom="10dip"
+                          android:textSize="@dimen/text_size_medium"
+                          android:textIsSelectable="true"/>
             </LinearLayout>
             <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
                           android:layout_width="fill_parent"
                           android:layout_height="wrap_content"
                           android:id="@+id/barcodeTypeLayout">
-                <TextView android:textSize="16.0sp"
+                <TextView android:textSize="@dimen/text_size_medium"
                           android:textStyle="bold"
                           android:layout_gravity="center_vertical"
-                          android:paddingStart="20.0dip"
-                          android:paddingEnd="20.0dip"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:labelFor="@+id/barcodeType"
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 17350d5b..28644490 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -14,6 +14,7 @@
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.android.Intents;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
@@ -22,6 +23,7 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowLog;
 import org.robolectric.util.ActivityController;
 
 import java.io.IOException;
@@ -40,6 +42,21 @@ public class LoyaltyCardViewActivityTest
     private final String EAN_BARCODE_DATA = "4763705295336";
     private final String EAN_BARCODE_TYPE = BarcodeFormat.EAN_13.name();
 
+    enum ViewMode
+    {
+        ADD_CARD,
+        VIEW_CARD,
+        UPDATE_CARD,
+        ;
+    }
+
+    @Before
+    public void setUp()
+    {
+        // Output logs emitted during tests so they may be accessed
+        ShadowLog.stream = System.out;
+    }
+
     /**
      * Register a handler in the package manager for a image capture intent
      */
@@ -83,9 +100,9 @@ private void saveLoyaltyCardWithArguments(final Activity activity,
             assertEquals(1, db.getLoyaltyCardCount());
         }
 
-        final EditText storeField = (EditText) activity.findViewById(R.id.storeName);
-        final EditText noteField = (EditText) activity.findViewById(R.id.note);
-        final EditText cardIdField = (EditText) activity.findViewById(R.id.cardId);
+        final EditText storeField = (EditText) activity.findViewById(R.id.storeNameEdit);
+        final EditText noteField = (EditText) activity.findViewById(R.id.noteEdit);
+        final EditText cardIdField = (EditText) activity.findViewById(R.id.cardIdEdit);
         final EditText barcodeTypeField = (EditText) activity.findViewById(R.id.barcodeType);
 
         final Button saveButton = (Button) activity.findViewById(R.id.saveButton);
@@ -145,12 +162,11 @@ private void captureBarcodeWithResult(final Activity activity, final int buttonI
     }
 
     private void checkFieldProperties(final Activity activity, final int id, final int visibility,
-                                      boolean enabled, final String contents)
+                                      final String contents)
     {
         final View view = activity.findViewById(id);
         assertNotNull(view);
         assertEquals(visibility, view.getVisibility());
-        assertEquals(enabled, view.isEnabled());
         if(contents != null)
         {
             TextView textView = (TextView)view;
@@ -158,24 +174,30 @@ private void checkFieldProperties(final Activity activity, final int id, final i
         }
     }
 
-    private void checkAllFields(final Activity activity, boolean editMode, final String store,
-                                final String note, final String cardId, final String barcodeType)
+    private void checkAllFields(final Activity activity, ViewMode mode,
+                                final String store, final String note, final String cardId, final String barcodeType)
     {
         int cardIdVisibility = cardId.isEmpty() ? View.GONE : View.VISIBLE;
-        int captureVisibility = editMode ? View.VISIBLE : View.GONE;
-
-        checkFieldProperties(activity, R.id.storeName, View.VISIBLE, editMode, store);
-        checkFieldProperties(activity, R.id.note, View.VISIBLE, editMode, note);
-        checkFieldProperties(activity, R.id.cardId, View.VISIBLE, false, cardId);
-        checkFieldProperties(activity, R.id.barcodeType, View.VISIBLE, false, barcodeType);
-        checkFieldProperties(activity, R.id.captureButton, captureVisibility, true, null);
-        checkFieldProperties(activity, R.id.saveButton, captureVisibility, true, null);
-        checkFieldProperties(activity, R.id.cancelButton, captureVisibility, true, null);
-        checkFieldProperties(activity, R.id.barcode, View.VISIBLE, true, null);
-
-        checkFieldProperties(activity, R.id.barcodeIdLayout, cardIdVisibility, true, null);
-        checkFieldProperties(activity, R.id.barcodeLayout, cardIdVisibility, true, null);
-        checkFieldProperties(activity, R.id.barcodeTypeLayout, View.GONE, true, null);
+        int captureVisibility = (mode == ViewMode.UPDATE_CARD || mode == ViewMode.ADD_CARD) ? View.VISIBLE : View.GONE;
+
+        int viewVisibility = (mode == ViewMode.VIEW_CARD) ? View.VISIBLE : View.GONE;
+        int editVisibility = (mode != ViewMode.VIEW_CARD) ? View.VISIBLE : View.GONE;
+
+        checkFieldProperties(activity, R.id.storeNameEdit, editVisibility, store);
+        checkFieldProperties(activity, R.id.storeNameView, viewVisibility, store);
+        checkFieldProperties(activity, R.id.noteEdit, editVisibility, note);
+        checkFieldProperties(activity, R.id.noteView, viewVisibility, note);
+        checkFieldProperties(activity, R.id.cardIdEdit, editVisibility, cardId);
+        checkFieldProperties(activity, R.id.cardIdView, viewVisibility, cardId);
+        checkFieldProperties(activity, R.id.barcodeType, View.VISIBLE, barcodeType);
+        checkFieldProperties(activity, R.id.captureButton, captureVisibility, null);
+        checkFieldProperties(activity, R.id.saveButton, captureVisibility, null);
+        checkFieldProperties(activity, R.id.cancelButton, captureVisibility, null);
+        checkFieldProperties(activity, R.id.barcode, View.VISIBLE, null);
+
+        checkFieldProperties(activity, R.id.barcodeIdLayout, cardIdVisibility, null);
+        checkFieldProperties(activity, R.id.barcodeLayout, cardIdVisibility, null);
+        checkFieldProperties(activity, R.id.barcodeTypeLayout, View.GONE, null);
     }
 
     @Test
@@ -188,11 +210,11 @@ public void startWithoutParametersCheckFieldsAvailable()
 
         Activity activity = (Activity)activityController.get();
 
-        checkAllFields(activity, true, "", "", "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
     }
 
     @Test
-    public void startWithoutParametersCannotCreateGiftCard()
+    public void startWithoutParametersCannotCreateLoyaltyCard()
     {
         ActivityController activityController = Robolectric.buildActivity(LoyaltyCardViewActivity.class).create();
         activityController.start();
@@ -203,9 +225,9 @@ public void startWithoutParametersCannotCreateGiftCard()
         DBHelper db = new DBHelper(activity);
         assertEquals(0, db.getLoyaltyCardCount());
 
-        final EditText storeField = (EditText) activity.findViewById(R.id.storeName);
-        final EditText noteField = (EditText) activity.findViewById(R.id.note);
-        final EditText cardIdField = (EditText) activity.findViewById(R.id.cardId);
+        final EditText storeField = (EditText) activity.findViewById(R.id.storeNameEdit);
+        final EditText noteField = (EditText) activity.findViewById(R.id.noteEdit);
+        final EditText cardIdField = (EditText) activity.findViewById(R.id.cardIdEdit);
 
         final Button saveButton = (Button) activity.findViewById(R.id.saveButton);
 
@@ -254,12 +276,12 @@ public void startWithoutParametersCaptureBarcodeCreateLoyaltyCard() throws IOExc
 
         Activity activity = (Activity)activityController.get();
 
-        checkAllFields(activity, true, "", "", "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, R.id.captureButton, true);
 
-        checkAllFields(activity, true, "", "", BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", BARCODE_DATA, BARCODE_TYPE);
 
         // Save and check the gift card
         saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, BARCODE_TYPE, true);
@@ -275,12 +297,12 @@ public void startWithoutParametersCaptureBarcodeFailure() throws IOException
 
         Activity activity = (Activity)activityController.get();
 
-        checkAllFields(activity, true, "", "", "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
 
         // Complete barcode capture in failure
         captureBarcodeWithResult(activity, R.id.captureButton, false);
 
-        checkAllFields(activity, true, "", "", "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
     }
 
     @Test
@@ -293,12 +315,12 @@ public void startWithoutParametersCaptureBarcodeCancel() throws IOException
 
         Activity activity = (Activity)activityController.get();
 
-        checkAllFields(activity, true, "", "", "", "");
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, R.id.captureButton, true);
 
-        checkAllFields(activity, true, "", "", BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", BARCODE_DATA, BARCODE_TYPE);
 
         // Cancel the gift card creation
         final Button cancelButton = (Button) activity.findViewById(R.id.cancelButton);
@@ -340,7 +362,7 @@ public void startWithLoyaltyCardEditModeCheckDisplay() throws IOException
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, true, "store", "note", BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
     }
 
     @Test
@@ -356,7 +378,7 @@ public void startWithLoyaltyCardViewModeCheckDisplay() throws IOException
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, false, "store", "note", BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.VIEW_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
     }
 
     @Test
@@ -372,12 +394,12 @@ public void startWithLoyaltyCardWithBarcodeUpdateBarcode() throws IOException
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, true, "store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, R.id.captureButton, true);
 
-        checkAllFields(activity, true, "store", "note", BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
     }
 
     @Test
@@ -393,12 +415,12 @@ public void startWithLoyaltyCardWithReceiptUpdateReceiptCancel() throws IOExcept
         activityController.visible();
         activityController.resume();
 
-        checkAllFields(activity, true, "store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE);
 
         // Complete barcode capture successfully
         captureBarcodeWithResult(activity, R.id.captureButton, true);
 
-        checkAllFields(activity, true, "store", "note", BARCODE_DATA, BARCODE_TYPE);
+        checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", BARCODE_DATA, BARCODE_TYPE);
 
         // Cancel the gift card creation
         final Button cancelButton = (Button) activity.findViewById(R.id.cancelButton);