diff --git a/image/admain/1080X380PX.jpg b/image/admain/1080X380PX.jpg
new file mode 100644
index 00000000..96c2bcfa
Binary files /dev/null and b/image/admain/1080X380PX.jpg differ
diff --git a/image/admain/1080X608PX.jpg b/image/admain/1080X608PX.jpg
new file mode 100644
index 00000000..512648cf
Binary files /dev/null and b/image/admain/1080X608PX.jpg differ
diff --git a/image/drink_main.gif b/image/drink_main.gif
new file mode 100644
index 00000000..567e3d2f
Binary files /dev/null and b/image/drink_main.gif differ
diff --git a/image/main_page/bn_main_page_start.png b/image/main_page/bn_main_page_start.png
index ef5b52c7..40473769 100644
Binary files a/image/main_page/bn_main_page_start.png and b/image/main_page/bn_main_page_start.png differ
diff --git a/image/main_page/bp_main_page_start.png b/image/main_page/bp_main_page_start.png
index 4cd04bdd..4b434959 100644
Binary files a/image/main_page/bp_main_page_start.png and b/image/main_page/bp_main_page_start.png differ
diff --git a/image/page_payment/bn_cash_2.png b/image/page_payment/bn_cash_2.png
new file mode 100644
index 00000000..5607892a
Binary files /dev/null and b/image/page_payment/bn_cash_2.png differ
diff --git a/image/page_payment/bp_cash_2.png b/image/page_payment/bp_cash_2.png
new file mode 100644
index 00000000..885f139f
Binary files /dev/null and b/image/page_payment/bp_cash_2.png differ
diff --git a/xml/menu_board.xml b/xml/menu_board.xml
index 8221415d..daafdca7 100644
--- a/xml/menu_board.xml
+++ b/xml/menu_board.xml
@@ -16,6 +16,8 @@
 
 	Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf"
 	Var RobotoBlack = "ROOT/taobin_project/font/Roboto/Roboto-Black.ttf"
+
+	Var countClick = 0
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -23,11 +25,11 @@
 	Refresh
 </EventTimeout> 
 
-<Image>
-<X> 299 </X>
-<Y> 800 </Y>
-<Filename> "ROOT/taobin_project/image/main_page/am_main_page.png" </Filename>
-</Image>
+;<Image>
+;<X> 299 </X>
+;<Y> 800 </Y>
+;<Filename> "ROOT/taobin_project/image/main_page/am_main_page.jpg" </Filename>
+;</Image>
 
 <Button>
 <X> 212 </X>
@@ -70,7 +72,11 @@
 </EventClick>
 </Button>
 
-
+<GIF>
+<X> 196 </X>
+<Y> 607 </Y>
+<Filename> "ROOT/taobin_project/image/drink_main.gif" </Filename>
+</GIF>
 
 <EventNetDown>
 	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
@@ -79,4 +85,36 @@
 	Open "/mnt/sdcard/coffeevending/xml/main.xml" 
 </EventNetDeactive>
 
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+		
+	EndIf
+
+	If countClick = 5 Then
+		Var countClick = 0
+		MainMenu
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+<Text>
+<X> 0 </X>
+<Y> 1886 </Y>
+<Size> 20 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> countClick </Value>
+</Text>
+
+
+
 </Page>
diff --git a/xml/menu_brewing.xml b/xml/menu_brewing.xml
index 7bdf0562..2d078898 100644
--- a/xml/menu_brewing.xml
+++ b/xml/menu_brewing.xml
@@ -112,7 +112,6 @@
 <Y> 700 </Y>
 <Filename> GIFShowProcess </Filename>
 </GIF>
-<Text>
 
 <X> 0 </X>
 <Y> 1886 </Y>
diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml
index f264bb5e..76e4154b 100644
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@@ -24,7 +24,7 @@
 <Image>
 <X> 0 </X>
 <Y> 0 </Y>
