diff --git a/image/topping/bn_brew1.png b/image/topping/bn_brew1.png
index bb279526..9bb9258b 100644
Binary files a/image/topping/bn_brew1.png and b/image/topping/bn_brew1.png differ
diff --git a/image/topping/bn_brew2.png b/image/topping/bn_brew2.png
index 59fb3d24..dd93a1fd 100644
Binary files a/image/topping/bn_brew2.png and b/image/topping/bn_brew2.png differ
diff --git a/image/topping/bp_brew1.png b/image/topping/bp_brew1.png
index ab8c452e..775d98f2 100644
Binary files a/image/topping/bp_brew1.png and b/image/topping/bp_brew1.png differ
diff --git a/image/topping/bp_brew2.png b/image/topping/bp_brew2.png
index 58888e5f..0156ac35 100644
Binary files a/image/topping/bp_brew2.png and b/image/topping/bp_brew2.png differ
diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml
index 3262f489..e6d95259 100644
--- a/xml/menu_catalog_choose_drink1.xml
+++ b/xml/menu_catalog_choose_drink1.xml
@@ -160,7 +160,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -183,7 +183,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -206,7 +206,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -229,7 +229,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -252,7 +252,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -275,7 +275,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -298,7 +298,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -321,7 +321,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lemonade_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -344,7 +344,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_milk_caramel.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -367,20 +367,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cola.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -401,15 +410,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -430,15 +448,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -459,15 +486,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -488,15 +524,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -517,15 +562,24 @@
 	<Value> $11-99-02-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -546,15 +600,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0020.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -575,15 +638,24 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -604,15 +676,24 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -633,15 +714,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0018.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
diff --git a/xml/menu_catalog_choose_drink2.xml b/xml/menu_catalog_choose_drink2.xml
index e35abfae..0c17adf3 100644
--- a/xml/menu_catalog_choose_drink2.xml
+++ b/xml/menu_catalog_choose_drink2.xml
@@ -161,7 +161,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_espresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -184,7 +184,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_double_espresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -207,7 +207,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_latte.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -230,7 +230,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -253,7 +253,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -276,7 +276,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_caramel_macchiato.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -299,7 +299,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -322,7 +322,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -345,7 +345,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -368,7 +368,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -391,7 +391,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -414,7 +414,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -437,7 +437,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_caramel_macchiato.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -460,20 +460,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -494,15 +503,24 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -523,15 +541,24 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -552,15 +579,24 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -581,15 +617,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -610,15 +655,24 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -639,15 +693,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -668,15 +731,24 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -697,15 +769,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -726,15 +807,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
@@ -755,15 +845,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
@@ -784,15 +883,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
@@ -813,15 +921,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
@@ -842,15 +959,24 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
diff --git a/xml/menu_catalog_choose_drink2_ext.xml b/xml/menu_catalog_choose_drink2_ext.xml
index 5dd8fbb3..6b4131e9 100644
--- a/xml/menu_catalog_choose_drink2_ext.xml
+++ b/xml/menu_catalog_choose_drink2_ext.xml
@@ -159,7 +159,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_espresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -182,7 +182,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_double_espresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -205,7 +205,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_latte.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -228,7 +228,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -251,7 +251,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -274,7 +274,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_caramel_macchiato.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -297,7 +297,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -320,7 +320,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -343,7 +343,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -366,7 +366,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -389,7 +389,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -412,7 +412,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -435,7 +435,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -458,7 +458,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -481,7 +481,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -504,7 +504,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -527,7 +527,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_caramel_macchiato.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -550,20 +550,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -584,15 +593,24 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -613,15 +631,24 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -642,15 +669,24 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -671,15 +707,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -700,15 +745,24 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -729,15 +783,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -758,15 +821,24 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -787,15 +859,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -816,15 +897,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
@@ -845,15 +935,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
@@ -874,15 +973,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
@@ -903,15 +1011,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
@@ -932,15 +1049,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
@@ -961,15 +1087,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 1252 </Y>
@@ -990,15 +1125,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 1252 </Y>
@@ -1019,15 +1163,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1378 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1378 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1580 </Y>
@@ -1048,15 +1201,24 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1378 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1378 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1580 </Y>
diff --git a/xml/menu_catalog_choose_drink3.xml b/xml/menu_catalog_choose_drink3.xml
index e9b02057..ea8d4df3 100644
--- a/xml/menu_catalog_choose_drink3.xml
+++ b/xml/menu_catalog_choose_drink3.xml
@@ -160,7 +160,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_ginger_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -183,7 +183,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_lemon_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -206,7 +206,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_taiwan_milk_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -229,7 +229,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_thai_milk_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -252,7 +252,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_coffee_thai_milk_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -275,20 +275,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_taiwan_milk_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0014.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -309,15 +318,24 @@
 	<Value> $11-99-01-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0012.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -338,15 +356,24 @@
 	<Value> $11-99-01-0012.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0011.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -367,15 +394,24 @@
 	<Value> $11-99-01-0011.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -396,15 +432,24 @@
 	<Value> $11-99-02-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0014.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -425,15 +470,24 @@
 	<Value> $11-99-02-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
