diff --git a/app/src/main/java/com/example/bdkipoc/transaction/CreateTransactionActivity.java b/app/src/main/java/com/example/bdkipoc/transaction/CreateTransactionActivity.java
index f364d8c..5077098 100644
--- a/app/src/main/java/com/example/bdkipoc/transaction/CreateTransactionActivity.java
+++ b/app/src/main/java/com/example/bdkipoc/transaction/CreateTransactionActivity.java
@@ -191,6 +191,8 @@ public class CreateTransactionActivity extends AppCompatActivity implements
         if (newAmount.length() <= 9) {
             transactionAmount = newAmount;
             updateAmountDisplay();
+            // Update status tombol
+            btnConfirm.setEnabled(!transactionAmount.equals("0"));
         }
     }
 
@@ -201,21 +203,23 @@ public class CreateTransactionActivity extends AppCompatActivity implements
             transactionAmount = "0";
         }
         updateAmountDisplay();
+        // Update status tombol
+        btnConfirm.setEnabled(!transactionAmount.equals("0"));
     }
 
     private void updateAmountDisplay() {
         if (tvAmountDisplay != null) {
             if (transactionAmount.equals("0")) {
                 tvAmountDisplay.setText("");
+                // Disable tombol dan akan otomatis pakai background inactive
+                btnConfirm.setEnabled(false);
             } else {
-                // Format the number with thousand separators but without currency symbol
                 long amountCents = Long.parseLong(transactionAmount);
-                
-                // Format as integer with thousand separators
                 NumberFormat formatter = NumberFormat.getNumberInstance(new Locale("id", "ID"));
                 String formattedAmount = formatter.format(amountCents);
-                
                 tvAmountDisplay.setText(formattedAmount);
+                // Enable tombol dan akan otomatis pakai background active
+                btnConfirm.setEnabled(true);
             }
         }
     }
diff --git a/app/src/main/java/com/example/bdkipoc/transaction/ResultTransactionActivity.java b/app/src/main/java/com/example/bdkipoc/transaction/ResultTransactionActivity.java
index 5f6ee64..d6e21b4 100644
--- a/app/src/main/java/com/example/bdkipoc/transaction/ResultTransactionActivity.java
+++ b/app/src/main/java/com/example/bdkipoc/transaction/ResultTransactionActivity.java
@@ -69,7 +69,7 @@ public class ResultTransactionActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_credit_card);
+        setContentView(R.layout.activity_result_transaction);
         
         getIntentData();
         initViews();
diff --git a/app/src/main/res/drawable/button_background_selector.xml b/app/src/main/res/drawable/button_confirm_background_selector.xml
similarity index 100%
rename from app/src/main/res/drawable/button_background_selector.xml
rename to app/src/main/res/drawable/button_confirm_background_selector.xml
diff --git a/app/src/main/res/layout/activity_create_transaction.xml b/app/src/main/res/layout/activity_create_transaction.xml
index 5bd7e52..db08db7 100644
--- a/app/src/main/res/layout/activity_create_transaction.xml
+++ b/app/src/main/res/layout/activity_create_transaction.xml
@@ -16,286 +16,229 @@
         android:scrollbars="none"
         android:background="#FFFFFF">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#FFFFFF">
-
-        <!-- Red Status Bar -->
-        <View
-            android:id="@+id/red_status_bar"
-            android:layout_width="match_parent"
-            android:layout_height="24dp"
-            android:background="#E31937"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-        <!-- Red Background Header -->
-        <View
-            android:id="@+id/red_header_background"
-            android:layout_width="match_parent"
-            android:layout_height="160dp"
-            android:background="#E31937"
-            app:layout_constraintTop_toBottomOf="@id/red_status_bar"/>
-
-        <!-- Back Navigation -->
         <LinearLayout
-            android:id="@+id/back_navigation"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:layout_marginBottom="5dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
-            android:padding="8dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/red_status_bar">
-
-            <!-- Back Arrow -->
-            <ImageView
-                android:id="@+id/backArrow"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:src="@drawable/ic_arrow_back"
-                android:contentDescription="Back" />
-
-            <!-- Title Text -->
-            <TextView
-                android:id="@+id/toolbarTitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:text="Kembali"
-                android:textColor="@android:color/white"
-                android:textSize="12sp"
-                android:fontFamily="@font/inter"
-                android:textStyle="normal" />
-
-        </LinearLayout>
-
-        <!-- Payment Card -->
-        <androidx.cardview.widget.CardView
-            android:id="@+id/paymentCard"
             android:layout_width="match_parent"