-<Filename> "ROOT/taobin_project/image/page2/ad_blank1.png" </Filename>
+<Filename> "ROOT/taobin_project/image/admain/1080X380PX.jpg" </Filename>
 </Image>
 
 
diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml
index db10ea80..e3509fb9 100644
--- a/xml/menu_catalog_choose_drink1.xml
+++ b/xml/menu_catalog_choose_drink1.xml
@@ -173,7 +173,7 @@
 	<X> 60 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0004.Name2 </Value>
 	</Text>
@@ -217,7 +217,7 @@
 	<X> 317 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0020.Name2 </Value>
 	</Text>
@@ -261,7 +261,7 @@
 	<X> 574 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0017.Name2 </Value>
 	</Text>
@@ -305,7 +305,7 @@
 	<X> 831 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0017.Name2 </Value>
 	</Text>
@@ -349,7 +349,7 @@
 	<X> 60 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0018.Name2 </Value>
 	</Text>
diff --git a/xml/menu_catalog_choose_drink2.pml b/xml/menu_catalog_choose_drink2.pml
index ddc7176b..adf32243 100644
--- a/xml/menu_catalog_choose_drink2.pml
+++ b/xml/menu_catalog_choose_drink2.pml
@@ -6,7 +6,7 @@
  
   
  bt_pic = []
- bt_pic.append('b#_diy.png')
+ #bt_pic.append('b#_diy.png')
  bt_pic.append('b#_hot_espresso.png')
  bt_pic.append('b#_hot_double_espresso.png')
  bt_pic.append('b#_hot_latte.png')
@@ -28,7 +28,7 @@
 
 
  product_code = []
- product_code.append('##-##-##-####')
+ #product_code.append('##-##-##-####')
  product_code.append('11-99-01-0010')
  product_code.append('11-99-01-0001')
  product_code.append('11-99-01-0002')
diff --git a/xml/menu_catalog_choose_drink2.xml b/xml/menu_catalog_choose_drink2.xml
index 561094c8..165cd2a8 100644
--- a/xml/menu_catalog_choose_drink2.xml
+++ b/xml/menu_catalog_choose_drink2.xml
@@ -133,54 +133,10 @@
 
 
 
-	; button i=1 ##-##-##-#### 
+	; button i=1 11-99-01-0010 
 	<Button>
 	<X> 44 </X> 
 	<Y> 571 </Y> 
-	<Filename> "ROOT/taobin_project/image/menu_drink/bn_diy.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_diy.png" </FilenamePress>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventClick> 
-		Var SelectDrink = "##-##-##-####"
-		Var NameDrink = $##-##-##-####.Name2
-		Var NameDrinkTH = $##-##-##-####.Name
-		Var PriceDrink = $##-##-##-####.Price
-		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_diy.png"
-		Topping "Load" SelectDrink
-		SAVELOG NameDrink
-		Var PriceShowValue = charOfBaht + PriceDrink
-		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
-	</EventClick>
-	</Button>
-	<Text>
-	<X> 226 </X>
-	<Y> 583 </Y>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> $##-##-##-####.Price </Value>
-	</Text>
-	<Text>
-	<X> 208 </X>
-	<Y> 583 </Y>
-	<Size> 27 </Size>
-	<Font> KanitTTF </Font>
-	<Color> 0xB78F24 </Color>
-	<Value> "฿"" </Value>
-	</Text>
-	<Text>
-	<X> 60 </X>
-	<Y> 785 </Y>
-	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
-	<Color> 0x322B26 </Color>
-	<Value> $##-##-##-####.Name2 </Value>
-	</Text>
-	; button i=2 11-99-01-0010 
-	<Button>
-	<X> 301 </X> 
-	<Y> 571 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_hot_espresso.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_hot_espresso.png" </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -198,7 +154,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 483 </X>
+	<X> 226 </X>
 	<Y> 583 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -206,7 +162,7 @@
 	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 208 </X>
 	<Y> 583 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -214,16 +170,16 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 60 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0010.Name2 </Value>
 	</Text>
