diff --git a/app/release/foodify.apk b/app/release/foodify.apk
index e4a7439..9e7fe87 100644
Binary files a/app/release/foodify.apk and b/app/release/foodify.apk differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 04ba6f6..e5da7c3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -96,7 +96,9 @@
         <activity
             android:name=".Activity.AddressManagerActivity"
             android:exported="false"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:noHistory="true"
+            />
         <activity
             android:name=".Activity.ChangePasswordActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java b/app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java
index 248f902..a54931e 100644
--- a/app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java
+++ b/app/src/main/java/com/capstone/foodify/Activity/OrderActivity.java
@@ -99,4 +99,10 @@ public class OrderActivity extends AppCompatActivity {
             }
         });
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java
index cc2086f..0d5fe3e 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/HomeFragment.java
@@ -140,7 +140,7 @@ public class HomeFragment extends Fragment {
     private List<Menu> getListMenu() {
         List<Menu> listMenu = new ArrayList<>();
 
-        listMenu.add(new Menu("Món ăn khuyến nghị", listFood));
+        listMenu.add(new Menu("Ăn gì hôm nay?", listFood));
         listMenu.add(new Menu("Món ăn được thêm gần đây", recentFood));
 
         return listMenu;
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java
index 756377c..84fc3dc 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/CancelOrderFragment.java
@@ -60,6 +60,7 @@ public class CancelOrderFragment extends Fragment {
         //Init Component
         initComponent(view);
 
+        CURRENT_PAGE = 0;
         getOrderUser(CURRENT_PAGE);
 
         orderAdapter = new OrderAdapter(getContext());
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java
index 249df1e..4b74ea2 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/CompleteOrderFragment.java
@@ -57,6 +57,7 @@ public class CompleteOrderFragment extends Fragment {
         //Init Component
         initComponent(view);
 
+        CURRENT_PAGE = 0;
         getOrderUser(CURRENT_PAGE);
 
         orderAdapter = new OrderAdapter(getContext());
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java
index eca719b..3c04774 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/PreparingFragment.java
@@ -57,6 +57,7 @@ public class PreparingFragment extends Fragment {
         //Init Component
         initComponent(view);
 
+        CURRENT_PAGE = 0;
         getOrderUser(CURRENT_PAGE);
 
         orderAdapter = new OrderAdapter(getContext());
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java
index 2eb7eb1..ea2423d 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/ProcessOderFragment.java
@@ -58,6 +58,7 @@ public class ProcessOderFragment extends Fragment {
 
         orderAdapter = new OrderAdapter(getContext());
 
+        CURRENT_PAGE = 0;
         getOrderUser(CURRENT_PAGE);
 
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext(), RecyclerView.VERTICAL, false);
diff --git a/app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java b/app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java
index 00dfc31..5de8730 100644
--- a/app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java
+++ b/app/src/main/java/com/capstone/foodify/Fragment/Order/ShipOrderFragment.java
@@ -57,6 +57,7 @@ public class ShipOrderFragment extends Fragment {
         //Init Component
         initComponent(view);
 
+        CURRENT_PAGE = 0;
         getOrderUser(CURRENT_PAGE);
 
         orderAdapter = new OrderAdapter(getContext());
diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml
index 5be95d5..f4a68db 100644
--- a/app/src/main/res/layout/activity_order_detail.xml
+++ b/app/src/main/res/layout/activity_order_detail.xml
@@ -46,7 +46,7 @@
                     android:text="Order #123456789"
                     android:fontFamily="@font/koho_bold"
                     android:textColor="@color/primaryColor"
-                    android:textSize="20sp"
+                    android:textSize="18sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     app:layout_constraintTop_toTopOf="parent"