diff --git a/xml/menu_board.xml b/xml/menu_board.xml
index 9f414192..f2ce3119 100644
--- a/xml/menu_board.xml
+++ b/xml/menu_board.xml
@@ -13,6 +13,7 @@
 	Var charOfBaht = "฿"
 	Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf"
 
+	Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf"
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
diff --git a/xml/menu_catalog_choose_drink.pml b/xml/menu_catalog_choose_drink.pml
index 474fdceb..b2f75f21 100644
--- a/xml/menu_catalog_choose_drink.pml
+++ b/xml/menu_catalog_choose_drink.pml
@@ -1,3 +1,44 @@
+<?hurr
+ 
+ default_dir = 'ROOT/taobin_project/image/menu_drink/'
+
+ menu_count = 2
+ x1 = 44
+ x2 = 301
+ x3 = 558
+ x4 = 815
+ 
+ y1 = 571
+ y1 = 571
+ y1 = 571
+ y1 = 571
+ x_button = [ 
+    x1,
+    x2,
+    x3,
+    x4
+
+    ]
+ y_button = [
+    y1,
+    y1,
+    y1,
+    y1
+    
+ ]
+ 
+  
+ bt_pic = []
+ bt_pic.append('b#_diy.png')
+ bt_pic.append('b#_hot_espresso.png')
+
+
+ product_code = []
+ product_code.append('##-##-##-####')
+ product_code.append('11-99-01-0010')
+
+?>
+
 <Popup>
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
@@ -46,7 +87,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/menu_back_to_main.xml" 
+	Open "ROOT/taobin_project/xml/menu_catalog.xml" 
 	
 </EventClick>
 </Button>
@@ -74,7 +115,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-;	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink1.xml" 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
 
@@ -128,52 +169,51 @@
 
 
 
+<?hurr
+ for i in range( menu_count):
+    i_str = str(i + 1)
+    out_xml( '\t; button i='+ i_str + ' ' + product_code[i]+ ' \r\n')
 