-	; button i=3 11-99-01-0001 
+	; button i=2 11-99-01-0001 
 	<Button>
-	<X> 558 </X> 
+	<X> 301 </X> 
 	<Y> 571 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_hot_double_espresso.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_hot_double_espresso.png" </FilenamePress>
@@ -242,7 +198,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 740 </X>
+	<X> 483 </X>
 	<Y> 583 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -250,7 +206,7 @@
 	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 465 </X>
 	<Y> 583 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -258,16 +214,16 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 317 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0001.Name2 </Value>
 	</Text>
-	; button i=4 11-99-01-0002 
+	; button i=3 11-99-01-0002 
 	<Button>
-	<X> 815 </X> 
+	<X> 558 </X> 
 	<Y> 571 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_hot_latte.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_hot_latte.png" </FilenamePress>
@@ -286,7 +242,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 997 </X>
+	<X> 740 </X>
 	<Y> 583 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -294,7 +250,7 @@
 	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 722 </X>
 	<Y> 583 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -302,17 +258,17 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 831 </X>
+	<X> 574 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0002.Name2 </Value>
 	</Text>
-	; button i=5 11-99-01-0004 
+	; button i=4 11-99-01-0004 
 	<Button>
-	<X> 44 </X> 
-	<Y> 899 </Y> 
+	<X> 815 </X> 
+	<Y> 571 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_hot_america_no.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_hot_america_no.png" </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -330,32 +286,32 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 911 </Y>
+	<X> 997 </X>
+	<Y> 583 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
 	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
-	<Y> 911 </Y>
+	<X> 979 </X>
+	<Y> 583 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
-	<Y> 1113 </Y>
+	<X> 831 </X>
+	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0004.Name2 </Value>
 	</Text>
-	; button i=6 11-99-01-0007 
+	; button i=5 11-99-01-0007 
 	<Button>
-	<X> 301 </X> 
+	<X> 44 </X> 
 	<Y> 899 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_hot_mocha.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_hot_mocha.png" </FilenamePress>
@@ -374,7 +330,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 483 </X>
+	<X> 226 </X>
 	<Y> 911 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -382,7 +338,7 @@
 	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 208 </X>
 	<Y> 911 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -390,16 +346,16 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 60 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0007.Name2 </Value>
 	</Text>
-	; button i=7 11-99-01-0017 
+	; button i=6 11-99-01-0017 
 	<Button>
-	<X> 558 </X> 
+	<X> 301 </X> 
 	<Y> 899 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_hot_caramel_macchiato.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_hot_caramel_macchiato.png" </FilenamePress>
@@ -418,7 +374,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 740 </X>
+	<X> 483 </X>
 	<Y> 911 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -426,7 +382,7 @@
 	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 465 </X>
 	<Y> 911 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -434,16 +390,16 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 317 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0017.Name2 </Value>
 	</Text>
-	; button i=8 11-99-01-0003 
+	; button i=7 11-99-01-0003 
 	<Button>
-	<X> 815 </X> 
+	<X> 558 </X> 
 	<Y> 899 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_hot_cappuccino.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_hot_cappuccino.png" </FilenamePress>
@@ -462,7 +418,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 997 </X>
+	<X> 740 </X>
 	<Y> 911 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -470,7 +426,7 @@
 	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 722 </X>
 	<Y> 911 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -478,17 +434,17 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 831 </X>
+	<X> 574 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0003.Name2 </Value>
 	</Text>
-	; button i=9 11-99-02-0006 
+	; button i=8 11-99-02-0006 
 	<Button>
-	<X> 44 </X> 
-	<Y> 1227 </Y> 
+	<X> 815 </X> 
+	<Y> 899 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_iced_epsresso.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_iced_epsresso.png" </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -506,32 +462,32 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 1239 </Y>
+	<X> 997 </X>
+	<Y> 911 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
 	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