diff --git a/xml/menu_catalog_choose_drink4.xml b/xml/menu_catalog_choose_drink4.xml
index 03cdf676..5b92a367 100644
--- a/xml/menu_catalog_choose_drink4.xml
+++ b/xml/menu_catalog_choose_drink4.xml
@@ -161,7 +161,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_cocoa.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -184,7 +184,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_milk_caramel.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -207,7 +207,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cocoa.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -230,20 +230,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_caramel.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -264,15 +273,24 @@
 	<Value> $11-99-01-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -293,15 +311,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0005.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -322,15 +349,24 @@
 	<Value> $11-99-02-0005.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0031.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
diff --git a/xml/menu_catalog_choose_drink5.xml b/xml/menu_catalog_choose_drink5.xml
index ed53e470..b75fc613 100644
--- a/xml/menu_catalog_choose_drink5.xml
+++ b/xml/menu_catalog_choose_drink5.xml
@@ -161,7 +161,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_lemonate.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -184,7 +184,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lemonade.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -207,7 +207,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lemonade_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -230,7 +230,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -253,7 +253,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala_lemon_juice.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -276,7 +276,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -299,7 +299,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala_lemon_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -322,20 +322,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_pink_milk.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0009.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -356,15 +365,24 @@
 	<Value> $11-99-01-0009.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0016.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -385,15 +403,24 @@
 	<Value> $11-99-02-0016.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -414,15 +441,24 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0020.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -443,15 +479,24 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0021.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -472,15 +517,24 @@
 	<Value> $11-99-02-0021.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0023.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -501,15 +555,24 @@
 	<Value> $11-99-02-0023.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0022.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -530,15 +593,24 @@
 	<Value> $11-99-02-0022.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0011.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
diff --git a/xml/menu_catalog_choose_drink6.xml b/xml/menu_catalog_choose_drink6.xml
index d3e57c13..3b325055 100644
--- a/xml/menu_catalog_choose_drink6.xml
+++ b/xml/menu_catalog_choose_drink6.xml
@@ -160,7 +160,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cola.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -183,7 +183,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cola_zero.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -206,7 +206,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_sprite.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -229,7 +229,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -252,20 +252,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0018.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -286,16 +295,25 @@
 	<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>200</Width>
+	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -315,15 +333,24 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0025.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -344,15 +371,24 @@
 	<Value> $11-99-02-0025.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0032.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -373,15 +409,24 @@
 	<Value> $11-99-02-0032.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0026.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
diff --git a/xml/menu_gen.py b/xml/menu_gen.py
index c8b662df..9cc36fac 100644
--- a/xml/menu_gen.py
+++ b/xml/menu_gen.py
@@ -35,15 +35,15 @@
       out_xml( '\t\tVar PictureDrink = "' + default_dir2 + '/' + bt_pic[i].replace('#','n') + '"\r\n')
       out_xml( '\t\tTopping "Load" SelectDrink\r\n')
       out_xml( '\t\tSAVELOG NameDrink\r\n')
-      #out_xml( '\t\tVar PriceShowValue = charOfBaht + PriceDrink\r\n')
-      out_xml( '\t\tVar PriceShowValue = "Free"r\n')
+      out_xml( '\t\tVar PriceShowValue = charOfBaht + PriceDrink\r\n')
+      #out_xml( '\t\tVar PriceShowValue = "Free"\r\n')
       out_xml( '\t\tOpen "ROOT/taobin_project/xml/menu_topping_alter.xml"\r\n')
   
       out_xml( '\t</EventOnClick>\r\n')
       out_xml( '\t</Button>\r\n')
  
   for i in range( menu_count):
