diff --git a/image/benefits/ad_main.png b/image/benefits/ad_main.png
deleted file mode 100644
index b09c8330..00000000
Binary files a/image/benefits/ad_main.png and /dev/null differ
diff --git a/image/benefits/bn_accept.png b/image/benefits/bn_accept.png
deleted file mode 100644
index f00a07fb..00000000
Binary files a/image/benefits/bn_accept.png and /dev/null differ
diff --git a/image/benefits/bn_back.png b/image/benefits/bn_back.png
deleted file mode 100644
index 527e38ba..00000000
Binary files a/image/benefits/bn_back.png and /dev/null differ
diff --git a/image/benefits/bp_accept.png b/image/benefits/bp_accept.png
deleted file mode 100644
index 43668afa..00000000
Binary files a/image/benefits/bp_accept.png and /dev/null differ
diff --git a/image/benefits/bp_back.png b/image/benefits/bp_back.png
deleted file mode 100644
index c0ff09bb..00000000
Binary files a/image/benefits/bp_back.png and /dev/null differ
diff --git a/image/benefits/img1.png b/image/benefits/img1.png
deleted file mode 100644
index 991681b9..00000000
Binary files a/image/benefits/img1.png and /dev/null differ
diff --git a/image/benefits/img2.png b/image/benefits/img2.png
deleted file mode 100644
index 4d204b1a..00000000
Binary files a/image/benefits/img2.png and /dev/null differ
diff --git a/image/benefits/img3.png b/image/benefits/img3.png
deleted file mode 100644
index 4ab75edf..00000000
Binary files a/image/benefits/img3.png and /dev/null differ
diff --git a/image/collectiing/bn_ignore.png b/image/collectiing/bn_ignore.png
index 69f3d2b2..646311d3 100644
Binary files a/image/collectiing/bn_ignore.png and b/image/collectiing/bn_ignore.png differ
diff --git a/image/collectiing/bp_ignore.png b/image/collectiing/bp_ignore.png
index 2d79755a..c983c38a 100644
Binary files a/image/collectiing/bp_ignore.png and b/image/collectiing/bp_ignore.png differ
diff --git a/image/collectiing/img3.png b/image/collectiing/img3.png
index 267bf450..08016c9d 100644
Binary files a/image/collectiing/img3.png and b/image/collectiing/img3.png differ
diff --git a/image/collectiing/text1.png b/image/collectiing/text1.png
index c1a69b30..dc60f177 100644
Binary files a/image/collectiing/text1.png and b/image/collectiing/text1.png differ
diff --git a/image/collectiing/text2.png b/image/collectiing/text2.png
index 4cb161cd..a960a9d0 100644
Binary files a/image/collectiing/text2.png and b/image/collectiing/text2.png differ
diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml
index d96471bc..1d076914 100644
--- a/xml/menu_catalog_choose_drink1.xml
+++ b/xml/menu_catalog_choose_drink1.xml
@@ -388,25 +388,16 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0006.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -426,25 +417,16 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0001.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -464,25 +446,16 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0003.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -502,25 +475,16 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0007.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -540,25 +504,16 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0002.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -578,25 +533,16 @@
 	<Value> $11-99-02-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0004.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -616,25 +562,16 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0020.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -654,25 +591,16 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0017.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -692,25 +620,16 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0017.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -730,25 +649,16 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0018.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
diff --git a/xml/menu_catalog_choose_drink2.xml b/xml/menu_catalog_choose_drink2.xml
index d0b624e2..da4dabde 100644
--- a/xml/menu_catalog_choose_drink2.xml
+++ b/xml/menu_catalog_choose_drink2.xml
@@ -478,25 +478,16 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0010.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -516,25 +507,16 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0001.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -554,25 +536,16 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0002.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -592,25 +565,16 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0004.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -630,25 +594,16 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0007.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -668,25 +623,16 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0017.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -706,25 +652,16 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0003.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -744,25 +681,16 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0006.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -782,25 +710,16 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0024.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -820,25 +739,16 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0001.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -858,25 +768,16 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0003.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -896,25 +797,16 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0007.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -934,25 +826,16 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 1050 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0030.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 1050 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
 	<Size> 26 </Size>
@@ -972,25 +855,16 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 1050 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0002.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 1050 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
 	<Size> 26 </Size>