-	<Y> 1239 </Y>
+	<X> 979 </X>
+	<Y> 911 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
-	<Y> 1441 </Y>
+	<X> 831 </X>
+	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0006.Name2 </Value>
 	</Text>
-	; button i=10 11-99-02-0024 
+	; button i=9 11-99-02-0024 
 	<Button>
-	<X> 301 </X> 
+	<X> 44 </X> 
 	<Y> 1227 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_iced_thai_black_coffee.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_iced_thai_black_coffee.png" </FilenamePress>
@@ -550,7 +506,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 483 </X>
+	<X> 226 </X>
 	<Y> 1239 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -558,7 +514,7 @@
 	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 208 </X>
 	<Y> 1239 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -566,16 +522,16 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 60 </X>
 	<Y> 1441 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0024.Name2 </Value>
 	</Text>
-	; button i=11 11-99-02-0001 
+	; button i=10 11-99-02-0001 
 	<Button>
-	<X> 558 </X> 
+	<X> 301 </X> 
 	<Y> 1227 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_iced_lattle.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_iced_lattle.png" </FilenamePress>
@@ -594,7 +550,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 740 </X>
+	<X> 483 </X>
 	<Y> 1239 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -602,7 +558,7 @@
 	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 465 </X>
 	<Y> 1239 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -610,16 +566,16 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 317 </X>
 	<Y> 1441 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0001.Name2 </Value>
 	</Text>
-	; button i=12 11-99-02-0003 
+	; button i=11 11-99-02-0003 
 	<Button>
-	<X> 815 </X> 
+	<X> 558 </X> 
 	<Y> 1227 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_iced_america_no.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_iced_america_no.png" </FilenamePress>
@@ -638,7 +594,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 997 </X>
+	<X> 740 </X>
 	<Y> 1239 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -646,7 +602,7 @@
 	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 722 </X>
 	<Y> 1239 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -654,17 +610,17 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 831 </X>
+	<X> 574 </X>
 	<Y> 1441 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0003.Name2 </Value>
 	</Text>
-	; button i=13 11-99-02-0007 
+	; button i=12 11-99-02-0007 
 	<Button>
-	<X> 44 </X> 
-	<Y> 1555 </Y> 
+	<X> 815 </X> 
+	<Y> 1227 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_iced_mocha.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_iced_mocha.png" </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -682,32 +638,32 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 226 </X>
-	<Y> 1567 </Y>
+	<X> 997 </X>
+	<Y> 1239 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
 	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
-	<Y> 1567 </Y>
+	<X> 979 </X>
+	<Y> 1239 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 60 </X>
-	<Y> 1769 </Y>
+	<X> 831 </X>
+	<Y> 1441 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0007.Name2 </Value>
 	</Text>
-	; button i=14 11-99-02-0030 
+	; button i=13 11-99-02-0030 
 	<Button>
-	<X> 301 </X> 
+	<X> 44 </X> 
 	<Y> 1555 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_iced_caramel_macchiato.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_iced_caramel_macchiato.png" </FilenamePress>
@@ -726,7 +682,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 483 </X>
+	<X> 226 </X>
 	<Y> 1567 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -734,7 +690,7 @@
 	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 208 </X>
 	<Y> 1567 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -742,16 +698,16 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 317 </X>
+	<X> 60 </X>
 	<Y> 1769 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0030.Name2 </Value>
 	</Text>
-	; button i=15 11-99-02-0002 
+	; button i=14 11-99-02-0002 
 	<Button>
-	<X> 558 </X> 
+	<X> 301 </X> 
 	<Y> 1555 </Y> 
 	<Filename> "ROOT/taobin_project/image/menu_drink/bn_iced_cappuccino.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/menu_drink/bp_iced_cappuccino.png" </FilenamePress>
@@ -770,7 +726,7 @@
 	</EventClick>
 	</Button>
 	<Text>