-            android:layout_height="191dp"
-            android:layout_margin="16dp"
-            android:layout_marginTop="5dp"
-            app:cardBackgroundColor="#3498DB"
-            app:cardCornerRadius="12dp"
-            app:cardElevation="8dp"
-            app:layout_constraintTop_toBottomOf="@id/back_navigation">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-            <LinearLayout
+            <include layout="@layout/component_appbar" />
+
+            <!-- Payment Card - Positioned to overlap with red header -->
+            <androidx.cardview.widget.CardView
+                android:id="@+id/paymentCard"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:padding="20dp">
+                android:layout_height="191dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="-85dp"
+                app:cardBackgroundColor="#3498DB"
+                app:cardCornerRadius="16dp"
+                app:cardElevation="8dp">
 
-                <!-- Title -->
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="TOTAL PEMBAYARAN"
-                    android:textColor="@android:color/white"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
-                    android:fontFamily="@font/inter"
-                    android:layout_marginBottom="24dp" />
-
-                <!-- Amount Input Section -->
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginBottom="8dp">
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:padding="24dp"
+                    android:paddingTop="32dp">
 
+                    <!-- Title -->
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="RP"
+                        android:text="TOTAL PEMBAYARAN"
                         android:textColor="@android:color/white"
                         android:textSize="20sp"
                         android:textStyle="bold"
                         android:fontFamily="@font/inter"
-                        android:layout_marginEnd="8dp"
-                        android:layout_gravity="bottom" />
+                        android:layout_marginBottom="20dp" />
 
-                    <TextView
-                        android:id="@+id/tv_amount_display"
-                        android:layout_width="0dp"
+                    <!-- Amount Input Section -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:background="@android:color/transparent"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="8dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="RP"
+                            android:textColor="@android:color/white"
+                            android:textSize="20sp"
+                            android:textStyle="bold"
+                            android:fontFamily="@font/inter"
+                            android:layout_marginEnd="8dp"
+                            android:layout_gravity="bottom" />
+
+                        <TextView
+                            android:id="@+id/tv_amount_display"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:background="@android:color/transparent"
+                            android:textColor="@android:color/white"
+                            android:textSize="32sp"
+                            android:textStyle="bold"
+                            android:fontFamily="@font/inter"
+                            android:text=""
+                            android:gravity="start"
+                            android:paddingBottom="4dp" />
+
+                    </LinearLayout>
+
+                    <!-- White Underline -->
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="2dp"
+                        android:background="@android:color/white"
+                        android:layout_marginBottom="12dp" />
+
+                    <!-- Description -->
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Pastikan kembali nominal pembayaran pelanggan Anda"
                         android:textColor="@android:color/white"
-                        android:textSize="20sp"
-                        android:textStyle="bold"
+                        android:textSize="10sp"
                         android:fontFamily="@font/inter"
-                        android:text=""
-                        android:gravity="start"
-                        android:paddingBottom="4dp" />
+                        android:textStyle="normal"
+                        android:alpha="0.9" />
 
                 </LinearLayout>
 
-                <!-- White Underline -->
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="2dp"
-                    android:background="@android:color/white"
-                    android:layout_marginBottom="16dp" />
+            </androidx.cardview.widget.CardView>
 
-                <!-- Description -->
+            <!-- Numpad -->
+            <GridLayout
+                android:id="@+id/numpad_grid"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:columnCount="3"
+                android:rowCount="4"
+                android:layout_marginTop="32dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp">
+
+                <!-- Row 1: 1, 2, 3 -->
                 <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="Pastikan kembali nominal pembayaran pelanggan Anda"
-                    android:textColor="@android:color/white"
-                    android:textSize="12sp"
-                    android:fontFamily="@font/inter"
-                    android:alpha="0.9" />
+                    android:id="@+id/btn_1"
+                    style="@style/NumpadButton"
+                    android:text="1" />
 
-            </LinearLayout>
+                <TextView
+                    android:id="@+id/btn_2"
+                    style="@style/NumpadButton"
+                    android:text="2" />
 
-        </androidx.cardview.widget.CardView>
+                <TextView
+                    android:id="@+id/btn_3"
+                    style="@style/NumpadButton"
+                    android:text="3" />
 
