diff --git a/app/build.gradle b/app/build.gradle
index b92830592..a79fcac75 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,7 +12,7 @@ android {
 
     defaultConfig {
         applicationId "protect.card_locker"
-        minSdkVersion 11
+        minSdkVersion 17
         targetSdkVersion 23
         versionCode 10
         versionName "0.10"
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 1f1c235e7..a5ebe81d0 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -38,12 +38,11 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     TextView storeFieldView;
     EditText noteFieldEdit;
     TextView noteFieldView;
-    EditText cardIdFieldEdit;
     TextView cardIdFieldView;
-    EditText barcodeTypeField;
+    View cardIdDivider;
+    View cardIdTableRow;
+    TextView barcodeTypeField;
     ImageView barcodeImage;
-    View barcodeIdLayout;
-    View barcodeTypeLayout;
     View barcodeImageLayout;
     View barcodeCaptureLayout;
 
@@ -103,12 +102,11 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         storeFieldView = (TextView) findViewById(R.id.storeNameView);
         noteFieldEdit = (EditText) findViewById(R.id.noteEdit);
         noteFieldView = (TextView) findViewById(R.id.noteView);
-        cardIdFieldEdit = (EditText) findViewById(R.id.cardIdEdit);
         cardIdFieldView = (TextView) findViewById(R.id.cardIdView);
-        barcodeTypeField = (EditText) findViewById(R.id.barcodeType);
+        cardIdDivider = findViewById(R.id.cardIdDivider);
+        cardIdTableRow = findViewById(R.id.cardIdTableRow);
+        barcodeTypeField = (TextView) findViewById(R.id.barcodeType);
         barcodeImage = (ImageView) findViewById(R.id.barcode);
-        barcodeIdLayout = findViewById(R.id.barcodeIdLayout);
-        barcodeTypeLayout = findViewById(R.id.barcodeTypeLayout);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
 
@@ -131,9 +129,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 noteFieldView.setText(loyaltyCard.note);
             }
 
-            if(cardIdFieldEdit.getText().length() == 0)
+            if(cardIdFieldView.getText().length() == 0)
             {
-                cardIdFieldEdit.setText(loyaltyCard.cardId);
                 cardIdFieldView.setText(loyaltyCard.cardId);
             }
 
@@ -148,7 +145,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
                 storeFieldView.setVisibility(View.GONE);
                 noteFieldView.setVisibility(View.GONE);
-                cardIdFieldView.setVisibility(View.GONE);
             }
             else
             {
@@ -158,7 +154,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
                 storeFieldEdit.setVisibility(View.GONE);
                 noteFieldEdit.setVisibility(View.GONE);
-                cardIdFieldEdit.setVisibility(View.GONE);
             }
         }
         else
@@ -167,21 +162,13 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
             storeFieldView.setVisibility(View.GONE);
             noteFieldView.setVisibility(View.GONE);
-            cardIdFieldView.setVisibility(View.GONE);
         }
 
-        if(cardIdFieldEdit.getText().length() == 0)
-        {
-            barcodeIdLayout.setVisibility(View.GONE);
-        }
-
-        barcodeTypeLayout.setVisibility(View.GONE);
-
-        if(cardIdFieldEdit.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
+        if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
         {
             String formatString = barcodeTypeField.getText().toString();
             final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
-            final String cardIdString = cardIdFieldEdit.getText().toString();
+            final String cardIdString = cardIdFieldView.getText().toString();
 
             if(barcodeImage.getHeight() == 0)
             {
@@ -214,7 +201,6 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
             }
 
-            barcodeIdLayout.setVisibility(View.VISIBLE);
             barcodeImageLayout.setVisibility(View.VISIBLE);
         }
 
@@ -241,7 +227,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             {
                 Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
 
-                String cardId = cardIdFieldEdit.getText().toString();
+                String cardId = cardIdFieldView.getText().toString();
                 if(cardId.length() > 0)
                 {
                     final Bundle b = new Bundle();
@@ -253,12 +239,16 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             }
         });
 