-	<X> 740 </X>
+	<X> 483 </X>
 	<Y> 1567 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -778,7 +734,7 @@
 	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 465 </X>
 	<Y> 1567 </Y>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
@@ -786,10 +742,10 @@
 	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<X> 574 </X>
+	<X> 317 </X>
 	<Y> 1769 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0002.Name2 </Value>
 	</Text>
diff --git a/xml/menu_catalog_choose_drink3.xml b/xml/menu_catalog_choose_drink3.xml
index a2f49973..abc4d4c6 100644
--- a/xml/menu_catalog_choose_drink3.xml
+++ b/xml/menu_catalog_choose_drink3.xml
@@ -171,7 +171,7 @@
 	<X> 60 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0014.Name2 </Value>
 	</Text>
@@ -215,7 +215,7 @@
 	<X> 317 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0012.Name2 </Value>
 	</Text>
@@ -259,7 +259,7 @@
 	<X> 574 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0011.Name2 </Value>
 	</Text>
@@ -303,7 +303,7 @@
 	<X> 831 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0004.Name2 </Value>
 	</Text>
@@ -347,7 +347,7 @@
 	<X> 60 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0014.Name2 </Value>
 	</Text>
@@ -391,7 +391,7 @@
 	<X> 317 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0010.Name2 </Value>
 	</Text>
diff --git a/xml/menu_catalog_choose_drink4.xml b/xml/menu_catalog_choose_drink4.xml
index 8f966641..d5920cf2 100644
--- a/xml/menu_catalog_choose_drink4.xml
+++ b/xml/menu_catalog_choose_drink4.xml
@@ -171,7 +171,7 @@
 	<X> 60 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0006.Name2 </Value>
 	</Text>
@@ -215,7 +215,7 @@
 	<X> 317 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0017.Name2 </Value>
 	</Text>
@@ -259,7 +259,7 @@
 	<X> 574 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0005.Name2 </Value>
 	</Text>
@@ -303,7 +303,7 @@
 	<X> 831 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0031.Name2 </Value>
 	</Text>
diff --git a/xml/menu_catalog_choose_drink5.xml b/xml/menu_catalog_choose_drink5.xml
index fde85443..4e43f022 100644
--- a/xml/menu_catalog_choose_drink5.xml
+++ b/xml/menu_catalog_choose_drink5.xml
@@ -171,7 +171,7 @@
 	<X> 60 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-01-0009.Name2 </Value>
 	</Text>
@@ -215,7 +215,7 @@
 	<X> 317 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0016.Name2 </Value>
 	</Text>
@@ -259,7 +259,7 @@
 	<X> 574 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0017.Name2 </Value>
 	</Text>
@@ -303,7 +303,7 @@
 	<X> 831 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0020.Name2 </Value>
 	</Text>
@@ -347,7 +347,7 @@
 	<X> 60 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0021.Name2 </Value>
 	</Text>
@@ -391,7 +391,7 @@
 	<X> 317 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0023.Name2 </Value>
 	</Text>
@@ -435,7 +435,7 @@
 	<X> 574 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0022.Name2 </Value>
 	</Text>
@@ -479,7 +479,7 @@
 	<X> 831 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0011.Name2 </Value>
 	</Text>
diff --git a/xml/menu_catalog_choose_drink6.xml b/xml/menu_catalog_choose_drink6.xml
index 687c0426..5e693ee5 100644
--- a/xml/menu_catalog_choose_drink6.xml
+++ b/xml/menu_catalog_choose_drink6.xml
@@ -173,7 +173,7 @@
 	<X> 60 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0018.Name2 </Value>
 	</Text>
@@ -217,7 +217,7 @@
 	<X> 317 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0018.Name2 </Value>
 	</Text>
@@ -261,7 +261,7 @@
 	<X> 574 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0025.Name2 </Value>
 	</Text>