-    if True :
+    if False :
       out_xml( '\t<Text>\r\n')
       out_xml( '\t<X> ' + str(x_button[i] + 164) + ' </X>\r\n')
       out_xml( '\t<Y> ' + str(y_button[i] + 12) + ' </Y>\r\n')
@@ -55,6 +55,7 @@
       out_xml( '\t</Text>\r\n')
       out_xml( '\t<Text>\r\n')
     else:
+      out_xml( '\t<Text>\r\n')
       out_xml( '\t<X> ' + str(x_button[i] + 182) + ' </X>\r\n')
       out_xml( '\t<Y> ' + str(y_button[i] + 12) + ' </Y>\r\n')
       out_xml( '\t<Align> "Hurr" </Align>\r\n')
diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml
index fbbee777..3e7ff841 100644
--- a/xml/menu_payment_cash.xml
+++ b/xml/menu_payment_cash.xml
@@ -10,7 +10,7 @@
 	SAVELOG NameDrink
 	SAVELOG NameDrinkTH
 	SAVELOG DrinkDescription
-	SAVELOG PriceDrink<Text>
+	SAVELOG PriceDrink
 
 
 	; On open
diff --git a/xml/menu_topping_alter.xml b/xml/menu_topping_alter.xml
index b2c40857..e8d04e76 100644
--- a/xml/menu_topping_alter.xml
+++ b/xml/menu_topping_alter.xml
@@ -12,10 +12,6 @@
 	Var SugarState4 = "Invisible"
 	Var SugarState5 = "Invisible"
 
-	Var BGSubmenu = "Invisible"
-	Var NormalMenu = "Invisible"
-	Var BaristaMenu = "Invisible"
-
 	;Var SugarState1 = "Enable"
 	;Var SugarState2 = "Enable"
 	;Var SugarState3 = "Enable"
@@ -53,48 +49,6 @@
 <Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
 </Image>
 
-
-
-<Image>
-<X> 44 </X>
-<Y> 977 </Y>
-<State> BGSubmenu </State>
-<Filename> "ROOT/taobin_project/image/topping/img2.png" </Filename>
-</Image>
-
-<Button>
-<X> 702 </X>
-<Y> 1004 </Y>
-<State> NormalMenu </State>
-<Filename> "ROOT/taobin_project/image/topping/bn_brew1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping/bp_brew1.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Mode> "NO" </Mode>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var NormalMenu = "PressForever"
-	Var BaristaMenu = "Enable"
-	Refresh
-</EventClick>
-</Button>
-
-<Button>
-<X> 844 </X>
-<Y> 1004 </Y>
-<State> BaristaMenu </State>
-<Filename> "ROOT/taobin_project/image/topping/bn_brew2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping/bp_brew2.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Mode> "NO" </Mode>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var NormalMenu = "Enable"
-	Var BaristaMenu = "PressForever"
-	Refresh
-</EventClick>
-</Button>
-
-
 ; back
 <Button>
 <X> 19 </X>
@@ -135,17 +89,7 @@
 
 	Else
 		If MenuCodeName = "barista1" Then
-			Var BGSubmenu = "Enable"
-			Var BaristaMenu = "Enable"
-			Var NormalMenu = "PressForever"
-			Var y_topping_bg = y2_topping_bg
-			Var y_topping = y2_topping
-			Var BugFlag = 1
-			SAVELOG y_topping_bg
-			SAVELOG y_topping
-			SAVELOG y2_topping_bg
-			SAVELOG y2_topping
-			Refresh
+			Open "ROOT/taobin_project/xml/menu_topping_with_barista.xml"
 
 		EndIf
 		If TOPPING1 = "Powder Sugar" Then
diff --git a/xml/menu_topping_with_barista.xml b/xml/menu_topping_with_barista.xml
index a7b37767..3ca48058 100644
--- a/xml/menu_topping_with_barista.xml
+++ b/xml/menu_topping_with_barista.xml
@@ -16,24 +16,50 @@
 	Var NormalMenu = "Invisible"
 	Var BaristaMenu = "Invisible"
 
