diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e1c65227..8c78c7af7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 Changes:
 
 - Add balance support
+- Reorganize barcode tab of edit view
 
 ## v1.8.1 (2021-02-12)
 
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index dd7e7606b..7e922facc 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -33,16 +33,13 @@ import android.view.ViewTreeObserver;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
-import android.widget.CalendarView;
 import android.widget.DatePicker;
 import android.widget.EditText;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.textfield.TextInputLayout;
 import com.google.zxing.BarcodeFormat;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
@@ -50,14 +47,10 @@ import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 import java.io.InvalidObjectException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
-import java.text.NumberFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Currency;
 import java.util.Date;
 import java.util.HashMap;
@@ -77,7 +70,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     AutoCompleteTextView expiryField;
     EditText balanceField;
     AutoCompleteTextView balanceCurrencyField;
-    View cardAndBarcodeLayout;
     TextView cardIdFieldView;
     AutoCompleteTextView barcodeTypeField;
     ImageView barcodeImage;
@@ -151,7 +143,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         expiryField = findViewById(R.id.expiryField);
         balanceField = findViewById(R.id.balanceField);
         balanceCurrencyField = findViewById(R.id.balanceCurrencyField);
-        cardAndBarcodeLayout = findViewById(R.id.cardAndBarcodeLayout);
         cardIdFieldView = findViewById(R.id.cardIdView);
         barcodeTypeField = findViewById(R.id.barcodeTypeField);
         barcodeImage = findViewById(R.id.barcode);
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 ae421711c..50f850b63 100644
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -190,6 +190,7 @@
                     android:paddingTop="@dimen/inputPadding"
                     android:orientation="horizontal">
 
+                    <!-- Expiry date -->
                     <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/expiryView"
                         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
@@ -210,15 +211,14 @@
             <TableLayout
                 android:id="@+id/barcodePart"
                 android:visibility="gone">
-                <!-- Card ID and Barcode type -->
+
+                <!-- Card ID -->
                 <LinearLayout
-                    android:id="@+id/cardAndBarcodeLayout"
-                    android:layout_width="fill_parent"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingHorizontal="@dimen/inputPadding"
                     android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal"
-                    android:baselineAligned="false">
+                    android:orientation="horizontal">
 
                     <!-- Card ID -->
                     <com.google.android.material.textfield.TextInputLayout
@@ -237,6 +237,15 @@
                             />
 
                     </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <!-- Barcode ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
 
                     <!-- Barcode type -->
                     <com.google.android.material.textfield.TextInputLayout