-        if(cardIdFieldEdit.getText().length() > 0)
+        if(cardIdFieldView.getText().length() > 0)
         {
+            cardIdDivider.setVisibility(View.VISIBLE);
+            cardIdTableRow.setVisibility(View.VISIBLE);
             enterButton.setText(R.string.editCard);
         }
         else
         {
+            cardIdDivider.setVisibility(View.GONE);
+            cardIdTableRow.setVisibility(View.GONE);
             enterButton.setText(R.string.enterCard);
         }
     }
@@ -267,7 +257,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     {
         String store = storeFieldEdit.getText().toString();
         String note = noteFieldEdit.getText().toString();
-        String cardId = cardIdFieldEdit.getText().toString();
+        String cardId = cardIdFieldView.getText().toString();
         String barcodeType = barcodeTypeField.getText().toString();
 
         if(store.isEmpty())
@@ -278,7 +268,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         if(cardId.isEmpty() || barcodeType.isEmpty())
         {
-            Snackbar.make(cardIdFieldEdit, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
+            Snackbar.make(cardIdFieldView, R.string.noCardIdError, Snackbar.LENGTH_LONG).show();
             return;
         }
 
@@ -404,14 +394,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             Log.i(TAG, "Read barcode id: " + contents);
             Log.i(TAG, "Read format: " + format);
 
-            for(TextView view : new TextView[]{
-                    (EditText) findViewById(R.id.cardIdEdit),
-                    (TextView) findViewById(R.id.cardIdView)})
-            {
-                view.setText(contents);
-            }
+            TextView cardIdView = (TextView)findViewById(R.id.cardIdView);
+            cardIdView.setText(contents);
 
-            final EditText barcodeTypeField = (EditText) findViewById(R.id.barcodeType);
+            final TextView barcodeTypeField = (TextView) 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 b3be08796..dde44d34d 100644
--- a/app/src/main/res/layout/loyalty_card_view_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_view_activity.xml
@@ -19,142 +19,230 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:id="@+id/scrollView">
+    <ScrollView android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/inputContrastBackground"
+                app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TableLayout android:layout_width="fill_parent"
+                         android:layout_height="wrap_content"
+                         android:shrinkColumns="1"
+                         android:background="@color/inputContrastBackground">
 
-        <LinearLayout android:orientation="vertical"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content">
-            <LinearLayout android:orientation="horizontal"
-                          android:padding="10dip"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <TextView android:textSize="@dimen/text_size_medium"
-                          android:textStyle="bold"
-                          android:layout_gravity="center_vertical"
-                          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" />
-                <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="10dip"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content">
-                <TextView android:textSize="@dimen/text_size_medium"
-                          android:textStyle="bold"
-                          android:layout_gravity="center_vertical"
-                          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" />
-                <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="10dip"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:id="@+id/barcodeIdLayout">
-                <TextView android:textSize="@dimen/text_size_medium"
-                          android:textStyle="bold"
-                          android:layout_gravity="center_vertical"
-                          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/cardIdEdit"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:enabled="false"
-                          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:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:id="@+id/barcodeTypeLayout">
-                <TextView android:textSize="@dimen/text_size_medium"
-                          android:textStyle="bold"
-                          android:layout_gravity="center_vertical"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:labelFor="@+id/barcodeType"
-                          android:text="@string/barcodeType" />
-                <EditText android:id="@+id/barcodeType"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:enabled="false"
-                          android:inputType="text"/>
-            </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:visibility="gone"
-                          android:id="@+id/barcodeLayout">
-                <ImageView
-                    android:layout_width="0dp"
-                    android:layout_height="@dimen/barcode_disp_height"
-                    android:layout_gravity="center_horizontal"
-                    android:id="@+id/barcode"
-                    android:contentDescription="@string/barcodeImageDescription"
-                    android:layout_weight="1.0"/>
-            </LinearLayout>
-            <LinearLayout android:orientation="horizontal"
-                          android:padding="10.0dip"
-                          android:layout_width="fill_parent"
-                          android:layout_height="wrap_content"
-                          android:id="@+id/barcodeCaptureLayout">
-                    <Button android:id="@+id/captureButton"
-                            android:layout_width="0dp"
+                <!-- Store Name -->
+                <View
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent"
+                    android:background="@color/inputBorder" />
+                <TableRow
+                    android:background="@color/inputBackground"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <View
+                        android:gravity="start"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+
+                    <RelativeLayout
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="@dimen/inputPadding"
+                        android:paddingEnd="@dimen/inputPadding">
+
+                        <TextView
+                            android:id="@+id/storeNameField"
+                            android:text="@string/storeName"
+                            android:layout_height="match_parent"
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/inputSize"
+                            android:padding="@dimen/inputPadding"
+                            android:layout_alignParentStart="true"/>
+
+                        <EditText
+                            android:id="@+id/storeNameEdit"
                             android:layout_height="wrap_content"
-                            android:text="@string/capture"
-                            android:layout_weight="1.0"/>
-                    <Button android:id="@+id/enterButton"
-                            android:layout_width="0dp"
+                            android:layout_width="match_parent"
+                            android:padding="@dimen/inputPadding"
+                            android:textSize="@dimen/inputSize"
+                            android:layout_toEndOf="@id/storeNameField"/>
+
+                        <TextView
+                            android:id="@+id/storeNameView"
                             android:layout_height="wrap_content"
-                            android:text="@string/enterCard"
-                            android:layout_weight="1.0"/>
-            </LinearLayout>
+                            android:layout_width="match_parent"
+                            android:padding="@dimen/inputPadding"
+                            android:textSize="@dimen/inputSize"
+                            android:textIsSelectable="true"
+                            android:layout_toEndOf="@id/storeNameField"/>
+                    </RelativeLayout>
+
+                    <View
+                        android:gravity="end"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+                </TableRow>
+
+                <!-- Note -->
+                <View
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent"
+                    android:background="@color/inputBorder" />
+                <TableRow
+                    android:background="@color/inputBackground"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <View
+                        android:gravity="start"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+
+                    <RelativeLayout
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="@dimen/inputPadding"
+                        android:paddingEnd="@dimen/inputPadding">
+
+                        <TextView
+                            android:id="@+id/noteField"
+                            android:text="@string/note"
+                            android:layout_height="match_parent"
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/inputSize"
+                            android:padding="@dimen/inputPadding"
+                            android:layout_alignParentStart="true"/>
+
+                        <EditText
+                            android:id="@+id/noteEdit"
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
+                            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
+                        android:gravity="end"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+                </TableRow>
+
+                <!-- Card ID -->
+                <View
+                    android:id="@+id/cardIdDivider"
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent"
+                    android:background="@color/inputBorder" />
+                <TableRow
+                    android:id="@+id/cardIdTableRow"
+                    android:background="@color/inputBackground"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <View
+                        android:gravity="start"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+
+                    <RelativeLayout
+                        android:orientation="horizontal"
+                        android:layout_weight="1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingRight="@dimen/inputPadding"
+                        android:paddingEnd="@dimen/inputPadding">
+
+                        <TextView
+                            android:id="@+id/cardIdField"
+                            android:text="@string/cardId"
+                            android:layout_height="match_parent"
+                            android:layout_width="wrap_content"
+                            android:textSize="@dimen/inputSize"
+                            android:padding="@dimen/inputPadding"
+                            android:layout_alignParentStart="true"/>
+
+                        <TextView
+                            android:id="@+id/cardIdView"
+                            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/cardIdField"/>
+                    </RelativeLayout>
+
+                    <View
+                        android:gravity="end"
+                        android:layout_height="match_parent"
+                        android:layout_width="@dimen/inputBorderThickness"
+                        android:background="@color/inputBorder" />
+                </TableRow>
+
+                <View
+                    android:layout_height="@dimen/inputBorderThickness"
+                    android:layout_width="match_parent"
+                    android:background="@color/inputBorder" />
+
+                <TextView android:id="@+id/barcodeType"
+                          android:layout_width="fill_parent"
+                          android:layout_height="wrap_content"
+                          android:visibility="gone"/>
+
+                <LinearLayout android:orientation="horizontal"
+                              android:padding="10.0dip"
+                              android:layout_width="fill_parent"
+                              android:layout_height="wrap_content"
+                              android:visibility="gone"
+                              android:id="@+id/barcodeLayout">
+                    <ImageView
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/barcode_disp_height"
+                        android:layout_gravity="center_horizontal"
+                        android:id="@+id/barcode"
+                        android:contentDescription="@string/barcodeImageDescription"
+                        android:layout_weight="1.0"/>
+                </LinearLayout>
+
+                <LinearLayout android:orientation="vertical"
+                              android:layout_width="fill_parent"
+                              android:layout_height="wrap_content">
+
+                    <LinearLayout android:orientation="horizontal"
+                                  android:padding="10.0dip"
+                                  android:layout_width="fill_parent"
+                                  android:layout_height="wrap_content"
+                                  android:id="@+id/barcodeCaptureLayout">
+                        <Button android:id="@+id/captureButton"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:text="@string/capture"
+                                android:layout_weight="1.0"/>
+                        <Button android:id="@+id/enterButton"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:text="@string/enterCard"
+                                android:layout_weight="1.0"/>
+                    </LinearLayout>
+                </LinearLayout>
+
+            </TableLayout>
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 46c64b53c..f1eb6c82a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,4 +4,9 @@
     <color name="colorPrimary">#9E9E9E</color>
     <color name="colorPrimaryDark">#616161</color>
     <color name="colorAccent">#607D8B</color>
+
+    <color name="inputContrastBackground">#F8F8F8</color>
+    <color name="inputBackground">#FFFFFF</color>
+    <color name="inputBorder">#DDDDDD</color>
+    <color name="inputDividerBorder">#AAAAAA</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a22639510..282fc2403 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,4 +11,9 @@
     <dimen name="text_size_medium">18sp</dimen>
     <dimen name="text_size_large">22sp</dimen>
 
+    <dimen name="inputBorderThickness">2dip</dimen>
+    <dimen name="inputBorderDividerThickness">4dip</dimen>
+    <dimen name="inputPadding">20dip</dimen>
+    <dimen name="inputSize">18sp</dimen>
+
 </resources>
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index 2215852d8..39da5e78c 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -102,8 +102,8 @@ public class LoyaltyCardViewActivityTest
 
         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 TextView cardIdField = (TextView) activity.findViewById(R.id.cardIdView);
+        final TextView barcodeTypeField = (TextView) activity.findViewById(R.id.barcodeType);
 
         storeField.setText(store);
         noteField.setText(note);
@@ -175,7 +175,6 @@ public class LoyaltyCardViewActivityTest
     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 = (mode == ViewMode.UPDATE_CARD || mode == ViewMode.ADD_CARD) ? View.VISIBLE : View.GONE;
 
         int viewVisibility = (mode == ViewMode.VIEW_CARD) ? View.VISIBLE : View.GONE;
@@ -185,15 +184,12 @@ public class LoyaltyCardViewActivityTest
         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.cardIdView, View.VISIBLE, cardId);
+        checkFieldProperties(activity, R.id.cardIdDivider, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
+        checkFieldProperties(activity, R.id.cardIdTableRow, cardId.isEmpty() ? View.GONE : View.VISIBLE, null);
+        checkFieldProperties(activity, R.id.barcodeType, View.GONE, barcodeType);
         checkFieldProperties(activity, R.id.captureButton, 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
@@ -224,7 +220,7 @@ public class LoyaltyCardViewActivityTest
 
         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 TextView cardIdField = (TextView) activity.findViewById(R.id.cardIdView);
 
         shadowActivity.clickMenuItem(R.id.action_save);
         assertEquals(0, db.getLoyaltyCardCount());