-	;Var SugarState1 = "Enable"
-	;Var SugarState2 = "Enable"
-	;Var SugarState3 = "Enable"
-	;Var SugarState4 = "Enable"
-	;Var SugarState5 = "Enable"
+	Var BGSubmenu = "Enable"
+	Var BaristaMenu = "Enable"
+	Var NormalMenu = "PressForever"
+	Var y_topping_bg = y2_topping_bg
+	Var y_topping = y2_topping
+
 	Var BGSugar = "Invisible"
 
 	SAVELOG TOPPING1
 	SAVELOG TOPPING2
+	SAVELOG PreviseXMLFileName2
 	
-	Var y_block = 105
+	
+	Var y_sugar_block = 105
+	Var y_block = 206
 
 	Var y_topping_bg = 912
-	Var y_topping = 912 + y_block
+	Var y_topping = 912 + y_sugar_block
+	
+	Var y2_topping_bg = y_topping_bg + y_block
+	Var y2_topping = y_topping + y_block
 	
 	Var y_submenu_bg = 912
 
 	Var BugFlag = 0
+
+	Var y_topping_bg = y2_topping_bg
+	Var y_topping = y2_topping
+	Var BugFlag = 1
+	SAVELOG y_topping_bg
+	SAVELOG y_topping
+	SAVELOG y2_topping_bg
+	SAVELOG y2_topping
+
+	If TOPPING1 = "Powder Sugar" Then
+		Var SugarState1 = "PressForever"
+		Var SugarState2 = "Enable"
+		Var SugarState3 = "Enable"
+		Var SugarState4 = "Enable"
+		Var SugarState5 = "Enable"
+		Var BGSugar = "Enable"
+	EndIf
+	
+
 </EventOpen>
 <Timeout> 30000 </Timeout>
 <EventTimeout> 
@@ -51,21 +77,14 @@
 
 <Image>
 <X> 44 </X>
-<Y> y_topping_bg </Y>
-<State> BGSugar </State>
-<Filename> "ROOT/taobin_project/image/topping/img1.png" </Filename>
-</Image>
-
-<Image>
-<X> 44 </X>
-<Y> y_submenu_bg </Y>
+<Y> 938 </Y>
 <State> BGSubmenu </State>
 <Filename> "ROOT/taobin_project/image/topping/img2.png" </Filename>
 </Image>
 
 <Button>
-<X> 702 </X>
-<Y> 1004 </Y>
+<X> 550 </X>
+<Y> 963 </Y>
 <State> NormalMenu </State>
 <Filename> "ROOT/taobin_project/image/topping/bn_brew1.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping/bp_brew1.png" </FilenamePress>
@@ -75,13 +94,15 @@
 <EventClick> 
 	Var NormalMenu = "PressForever"
 	Var BaristaMenu = "Enable"
+	Var BugFlag = 1
+	Topping "Load" SelectDrink
 	Refresh
 </EventClick>
 </Button>
 
 <Button>
-<X> 702 </X>
-<Y> 1004 </Y>
+<X> 774 </X>
+<Y> 963 </Y>
 <State> BaristaMenu </State>
 <Filename> "ROOT/taobin_project/image/topping/bn_brew2.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping/bp_brew2.png" </FilenamePress>
@@ -91,6 +112,8 @@
 <EventClick> 
 	Var NormalMenu = "Enable"
 	Var BaristaMenu = "PressForever"
+	Var BugFlag = 1
+	Topping "Load" SubMenuProductCode1
 	Refresh
 </EventClick>
 </Button>
@@ -105,43 +128,19 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/menu_catalog.xml" 
+	Open PreviseXMLFileName2
+	;Open "ROOT/taobin_project/xml/menu_catalog.xml" 
 	
 </EventClick>
 </Button>
 
 <EventMachine>
-	;Open "ROOT/xml/menu_topping_sugar_only.xml"
-		
-	;SAVELOG TOPPING1
-	;SAVELOG TOPPING2
-	;If TOPPING1 = "Powder Sugar" Then
-	;	If TOPPING2 = "Hot water 3 step" Then
-	;		If SubMenuProductCode1 = "-" Then
-	;			Open "ROOT/xml/menu_topping_hot_menu.xml"
-	;		Else
-	;			Open "ROOT/xml/menu_topping_hot_menu_coffee.xml"
-	;		EndIf
-	;	Else
-	;		Open "ROOT/xml/menu_topping_sugar_only.xml"
-	;	EndIf
-	;EndIf
-	;Open "ROOT/xml/menu_page3_alter.xml"
-	
+	SAVELOG PriceDrink
 	SAVELOG TOPPING1