diff --git a/xml/menu_catalog_choose_drink2_ext.xml b/xml/menu_catalog_choose_drink2_ext.xml
index ccc5d181..c0b9ff50 100644
--- a/xml/menu_catalog_choose_drink2_ext.xml
+++ b/xml/menu_catalog_choose_drink2_ext.xml
@@ -571,25 +571,16 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0010.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -609,25 +600,16 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0001.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -647,25 +629,16 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0002.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -685,25 +658,16 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0004.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -723,25 +687,16 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0007.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -761,25 +716,16 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0017.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -799,25 +745,16 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0003.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -837,25 +774,16 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0006.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -875,25 +803,16 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0024.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -913,25 +832,16 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0001.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -951,25 +861,16 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0003.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -989,25 +890,16 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 722 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0006.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 722 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
 	<Size> 26 </Size>
@@ -1027,25 +919,16 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 1050 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0024.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 1050 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
 	<Size> 26 </Size>
@@ -1065,25 +948,16 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 1050 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0001.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 1050 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
 	<Size> 26 </Size>
@@ -1103,25 +977,16 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 1050 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0003.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 1050 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 1252 </Y>
 	<Size> 26 </Size>
@@ -1141,25 +1006,16 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 1050 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0007.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 1050 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 1252 </Y>
 	<Size> 26 </Size>
@@ -1179,25 +1035,16 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 1378 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0030.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 1378 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 1580 </Y>
 	<Size> 26 </Size>
@@ -1217,25 +1064,16 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 1378 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0002.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 1378 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 1580 </Y>
 	<Size> 26 </Size>
diff --git a/xml/menu_catalog_choose_drink3.xml b/xml/menu_catalog_choose_drink3.xml
index b301ce5c..70fb3c5a 100644
--- a/xml/menu_catalog_choose_drink3.xml
+++ b/xml/menu_catalog_choose_drink3.xml
@@ -296,25 +296,16 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0014.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -334,25 +325,16 @@
 	<Value> $11-99-01-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0012.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -372,25 +354,16 @@
 	<Value> $11-99-01-0012.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0011.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -410,25 +383,16 @@
 	<Value> $11-99-01-0011.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0004.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -448,25 +412,16 @@
 	<Value> $11-99-02-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0014.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -486,25 +441,16 @@
 	<Value> $11-99-02-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0010.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
diff --git a/xml/menu_catalog_choose_drink4.xml b/xml/menu_catalog_choose_drink4.xml
index 8c57d911..2b876fb9 100644
--- a/xml/menu_catalog_choose_drink4.xml
+++ b/xml/menu_catalog_choose_drink4.xml
@@ -252,25 +252,16 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0006.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -290,25 +281,16 @@
 	<Value> $11-99-01-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0017.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -328,25 +310,16 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0005.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -366,25 +339,16 @@
 	<Value> $11-99-02-0005.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0031.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
diff --git a/xml/menu_catalog_choose_drink5.xml b/xml/menu_catalog_choose_drink5.xml
index 1adc596d..14466251 100644
--- a/xml/menu_catalog_choose_drink5.xml
+++ b/xml/menu_catalog_choose_drink5.xml
@@ -344,25 +344,16 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-01-0009.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -382,25 +373,16 @@
 	<Value> $11-99-01-0009.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0016.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -420,25 +402,16 @@
 	<Value> $11-99-02-0016.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0017.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -458,25 +431,16 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0020.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -496,25 +460,16 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0021.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -534,25 +489,16 @@
 	<Value> $11-99-02-0021.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0023.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -572,25 +518,16 @@
 	<Value> $11-99-02-0023.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0022.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -610,25 +547,16 @@
 	<Value> $11-99-02-0022.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0011.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
diff --git a/xml/menu_catalog_choose_drink6.xml b/xml/menu_catalog_choose_drink6.xml
index ced3b65a..2fab7e57 100644
--- a/xml/menu_catalog_choose_drink6.xml
+++ b/xml/menu_catalog_choose_drink6.xml
@@ -298,25 +298,16 @@
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0018.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -336,25 +327,16 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0018.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -374,25 +356,16 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
-	<X> 740 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0025.Price </Value>
-	</Text>
-	<Text>
 	<X> 722 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -412,25 +385,16 @@
 	<Value> $11-99-02-0025.description </Value>
 	</Text>
 	<Text>
-	<X> 997 </X>
-	<Y> 66 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0032.Price </Value>
-	</Text>
-	<Text>
 	<X> 979 </X>
 	<Y> 66 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -450,25 +414,16 @@
 	<Value> $11-99-02-0032.description </Value>
 	</Text>
 	<Text>
-	<X> 226 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0026.Price </Value>
-	</Text>
-	<Text>
 	<X> 208 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
