diff --git a/xml/page_catalog_group_appfast.skt b/xml/page_catalog_group_appfast.skt
index 24ea7269..d4e3ab8e 100644
--- a/xml/page_catalog_group_appfast.skt
+++ b/xml/page_catalog_group_appfast.skt
@@ -49,25 +49,13 @@
 </EventOpen>
 
 
+
 <?hurr 
     #include=menu_catalog.xml
 ?>
 
 
 
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
 
 
 
diff --git a/xml/page_catalog_group_tea.skt b/xml/page_catalog_group_tea.skt
index cf6398ec..ff4fa071 100644
--- a/xml/page_catalog_group_tea.skt
+++ b/xml/page_catalog_group_tea.skt
@@ -36,28 +36,13 @@
 </EventOpen>
 
 
+
 <?hurr 
     #include=menu_catalog.xml
 ?>
 
 
 
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-
-
 <?hurr 
     #include=menu_new_layout_gen.py
 ?>
diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml
index 051096cf..48b87c45 100644
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@@ -140,6 +140,7 @@
 
 
 
+
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
@@ -620,22 +621,6 @@
 
 
 
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
diff --git a/xml/page_catalog_group_whey.skt b/xml/page_catalog_group_whey.skt
index 177c9c93..5341bb77 100644
--- a/xml/page_catalog_group_whey.skt
+++ b/xml/page_catalog_group_whey.skt
@@ -49,27 +49,13 @@
 </EventOpen>
 
 
+
 <?hurr 
     #include=menu_catalog.xml
 ?>
 
 
 
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-
 
 <?hurr 
     #include=menu_new_layout_gen.py
diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml
index 6637bacf..60b45546 100644
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@@ -153,6 +153,7 @@
 
 
 
+
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
@@ -633,21 +634,6 @@
 
 
 
-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-
 
 <FrameScroll> 
 <X> 10 </X>
diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml
index d242c753..6eba6915 100644
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@@ -283,7 +283,7 @@
 <X> 77 </X>
 <Y> 1378 </Y>
 <State> txtDrinkOKState </State>
-<Filename> Var( DirImage + "/txtDrinkOK.png" ) </Filename>
+<Filename> Var( DirImage2 + "/txtDrinkOK.png" ) </Filename>
 </Image>
 
 
@@ -293,8 +293,8 @@
 <State> buttonRemoveCup </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
-<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
+<Filename> Var( DirImage2 + "/bn_open_door.png" ) </Filename>
+<FilenamePress> Var( DirImage2 + "/bp_open_door.png" ) </FilenamePress>
 <EventClick> 
 	Var buttonRemoveCup = "Invisible"
 	Machine RemoveCup
diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml
index be29fc4b..32d6bd3c 100644
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@@ -1065,6 +1065,8 @@
 		EndIf
 	EndIf
 
+	Var BugFlag = 0
+	Topping "Load" PD_CODE1
 
 	Function 2
 
@@ -1113,6 +1115,9 @@
 			Var blend_button_state = "Enable"
 		EndIf
 	EndIf
+	
+	Var BugFlag = 0
+	Topping "Load" PD_CODE2
 
 	Function 2
 
@@ -1160,6 +1165,9 @@
 		EndIf
 	EndIf
 
+	Var BugFlag = 0
+	Topping "Load" PD_CODE3
+
 	Function 2
 
 	Refresh