@@ -305,7 +305,7 @@
 	<X> 831 </X>
 	<Y> 785 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0032.Name2 </Value>
 	</Text>
@@ -349,7 +349,7 @@
 	<X> 60 </X>
 	<Y> 1113 </Y>
 	<Size> 24 </Size>
-	<Font> RobotoBold </Font>
+	<Font> RobotoBlack </Font>
 	<Color> 0x322B26 </Color>
 	<Value> $11-99-02-0026.Name2 </Value>
 	</Text>
diff --git a/xml/menu_gen.py b/xml/menu_gen.py
index 10c71759..1465359a 100644
--- a/xml/menu_gen.py
+++ b/xml/menu_gen.py
@@ -47,7 +47,7 @@
       out_xml( '\t<X> ' + str(x_button[i] + 16) + ' </X>\r\n')
       out_xml( '\t<Y> ' + str(y_button[i] + 214) + ' </Y>\r\n')
       out_xml( '\t<Size> 24 </Size>\r\n')
-      out_xml( '\t<Font> RobotoBold </Font>\r\n')
+      out_xml( '\t<Font> RobotoBlack </Font>\r\n')
       out_xml( '\t<Color> 0x322B26 </Color>\r\n')
       out_xml( '\t<Value> $' + product_code[i] + '.Name2 </Value>\r\n')
       out_xml( '\t</Text>\r\n')
diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml
index 9a1879a5..b4c901da 100644
--- a/xml/menu_payment_cash.xml
+++ b/xml/menu_payment_cash.xml
@@ -334,11 +334,12 @@
 <Image>
 <X> 0 </X>
 <Y> 0 </Y>
-<Filename> "ROOT/taobin_project/image/page2/ad_blank1.png" </Filename>
+<Filename> "ROOT/taobin_project/image/admain/1080X380PX.jpg" </Filename>
 <EventClick>
 	Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
 	Var MachineStage = "make-drink"
 	Var BrewingTextThai = "เตรียมแก้ว"
+	MakeDrinkV1  SelectDrink SelectSugarID
 	Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
 </EventClick>
 </Image>
@@ -381,23 +382,30 @@
 <Button>
 <X> 287 </X>
 <Y> 1282 </Y>
-<State>PayState1</State>
-<Filename> "ROOT/taobin_project/image/page_payment/bn_cash.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_payment/bp_cash.png" </FilenamePress>
+<State>"Enable"</State>
+<Filename> "ROOT/taobin_project/image/page_payment/bn_cash_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page_payment/bp_cash_2.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var PayState1 = "PressForever"
-	Var PayState2 = "Enable"
-	Var QRChannel = 0
-    Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
+	;Var PayState1 = "PressForever"
+	;Var PayState2 = "Enable"
+	;Var QRChannel = 0
+    ;Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
+
+    Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
+	Var MachineStage = "make-drink"
+	Var BrewingTextThai = "เตรียมแก้ว"
+	MakeDrinkV1  SelectDrink SelectSugarID
+	Open "ROOT/taobin_project/xml/menu_thankyou.xml" 
+
 </EventClick>
 </Button>
 
 <Button>
 <X> 287 </X>
 <Y> 1430 </Y>
-<State>PayState2</State>
+<State>"Disable"</State>
 <Filename> "ROOT/taobin_project/image/page_payment/bn_pay_with_code.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page_payment/bp_pay_with_code.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -417,7 +425,7 @@
 <Button>
 <X> 287 </X>
 <Y> 1578 </Y>
-<State>PayState3</State>
+<State>"Disable"</State>
 <Filename> "ROOT/taobin_project/image/page_payment/bn_prompt_pay.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page_payment/bp_prompt_pay.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -470,7 +478,7 @@
 <Size> 72 </Size>
 <Font> KanitMediaTTF </Font>
 <Color> 0xB78F24 </Color>
-<Value> PriceShowValue </Value>
+<Value> "Free" </Value>
 </Text>
 
 <Text>