+    out_xml( '\t<Button>\r\n')
+    out_xml( '\t<X> ' + str(x_button[i]) + ' </X> \r\n')
+    out_xml( '\t<Y> ' + str(y_button[i]) + ' </Y> \r\n')
+    out_xml( '\t<Filename> "' + default_dir + ''+ bt_pic[i].replace('#','n') +'" </Filename>\r\n')
+    out_xml( '\t<FilenamePress> "' + default_dir + ''+ bt_pic[i].replace('#','p') +'" </FilenamePress>\r\n')
+    out_xml( '\t<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
+    out_xml( '\t<Volume> SoundVolume </Volume>\r\n')
+    out_xml( '\t<EventClick> \r\n')
+	
+    out_xml( '\t\tVar SelectDrink = "'+ product_code[i] +'"\r\n')
+    out_xml( '\t\tVar NameDrink = ' + product_code[i] + '.Name\r\n')
+    out_xml( '\t\tVar NameDrinkTH = ' + product_code[i] + '.Name2\r\n')
+    out_xml( '\t\tVar PriceDrink = ' + product_code[i] + '.Price\r\n')
+    out_xml( '\t\tVar PictureDrink = "' + default_dir + '/' + bt_pic[i].replace('#','p') + '"\r\n')
+    out_xml( '\t\tTopping "Load" SelectDrink\r\n')
+    out_xml( '\t\tSAVELOG SelectDrink\r\n')
+    out_xml( '\t\tVar PriceShowValue = charOfBaht + "15"\r\n')
+    out_xml( '\t\tOpen "ROOT/taobin_project/xml/menu_topping_alter.xml"\r\n')
 
-<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> 
+    out_xml( '\t</EventClick>\r\n')
+    out_xml( '\t</Button>\r\n')
 
-</EventClick>
-</Button>
-
-
-<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>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var SelectDrink = "11-99-01-0010"
-	Var NameDrink = 11-99-01-0010.Name
-	Var NameDrinkTH = 11-99-01-0010.Name2
-	Var PriceDrink = 11-99-01-0010.Price
-	Var PictureDrink = "ROOT/taobin_project/image/menu_drink/bn_hot_espresso.png"
-
-	Topping "Load" SelectDrink
-	SAVELOG SelectDrink
-	Var PriceShowValue = charOfBaht + "15"
-
-	Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
-</EventClick>
-</Button>
-
-<Text>
-<X> 164 </X>
-<Y> 12 </Y>
-<Size> 27 </Size>
-<Font> KanitTTF </Font>
-<Color> 0xB78F24 </Color>
-<Value> "10" </Value>
-</Text>
+    out_xml( '\t<Text>\r\n')
+    out_xml( '\t<X> ' + str(x_button[i] + 184) + ' </X>\r\n')
+    out_xml( '\t<Y> ' + str(y_button[i] + 12) + ' </Y>\r\n')
+    out_xml( '\t<Size> 27 </Size>\r\n')
+    out_xml( '\t<Font> KanitTTF </Font>\r\n')
+    out_xml( '\t<Color> 0xB78F24 </Color>\r\n')
+    out_xml( '\t<Value> $' + product_code[i] + '.Price </Value>\r\n')
+    out_xml( '\t</Text>\r\n')
 
+    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')
+    out_xml( '\t<Size> 27 </Size>\r\n')
+    out_xml( '\t<Font> KanitTTF </Font>\r\n')
+    out_xml( '\t<Color> 0xB78F24 </Color>\r\n')
+    out_xml( '\t<Value> "฿"" </Value>\r\n')
+    out_xml( '\t</Text>\r\n')
+?>
 
 
 
diff --git a/xml/menu_catalog_choose_drink.xml b/xml/menu_catalog_choose_drink.xml
index 21c1bed8..da56ba38 100644
--- a/xml/menu_catalog_choose_drink.xml
+++ b/xml/menu_catalog_choose_drink.xml
@@ -1,3 +1,5 @@
+
+
 <Popup>
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
@@ -46,7 +48,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/menu_back_to_main.xml" 
+	Open "ROOT/taobin_project/xml/menu_catalog.xml" 
 	
 </EventClick>
 </Button>
@@ -67,63 +69,143 @@
 ;bn_bestseller
 <Button>
 <X> 107 </X>
-<Y> 419 </Y>
+<Y> 417 </Y>
+<State> "PressForever" </State>
 <Filename> "ROOT/taobin_project/image/page3/bn_bestseller.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page3/bp_bestseller.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	; 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
 
 <Button>
 <X> 282 </X>
-<Y> 419 </Y>
+<Y> 417 </Y>
 <Filename> "ROOT/taobin_project/image/page3/bn_coffee.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page3/bp_coffee.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	; 
+ 	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink2.xml"
 </EventClick>
 </Button>
 
 <Button>
 <X> 456 </X>
-<Y> 419 </Y>
+<Y> 417 </Y>
 <Filename> "ROOT/taobin_project/image/page3/bn_tea.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page3/bp_tea.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	; 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink3.xml" 
 </EventClick>
 </Button>
 
 <Button>
 <X> 633 </X>
-<Y> 419 </Y>
+<Y> 417 </Y>
 <Filename> "ROOT/taobin_project/image/page3/bn_cho_ca.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page3/bp_cho_ca.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	; 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink4.xml" 
 </EventClick>
 </Button>
 
 <Button>
 <X> 810 </X>
-<Y> 419 </Y>
+<Y> 417 </Y>
 <Filename> "ROOT/taobin_project/image/page3/bn_fruit.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page3/bp_fruit.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	; 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink5.xml" 
 </EventClick>
 </Button>
 
 
+
+	; button i=1 ##-##-##-#### 
+	<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 = ##-##-##-####.Name
+		Var NameDrinkTH = ##-##-##-####.Name2
+		Var PriceDrink = ##-##-##-####.Price
+		Var PictureDrink = "ROOT/taobin_project/image/menu_drink//bp_diy.png"
+		Topping "Load" SelectDrink
+		SAVELOG SelectDrink
+		Var PriceShowValue = charOfBaht + "15"
+		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
+	</EventClick>
+	</Button>
+	<Text>
+	<X> 228 </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>
+	; 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>
+	<Volume> SoundVolume </Volume>
+	<EventClick> 
+		Var SelectDrink = "11-99-01-0010"
+		Var NameDrink = 11-99-01-0010.Name
+		Var NameDrinkTH = 11-99-01-0010.Name2
+		Var PriceDrink = 11-99-01-0010.Price
+		Var PictureDrink = "ROOT/taobin_project/image/menu_drink//bp_hot_espresso.png"
+		Topping "Load" SelectDrink
+		SAVELOG SelectDrink
+		Var PriceShowValue = charOfBaht + "15"
+		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
+	</EventClick>
+	</Button>
+	<Text>
+	<X> 485 </X>
+	<Y> 583 </Y>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-01-0010.Price </Value>
+	</Text>
+	<Text>
+	<X> 465 </X>
+	<Y> 583 </Y>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+
+
+
+
+
+
 </Popup>
diff --git a/xml/menu_catalog_choose_drink1.pml b/xml/menu_catalog_choose_drink1.pml
new file mode 100644
index 00000000..f38e800a
--- /dev/null
+++ b/xml/menu_catalog_choose_drink1.pml
@@ -0,0 +1,233 @@
+<?hurr
+ 
+ default_dir = 'ROOT/taobin_project/image/menu_drink/'
+
+ menu_count = 3
+ x1 = 44
+ x2 = 301
+ x3 = 558
+ x4 = 815
+ 
+ y1 = 571
+ y1 = 571
+ y1 = 571
+ y1 = 571
+ x_button = [ 
+    x1,
+    x2,
+    x3,
+    x4
+
+    ]
+ y_button = [
+    y1,
+    y1,
+    y1,
+    y1
+    
+ ]
+ 
+  
+ bt_pic = []
+ bt_pic.append('b#_diy.png')
+ bt_pic.append('b#_hot_espresso.png')
+ bt_pic.append('b#_hot_double_espresso.png')
+
+
+ product_code = []
+ product_code.append('##-##-##-####')
+ product_code.append('11-99-01-0010')
+ product_code.append('11-99-01-0001')
+
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	TimerReset
+</EventTimeout> 
+
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/image/page2/ad_blank1.png" </Filename>
+</Image>
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 517 </Y>
+<Filename> "ROOT/taobin_project/image/page3/tab_line_bottom.png" </Filename>
+</Image>
+
+
+; under line
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
+</Image>
+
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 420 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/menu_catalog.xml" 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 990 </X>
+<Y> 438 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_eng_lang.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_eng_lang.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+</EventClick>
+</Button>
+
+
+;bn_bestseller
+<Button>
+<X> 107 </X>
+<Y> 417 </Y>
+<State> "PressForever" </State>
+<Filename> "ROOT/taobin_project/image/page3/bn_bestseller.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page3/bp_bestseller.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink1.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 282 </X>
+<Y> 417 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bn_coffee.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page3/bp_coffee.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+ 	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink2.xml"
+</EventClick>
+</Button>
+
+<Button>
+<X> 456 </X>
+<Y> 417 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bn_tea.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page3/bp_tea.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink3.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 633 </X>
+<Y> 417 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bn_cho_ca.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page3/bp_cho_ca.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink4.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 810 </X>
+<Y> 417 </Y>
+<Filename> "ROOT/taobin_project/image/page3/bn_fruit.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page3/bp_fruit.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink5.xml" 
+</EventClick>
+</Button>
+
+
+
+<?hurr
+ for i in range( menu_count):
+    i_str = str(i + 1)
+    out_xml( '\t; button i='+ i_str + ' ' + product_code[i]+ ' \r\n')
+
+    out_xml( '\t<Button>\r\n')
+    out_xml( '\t<X> ' + str(x_button[i]) + ' </X> \r\n')
+    out_xml( '\t<Y> ' + str(y_button[i]) + ' </Y> \r\n')
+    out_xml( '\t<Filename> "' + default_dir + ''+ bt_pic[i].replace('#','n') +'" </Filename>\r\n')
+    out_xml( '\t<FilenamePress> "' + default_dir + ''+ bt_pic[i].replace('#','p') +'" </FilenamePress>\r\n')
+    out_xml( '\t<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
+    out_xml( '\t<Volume> SoundVolume </Volume>\r\n')
+    out_xml( '\t<EventClick> \r\n')
+	
+    out_xml( '\t\tVar SelectDrink = "'+ product_code[i] +'"\r\n')
+    out_xml( '\t\tVar NameDrink = ' + product_code[i] + '.Name\r\n')
+    out_xml( '\t\tVar NameDrinkTH = ' + product_code[i] + '.Name2\r\n')
+    out_xml( '\t\tVar PriceDrink = ' + product_code[i] + '.Price\r\n')
+    out_xml( '\t\tVar PictureDrink = "' + default_dir + '/' + bt_pic[i].replace('#','p') + '"\r\n')
+    out_xml( '\t\tTopping "Load" SelectDrink\r\n')
+    out_xml( '\t\tSAVELOG SelectDrink\r\n')
+    out_xml( '\t\tVar PriceShowValue = charOfBaht + "15"\r\n')
+    out_xml( '\t\tOpen "ROOT/taobin_project/xml/menu_topping_alter.xml"\r\n')
+
+    out_xml( '\t</EventClick>\r\n')
+    out_xml( '\t</Button>\r\n')
+
+    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<Size> 27 </Size>\r\n')
+    out_xml( '\t<Font> KanitTTF </Font>\r\n')
+    out_xml( '\t<Color> 0xB78F24 </Color>\r\n')
+    out_xml( '\t<Value> $' + product_code[i] + '.Price </Value>\r\n')
+    out_xml( '\t</Text>\r\n')
+
+    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')
+    out_xml( '\t<Size> 27 </Size>\r\n')
+    out_xml( '\t<Font> KanitTTF </Font>\r\n')
+    out_xml( '\t<Color> 0xB78F24 </Color>\r\n')
+    out_xml( '\t<Value> "฿"" </Value>\r\n')
+    out_xml( '\t</Text>\r\n')
+
+    out_xml( '\t<Text>\r\n')
+    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<Color> 0x322B26 </Color>\r\n')
+    out_xml( '\t<Value> $' + product_code[i] + '.Name2 </Value>\r\n')
+    out_xml( '\t</Text>\r\n')
+?>
+
+
+
+
+
+</Popup>
diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml
index 474fdceb..d4f3f4f2 100644
--- a/xml/menu_catalog_choose_drink1.xml
+++ b/xml/menu_catalog_choose_drink1.xml
@@ -1,3 +1,5 @@
+
+
 <Popup>
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
@@ -46,7 +48,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/menu_back_to_main.xml" 
+	Open "ROOT/taobin_project/xml/menu_catalog.xml" 
 	
 </EventClick>
 </Button>
@@ -74,7 +76,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-;	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink1.xml" 
+	Open "ROOT/taobin_project/xml/menu_catalog_choose_drink1.xml" 
 </EventClick>
 </Button>
 
@@ -128,51 +130,138 @@
 
 
 
-
-
-<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> 
-
-</EventClick>
-</Button>
-
-
-<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>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var SelectDrink = "11-99-01-0010"
-	Var NameDrink = 11-99-01-0010.Name
-	Var NameDrinkTH = 11-99-01-0010.Name2
-	Var PriceDrink = 11-99-01-0010.Price
-	Var PictureDrink = "ROOT/taobin_project/image/menu_drink/bn_hot_espresso.png"
-
-	Topping "Load" SelectDrink
-	SAVELOG SelectDrink
-	Var PriceShowValue = charOfBaht + "15"
-
-	Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
-</EventClick>
-</Button>
-
-<Text>
-<X> 164 </X>
-<Y> 12 </Y>
-<Size> 27 </Size>
-<Font> KanitTTF </Font>
-<Color> 0xB78F24 </Color>
-<Value> "10" </Value>
-</Text>
+	; button i=1 ##-##-##-#### 
+	<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 = ##-##-##-####.Name
+		Var NameDrinkTH = ##-##-##-####.Name2
+		Var PriceDrink = ##-##-##-####.Price
+		Var PictureDrink = "ROOT/taobin_project/image/menu_drink//bp_diy.png"
+		Topping "Load" SelectDrink
+		SAVELOG SelectDrink
+		Var PriceShowValue = charOfBaht + "15"
+		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>
+	<Volume> SoundVolume </Volume>
+	<EventClick> 
+		Var SelectDrink = "11-99-01-0010"
+		Var NameDrink = 11-99-01-0010.Name
+		Var NameDrinkTH = 11-99-01-0010.Name2
+		Var PriceDrink = 11-99-01-0010.Price
+		Var PictureDrink = "ROOT/taobin_project/image/menu_drink//bp_hot_espresso.png"
+		Topping "Load" SelectDrink
+		SAVELOG SelectDrink
+		Var PriceShowValue = charOfBaht + "15"
+		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
+	</EventClick>
+	</Button>
+	<Text>
+	<X> 483 </X>
+	<Y> 583 </Y>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-01-0010.Price </Value>
+	</Text>
+	<Text>
+	<X> 465 </X>
+	<Y> 583 </Y>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 317 </X>
+	<Y> 785 </Y>
+	<Size> 24 </Size>
+	<Font> RobotoBold </Font>
+	<Color> 0x322B26 </Color>
+	<Value> $11-99-01-0010.Name2 </Value>
+	</Text>
+	; button i=3 11-99-01-0001 
+	<Button>
+	<X> 558 </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>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventClick> 
+		Var SelectDrink = "11-99-01-0001"
+		Var NameDrink = 11-99-01-0001.Name
+		Var NameDrinkTH = 11-99-01-0001.Name2
+		Var PriceDrink = 11-99-01-0001.Price
+		Var PictureDrink = "ROOT/taobin_project/image/menu_drink//bp_hot_double_espresso.png"
+		Topping "Load" SelectDrink
+		SAVELOG SelectDrink
+		Var PriceShowValue = charOfBaht + "15"
+		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
+	</EventClick>
+	</Button>
+	<Text>
+	<X> 740 </X>
+	<Y> 583 </Y>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-01-0001.Price </Value>
+	</Text>
+	<Text>
+	<X> 722 </X>
+	<Y> 583 </Y>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X> 574 </X>
+	<Y> 785 </Y>
+	<Size> 24 </Size>
+	<Font> RobotoBold </Font>
+	<Color> 0x322B26 </Color>
+	<Value> $11-99-01-0001.Name2 </Value>
+	</Text>
 
 
 
diff --git a/xml/menu_lid_straw.xml b/xml/menu_lid_straw.xml
index a3736906..2b034f7c 100644
--- a/xml/menu_lid_straw.xml
+++ b/xml/menu_lid_straw.xml
@@ -20,6 +20,7 @@
 	;	Open "ROOT/taobin_project/xml/menu_brewing.xml"  
 	;EndIf
 	
+	Var LidStrawCountDown = LidStrawCountDown - 1
 	; count down
 	If LidStrawCountDown = 1 Then
 		Var LidStrawCountDown = 15
diff --git a/xml/menu_list_show_less.xml b/xml/menu_list_show_less.xml
index 6504c583..08f3abae 100644
--- a/xml/menu_list_show_less.xml
+++ b/xml/menu_list_show_less.xml
@@ -8,10 +8,64 @@
 <Sound> "ROOT/sounds/selectDrink.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+	TopView "show"
+	; On open
+
+	Var ServiceSuccess = "no"
+
+	Var SelectOnTop1 = 0
+
+	Var p6OpenBG = "ROOT/image/BG_Menu_Page6_Open.bmp"
+	Var p6OpenGIF = "ROOT/image/Page6_Open.gif"
+	Var pCleanBG = "ROOT/image/BG_Clean.bmp"
+	Var pCleanGIF = "ROOT/image/CleanMachine.gif"
+	Var pUpgradeBG = "ROOT/image/BG_Clean.bmp"
+	Var pUpgradeGIF = "ROOT/image/UpgradeMachine.gif"
+	Var pMaintenanceBG =  "ROOT/image/BG_CloseMaintenance.jpg"
+	Var p7LidGIF = "ROOT/image/gif_thank_lid.gif"
 	
+
+	
+	Var DiscountDrink = 0
+	Var SelectSlot = "0"
+
+	Var rootMenu = "ROOT/image/"
+	
+
+
+
+
+	
+	Var Timeout = 0
+	Var TMenuLang = 0
+	Var SugarPreMixSel = 0
+
+	If MenuLangTH = 0 Then
+		Var ButtonThaiSelEnable = "Disable"
+		Var ButtonEngSelEnable = "Enable"
+	Else
+		Var ButtonThaiSelEnable = "Enable"
+		Var ButtonEngSelEnable = "Disable"
+	EndIf
 </EventOpen>
 <Timeout> 5000 </Timeout>
 <EventTimeout> 
+	;Open "/mnt/sdcard/coffeevending/xml/menu_board.xml" 
+
+	Var TMenuLang = TMenuLang + 1
+	Var Timeout = Timeout + 1
+
+
+	If TMenuLang = 20 Then
+
+		
+
+	
+
+	Refresh
+	EndIf
+
+
 	TimerReset
 </EventTimeout> 
 
diff --git a/xml/menu_topping_alter.xml b/xml/menu_topping_alter.xml
index 75b7611d..15ff31a5 100644
--- a/xml/menu_topping_alter.xml
+++ b/xml/menu_topping_alter.xml
@@ -44,7 +44,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/menu_back_to_main.xml" 
+	Open "ROOT/taobin_project/xml/menu_catalog.xml" 
 	
 </EventClick>
 </Button>
@@ -114,7 +114,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/menu_back_to_main.xml" 
+	Open "ROOT/taobin_project/xml/menu_catalog.xml" 
 	
 </EventClick>
 </Button>