@@ -488,25 +443,16 @@
 	<Value> $11-99-02-0026.description </Value>
 	</Text>
 	<Text>
-	<X> 483 </X>
-	<Y> 394 </Y>
-	<Align> "Hurr" </Align>
-	<Width>150</Width>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $11-99-02-0009.Price </Value>
-	</Text>
-	<Text>
 	<X> 465 </X>
 	<Y> 394 </Y>
-	<Width>20</Width>
+	<Width>200</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
+	<Value> "Free" </Value>
 	</Text>
 	<Text>
+	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
 	<Size> 26 </Size>
diff --git a/xml/menu_lid_straw.xml b/xml/menu_lid_straw.xml
index fd7fb6b7..0349e626 100644
--- a/xml/menu_lid_straw.xml
+++ b/xml/menu_lid_straw.xml
@@ -155,13 +155,13 @@
 </Button>
 
 
-
+; show counter brewing
 <Image>
 <X> 751 </X>
 <Y> 413 </Y>
 <Filename> "ROOT/taobin_project/image/page_lid_straw/img2.png" </Filename>
 </Image>
-
+; show counter brewing
 <Text>
 <X> 808 </X>
 <Y> 480 </Y>
diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml
index 7acb6f6b..f2a5c9d5 100644
--- a/xml/menu_payment_cash.xml
+++ b/xml/menu_payment_cash.xml
@@ -327,6 +327,7 @@
 	;MakeDrinkV1  SelectDrink SelectSugarID
 	
 	;Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
+	Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
 
 </EventClick>
 </Image>
diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index a3991365..b353fdc3 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -7,7 +7,6 @@
 
 <EventOpen>
 	; On open
-	TopView "hide"
 
 	Var Timeout = 0
 	Var TelephoneNumber = ""
@@ -271,58 +270,6 @@
 </EventClick>
 </Button>
 
-
-<Button>
-<X> 750 </X>
-<Y> 1783 </Y>
-<Filename> "ROOT/taobin_project/image/bn_ignore.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/bp_ignore.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Open "ROOT/taobin_project/xml/menu_lid_straw.xml"  
-</EventClick>
-</Button>
-
-;<Button>
-;<X> 600 </X>
-;<Y> 779 </Y>
-;<State> Tel_Confirm_State </State>
-;<Filename> "ROOT/image/BN_Confirm.bmp" </Filename>
-;<FilenamePress> "ROOT/image/BP_Confirm.bmp" </FilenamePress>
-;<FilenameDisable> "ROOT/image/BD_Confirm.bmp" </FilenameDisable>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;
-;	Var StepGetPoint = 0
-;
-;	;GETACCEXT TelephoneNumber 5
-;	Var PdpaAsk = 0
-;	
-;	Var OperatorTemp = ""
-;	Var CreditAmount = 0
-;	Var OperatorStatus = ""
-;	Var AccountType = ""
-;	GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
-;	Open "/media/bt/xml/menu_CollectPoint_Page2.xml"  
-;	
-;	
-;</EventClick>
-;</Button>
-
-;<Text>
-;<X> 310 </X>
-;<Y> 380 </Y>
-;<Width> 474 </Width>
-;<Align> Center </Align>
-;<Size> 50 </Size>
-;<Font> fontType1 </Font>
-;<Color> 0xF0E000 </Color>
-;<Value> TelephoneNumber </Value>
-;<Format> Telnum </Format>
-;</Text>
-
 <Text>
 <X> 0 </X>
 <Y> 873 </Y>
@@ -335,9 +282,72 @@
 <Format> Telnum </Format>
 </Text>
 
+<Button>
+<X> 44 </X>
+<Y> 1783 </Y>
+<Filename> "ROOT/taobin_project/image/enter_point/bn_ignore.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/enter_point/bp_ignore.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+	Open "ROOT/taobin_project/xml/menu_lid_straw.xml"
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 751 </X>
+<Y> 1783 </Y>
+<State> Tel_Confirm_State </State>
+<Filename> "ROOT/taobin_project/image/enter_point/bn_confirm.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/enter_point/bp_confirm.bmp" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/enter_point/bn_confirm.bmp" </FilenameDisable>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var StepGetPoint = 0
+
+	;GETACCEXT TelephoneNumber 5
+	Var PdpaAsk = 0
 	