-        <!-- Numpad -->
-        <GridLayout
-            android:id="@+id/numpad_grid"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:columnCount="3"
-            android:rowCount="4"
-            android:layout_marginTop="24dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintTop_toBottomOf="@id/paymentCard">
+                <!-- Row 2: 4, 5, 6 -->
+                <TextView
+                    android:id="@+id/btn_4"
+                    style="@style/NumpadButton"
+                    android:text="4" />
 
-            <!-- Row 1: 1, 2, 3 -->
+                <TextView
+                    android:id="@+id/btn_5"
+                    style="@style/NumpadButton"
+                    android:text="5" />
+
+                <TextView
+                    android:id="@+id/btn_6"
+                    style="@style/NumpadButton"
+                    android:text="6" />
+
+                <!-- Row 3: 7, 8, 9 -->
+                <TextView
+                    android:id="@+id/btn_7"
+                    style="@style/NumpadButton"
+                    android:text="7" />
+
+                <TextView
+                    android:id="@+id/btn_8"
+                    style="@style/NumpadButton"
+                    android:text="8" />
+
+                <TextView
+                    android:id="@+id/btn_9"
+                    style="@style/NumpadButton"
+                    android:text="9" />
+
+                <!-- Row 4: 000, 0, Delete -->
+                <TextView
+                    android:id="@+id/btn_00"
+                    style="@style/NumpadButton"
+                    android:text="000" />
+
+                <TextView
+                    android:id="@+id/btn_0"
+                    style="@style/NumpadButton"
+                    android:text="0" />
+
+                <ImageView
+                    android:id="@+id/btn_clear"
+                    android:layout_width="0dp"
+                    android:layout_height="60dp"
+                    android:layout_columnWeight="1"
+                    android:layout_margin="8dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:src="@drawable/ic_backspace"
+                    android:scaleType="center"
+                    android:contentDescription="Delete" />
+
+            </GridLayout>
+
+            <!-- Confirmation Button -->
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/btn_confirm"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:text="Konfirmasi"
+                android:textColor="#FFFFFF"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                android:fontFamily="@font/inter"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginTop="32dp"
+                android:layout_marginBottom="24dp"
+                app:backgroundTint="@null"
+                android:background="@drawable/button_confirm_background_selector"
+                android:enabled="false"
+                app:cornerRadius="8dp"
+                app:rippleColor="#B3000000" />
+
+            <!-- Hidden Components -->
             <TextView
-                android:id="@+id/btn_1"
-                style="@style/NumpadButton"
-                android:text="1" />
-
-            <TextView
-                android:id="@+id/btn_2"
-                style="@style/NumpadButton"
-                android:text="2" />
-
-            <TextView
-                android:id="@+id/btn_3"
-                style="@style/NumpadButton"
-                android:text="3" />
-
-            <!-- Row 2: 4, 5, 6 -->
-            <TextView
-                android:id="@+id/btn_4"
-                style="@style/NumpadButton"
-                android:text="4" />
-
-            <TextView
-                android:id="@+id/btn_5"
-                style="@style/NumpadButton"
-                android:text="5" />
-
-            <TextView
-                android:id="@+id/btn_6"
-                style="@style/NumpadButton"
-                android:text="6" />
-
-            <!-- Row 3: 7, 8, 9 -->
-            <TextView
-                android:id="@+id/btn_7"
-                style="@style/NumpadButton"
-                android:text="7" />
-
-            <TextView
-                android:id="@+id/btn_8"
-                style="@style/NumpadButton"
-                android:text="8" />
-
-            <TextView
-                android:id="@+id/btn_9"
-                style="@style/NumpadButton"
-                android:text="9" />
-
-            <!-- Row 4: 000, 0, Delete -->
-            <TextView
-                android:id="@+id/btn_00"
-                style="@style/NumpadButton"
-                android:text="000" />
-
-            <TextView
-                android:id="@+id/btn_0"
-                style="@style/NumpadButton"
-                android:text="0" />
-
-            <ImageView
-                android:id="@+id/btn_clear"
+                android:id="@+id/tv_mode_indicator"
                 android:layout_width="0dp"