diff --git a/xml/menu_topping_alter.xml b/xml/menu_topping_alter.xml
index e698a5b2..7fe53b6f 100644
--- a/xml/menu_topping_alter.xml
+++ b/xml/menu_topping_alter.xml
@@ -6,13 +6,21 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	Var SugarState1 = "PressForever"
-	Var SugarState2 = "Enable"
-	Var SugarState3 = "Enable"
-	Var SugarState4 = "Enable"
-	Var SugarState5 = "Enable"
+	Var SugarState1 = "Invisible"
+	Var SugarState2 = "Invisible"
+	Var SugarState3 = "Invisible"
+	Var SugarState4 = "Invisible"
+	Var SugarState5 = "Invisible"
+	
+	;Var SugarState1 = "Enable"
+	;Var SugarState2 = "Enable"
+	;Var SugarState3 = "Enable"
+	;Var SugarState4 = "Enable"
+	;Var SugarState5 = "Enable"
+	Var BGSugar = "Invisible"
 
-	SAVELOG NameDrink
+	SAVELOG TOPPING1
+	SAVELOG TOPPING2
 
 </EventOpen>
 <Timeout> 30000 </Timeout>
@@ -24,7 +32,7 @@
 <Image>
 <X> 0 </X>
 <Y> 0 </Y>
-<Filename> "ROOT/taobin_project/image/page2/ad_blank1.png" </Filename>
+<Filename> "ROOT/taobin_project/image/admain/1080X380PX.jpg" </Filename>
 </Image>
 
 
@@ -32,6 +40,7 @@
 <Image>
 <X> 44 </X>
 <Y> 872 </Y>
+<State> BGSugar </State>
 <Filename> "ROOT/taobin_project/image/topping/img1.png" </Filename>
 </Image>
 
@@ -67,6 +76,20 @@
 	;	EndIf
 	;EndIf
 	;Open "ROOT/xml/menu_page3_alter.xml"
+	
+	SAVELOG TOPPING1
+
+	If TOPPING1 = "Powder Sugar" Then
+		Var SugarState1 = "PressForever"
+		Var SugarState2 = "Enable"
+		Var SugarState3 = "Enable"
+		Var SugarState4 = "Enable"
+		Var SugarState5 = "Enable"
+		Var BGSugar = "Enable"
+		Refresh
+	Else
+		Open "ROOT/taobin_project/xml/menu_payment_cash.xml"
+	EndIf
 
 
 </EventMachine>
diff --git a/xml/test_video_loop.xml b/xml/test_video_loop.xml
index b45fb65e..db7b18e4 100644
--- a/xml/test_video_loop.xml
+++ b/xml/test_video_loop.xml
@@ -2,28 +2,9 @@
 <Scale> "ALL" </Scale>
 <Width> HeadScreenWidth </Width>
 <Height> HeadScreenHeight </Height>
-<Video> AdvFilename </Video>
+;<Video> AdvFilename </Video>
+<Background> "ROOT/taobin_project/image/admain/1080X608PX.jpg" </Background>
 <EventOpen>
-	Var Count = Count + 1
-	If VendingClass = "coffeeInthanin01" Then
-		If Count > 1 Then
-			Var Count = 1
-		EndIf
-	Else
-		If Count > 3 Then
-			Var Count = 1
-		EndIf
-	EndIf
-	
-	If VendingClass = "coffeeInthanin01" Then
-		Var AdvFilename = "/mnt/sdcard/coffeevending/video/adv_inthanin_0"
-		Var AdvFilename = AdvFilename + Count
-		Var AdvFilename = AdvFilename + ".mp4"
-	Else
-		Var AdvFilename = "/mnt/sdcard/coffeevending/video/adv_main_0"
-		Var AdvFilename = AdvFilename + Count
-		Var AdvFilename = AdvFilename + ".mp4"
-	EndIf
 	
 </EventOpen>