-
+	SAVELOG TOPPING2
+	SAVELOG MenuCodeName
+	
 	If BugFlag = 1 Then
-
-	Else
-		If SubMenuCodeName = "barista1" Then
-			Var BaristaMenu = "Enable"
-			Var NormalMenu = "PressForever"
-			Var y_topping_bg = 1017
-			Var y_topping = 1017 + y_block
-			Var BugFlag = 1
-			Refresh
-
-		EndIf
 		If TOPPING1 = "Powder Sugar" Then
 			Var SugarState1 = "PressForever"
 			Var SugarState2 = "Enable"
@@ -149,14 +148,23 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var BGSugar = "Enable"
-			Var BugFlag = 1
+			Var PriceShowValue = charOfBaht + PriceDrink
 			Refresh
-		Else
-			Open "ROOT/taobin_project/xml/menu_payment_cash.xml"
 		EndIf
 		
-	EndIf
+		If TOPPING1 = "Powder Sugar Premix 25" Then
+			Var SugarState1 = "Invisible"
+			Var SugarState2 = "Invisible"
+			Var SugarState3 = "PressForever"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var BGSugar = "Enable"
+			Var PriceShowValue = charOfBaht + SubMenuPrice1
+			Refresh
+		EndIf
 
+		Var BugFlag = 0
+	EndIf
 
 </EventMachine>
 
@@ -218,14 +226,14 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	//
-	If BaristaMenu = "PressForever" Then
-		Var SelectDrink = SubMenuProductCode1
-		Var NameDrink = SubMenuProductCode1.Name2
-		Var NameDrinkTH = SubMenuProductCode1.Name
-		Var DrinkDescription = SubMenuProductCode1.description
-		Var PriceDrink = SubMenuProductCode1.Price
-	EndIf
+	
+	;If BaristaMenu = "PressForever" Then
+	;	Var SelectDrink = SubMenuProductCode1
+	;	Var NameDrink = SubMenuName11
+	;	Var NameDrinkTH = SubMenuName21
+	;	Var DrinkDescription = SubMenuDescript1
+	;	Var PriceDrink = SubMenuPrice1
+	;EndIf
 
 	Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
 </EventClick>
@@ -243,6 +251,15 @@
 </Text>
 
 
+
+; sugar layout
+<Image>
+<X> 44 </X>
+<Y> y_topping_bg </Y>
+<State> BGSugar </State>
+<Filename> "ROOT/taobin_project/image/topping/img1.png" </Filename>
+</Image>
+
 ; sugar1
 <Button>
 <X> 181 </X>
@@ -253,13 +270,21 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "PressForever"
-	Var SugarState2 = "Enable"
+	
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "PressForever"
+		Var SugarState2 = "Enable"
+	EndIf
+	
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "Enable"
 	Var SugarState5 = "Enable"
 	Var topping1 = "1"
 	Refresh
+
 </EventClick>
 </Button>
 
@@ -273,13 +298,20 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "Enable"
-	Var SugarState2 = "PressForever"
+	
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "Enable"
+		Var SugarState2 = "PressForever"
+	EndIf
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "Enable"
 	Var SugarState5 = "Enable"
 	Var topping1 = "2"
 	Refresh
+
 </EventClick>
 </Button>
 
@@ -294,8 +326,15 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "Enable"
-	Var SugarState2 = "Enable"
+
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "Enable"
+		Var SugarState2 = "Enable"
+	EndIf
+
 	Var SugarState3 = "PressForever"
 	Var SugarState4 = "Enable"
 	Var SugarState5 = "Enable"
@@ -314,8 +353,15 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "Enable"
-	Var SugarState2 = "Enable"
+	
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "Enable"
+		Var SugarState2 = "Enable"
+	EndIf
+
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "PressForever"
 	Var SugarState5 = "Enable"
@@ -334,8 +380,15 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "Enable"
-	Var SugarState2 = "Enable"
+	
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "Enable"
+		Var SugarState2 = "Enable"
+	EndIf
+
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "Enable"
 	Var SugarState5 = "PressForever"