-                android:layout_height="60dp"
-                android:layout_columnWeight="1"
-                android:layout_margin="8dp"
-                android:background="?attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_backspace"
-                android:scaleType="center"
-                android:contentDescription="Delete" />
+                android:layout_height="0dp"
+                android:visibility="gone" />
 
-        </GridLayout>
+            <Button
+                android:id="@+id/btn_toggle_mode"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:visibility="gone" />
 
-        <!-- Confirmation Button -->
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/btn_confirm"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:text="Konfirmasi"
-            android:textColor="#FFFFFF"
-            android:textSize="16sp"
-            android:textStyle="bold"
-            android:fontFamily="@font/inter"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="24dp"
-            android:layout_marginBottom="24dp"
-            android:enabled="true"
-            app:backgroundTint="#DE0701"
-            app:cornerRadius="8dp"
-            app:rippleColor="#B3000000"
-            app:layout_constraintTop_toBottomOf="@id/numpad_grid"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintVertical_bias="1" />
+            <ProgressBar
+                android:id="@+id/progress_bar"
+                style="?android:attr/progressBarStyle"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:visibility="gone"
+                android:indeterminateTint="#E31937" />
 
-        <!-- Hidden Mode Indicator and Toggle (for compatibility with existing code) -->
-        <TextView
-            android:id="@+id/tv_mode_indicator"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintTop_toTopOf="parent" />
+        </LinearLayout>
 
-        <Button
-            android:id="@+id/btn_toggle_mode"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:visibility="gone"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <!-- Hidden Progress Bar for Card Scanning -->
-        <ProgressBar
-            android:id="@+id/progress_bar"
-            style="?android:attr/progressBarStyle"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_gravity="center"
-            android:visibility="gone"
-            android:indeterminateTint="#E31937"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-    <!-- Modal Overlay with Blur Effect for Card Scanning - MOVED TO TOP LEVEL -->
+    <!-- Modal Overlay -->
     <FrameLayout
         android:id="@+id/modal_overlay"
         android:layout_width="match_parent"
@@ -306,7 +249,6 @@
         android:focusable="true"
         android:elevation="100dp">
 
-        <!-- Modal Content -->
         <androidx.cardview.widget.CardView
             android:id="@+id/modal_card"
             android:layout_width="match_parent"
@@ -324,7 +266,6 @@
                 android:padding="32dp"
                 android:gravity="center">
 
-                <!-- Card Icon -->
                 <ImageView
                     android:id="@+id/modal_icon"
                     android:layout_width="80dp"
@@ -335,7 +276,6 @@
                     android:adjustViewBounds="true"
                     app:tint="#E31937" />
 
-                <!-- Main Text -->
                 <TextView
                     android:id="@+id/modal_text"
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_credit_card.xml b/app/src/main/res/layout/activity_result_transaction.xml
similarity index 100%
rename from app/src/main/res/layout/activity_credit_card.xml
rename to app/src/main/res/layout/activity_result_transaction.xml
diff --git a/app/src/main/res/layout/component_appbar.xml b/app/src/main/res/layout/component_appbar.xml
new file mode 100644
index 0000000..b98f733
--- /dev/null
+++ b/app/src/main/res/layout/component_appbar.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="130dp"
+    android:background="#DE0701"
+    android:fitsSystemWindows="true">
+
+    <!-- Back Navigation -->
+    <LinearLayout
+        android:id="@+id/back_navigation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:padding="4dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <!-- Back Arrow -->
+        <ImageView
+            android:id="@+id/backArrow"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:src="@drawable/ic_arrow_back"
+            android:contentDescription="Back"
+            app:tint="@android:color/white" />
+
+        <!-- Title Text -->
+        <TextView
+            android:id="@+id/appbarTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="2dp"
+            android:text="Kembali"
+            android:textColor="@android:color/white"
+            android:textSize="10sp"
+            android:fontFamily="@font/inter"
+            android:textStyle="normal" />
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 827fd47..5314778 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,6 +22,7 @@
 
     
     <!-- Banking App Theme Colors -->
+    <color name="red">#DE0701</color>
     <color name="primary_blue">#1976D2</color>
     <color name="light_blue">#BBDEFB</color>
     <color name="accent_teal">#009688</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 24e1bf4..b40964f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Base.Theme.BDKIPOC" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/red</item>
+        <item name="colorOnPrimary">@color/white</item>
     </style>
 
     <style name="Theme.BDKIPOC" parent="Base.Theme.BDKIPOC" />