+	Var OperatorTemp = ""
+	Var CreditAmount = 0
+	Var OperatorStatus = ""
+	Var AccountType = ""
+	GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
+	Open "/media/bt/xml/page_collect_point_2.xml"  
+</EventClick>
+</Button>
 
 
+<Image>
+<X> 217 </X>
+<Y> 833 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/img3.png" </Filename>
+</Image>
+
+<Image>
+<X> 378 </X>
+<Y> 874 </Y>
+<State> ShowTextNumber </State>
+<Filename> "ROOT/taobin_project/image/enter_point/text3.png" </Filename>
+</Image>
+
+
+
+<Image>
+<X> 240 </X>
+<Y> 606 </Y>
+<Filename> "ROOT/taobin_project/image/enter_point/text2.png" </Filename>
+</Image>
+
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+</Image>
 			
 <EventSecurity> 
 	Open "/media/bt/xml/security_alarm.xml" 
diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml
index 39e06371..61bd171c 100644
--- a/xml/page_collect_point_2.xml
+++ b/xml/page_collect_point_2.xml
@@ -7,7 +7,6 @@
 
 <EventOpen>
 	; On open
-	TopView "hide"
 
 	Var Timeout = 0
 	Var TelephoneNumber = ""
@@ -20,6 +19,7 @@
 	If Timeout > 30 Then
         ;Var CoffeePoint = 1 
 		;Open "/media/bt/xml/page_collect_point_3.xml" 
+		
 		If StepGetPoint = 0 Then
 			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 		Else
diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml
index 2bb1b001..affb868b 100644
--- a/xml/page_show_consent.xml
+++ b/xml/page_show_consent.xml
@@ -1,9 +1,9 @@
-<Page>
-
+<Popup>
+<Cache> "Enable" </Cache>
 <Width> 1080 </Width>
-<Height> 1312 </Height>
-<Background> "ROOT/image/BG_Consent.bmp" </Background>
-
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
 
 <EventOpen>
 	; On open
@@ -20,7 +20,8 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 20 Then
-        Open "ROOT/xml/menu_page5.xml" 
+        ; goto lid straw
+	Open "ROOT/taobin_project/xml/menu_lid_straw.xml"
 	EndIf
 
 	TimerReset
@@ -33,7 +34,7 @@
 	EndIf
 
 	If MachineStage = "drink-failed" Then
-		Var MachineState_Result = 1
+		Var MachineState_Result = 2
 	EndIf
 </EventMachine>
 
@@ -41,33 +42,77 @@
 
 
 <Button>
-<X> 397 </X>
-<Y> 802 </Y>
-<Filename> "ROOT/image/BN_accept.bmp" </Filename>
-<FilenamePress> "ROOT/image/BP_accept.bmp" </FilenamePress>
+<X> 750 </X>
+<Y> 1782 </Y>
+<Filename> "ROOT/taobin_project/image/bn_accept.bmp" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/bp_accept.bmp" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
    
     Var StepGetPoint = 1
     GETACCEXT TelephoneNumber 5
-	Open "/media/bt/xml/menu_CollectPoint_Page2.xml"  
+	; goto lid straw
+	Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+
 </EventClick>
 </Button>
 
 <Button>
-<X> 576 </X>
-<Y> 802 </Y>
-<Filename> "ROOT/image/BN_decline.bmp" </Filename>
-<FilenamePress> "ROOT/image/BP_decline.bmp" </FilenamePress>
+<X> 44 </X>
+<Y> 1782 </Y>
+<Filename> "ROOT/taobin_project/image/bn_decline.bmp" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/bย_decline.bmp" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-    Open "ROOT/xml/menu_page5.xml" 
+    ; goto lid straw
+	Open "ROOT/taobin_project/xml/menu_lid_straw.xml"
 </EventClick>
 </Button>
 
 
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+</Image>
+			
+
+
+<Image>
+<X> 59 </X>
+<Y> 1290 </Y>
+<Filename> "ROOT/taobin_project/image/img1.png" </Filename>
+</Image>
+
+<Image>
+<X> 106 </X>
+<Y> 469 </Y>
+<Filename> "ROOT/taobin_project/image/img3.png" </Filename>
+</Image>
+			
+
+; show counter brewing
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> "ROOT/taobin_project/image/page_lid_straw/img2.png" </Filename>
+</Image>
+; show counter brewing
+<Text>
+<X> 808 </X>
+<Y> 480 </Y>
+<Width> 1080</Width>
+<Align> "Hurr" </Align>
+<Size> 88 </Size>
+<Font> KanitRegularTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+
+
 			
 <EventSecurity> 
 	Open "/media/bt/xml/security_alarm.xml"