diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py
index 22b99024..6e359c47 100644
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@@ -142,9 +142,14 @@
         
         out_xml( '\t<Button>\r\n')
         out_xml( '\t<State> $Sum' + str_con_var +' </State> \r\n')
-        out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
-        out_xml( '\t<FilenamePress> "' + new_default_dir_press + '/'+ menu_img +'" </FilenamePress>\r\n')
-        out_xml( '\t<FilenameDisable> "' + new_default_dir_disable + '/'+ menu_img +'" </FilenameDisable>\r\n')
+        if menu_img.startswith("VAR"):
+          out_xml( '\t<Filename> menu_img </Filename>\r\n')
+          out_xml( '\t<FilenamePress> menu_img </FilenamePress>\r\n')
+          out_xml( '\t<FilenameDisable> menu_img </FilenameDisable>\r\n')  
+        else:
+          out_xml( '\t<Filename> "' + new_default_dir + '/'+ menu_img +'" </Filename>\r\n')
+          out_xml( '\t<FilenamePress> "' + new_default_dir_press + '/'+ menu_img +'" </FilenamePress>\r\n')
+          out_xml( '\t<FilenameDisable> "' + new_default_dir_disable + '/'+ menu_img +'" </FilenameDisable>\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<EventOnClick> \r\n')
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 173060e0..12f2a86c 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -664,15 +664,9 @@
 	EndIf
 
 
-
+	RootLayoutVisible 3 "hide"
 </EventOpen>
 
-<EventUnitTest1>
-	Var InternationalEnable = 0
-</EventUnitTest1>
-<EventUnitTest2>
-	Var InternationalEnable = 1
-</EventUnitTest2>
 
 
 <Timeout> 1000 </Timeout>
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 151c46aa..a406f2b8 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -229,7 +229,6 @@
 	Var text_next_order = DirImage + "/text_next_order.png"
 	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
 	
-	Var bg_strawlid_ST = "Enable"
 
 	Var Seeker.strawAction = 0
 	Var Seeker.lidAction = 0
@@ -277,7 +276,6 @@
 
 
 	; Hide
-	Var bg_strawlid_ST = "Invisible"
 	Var bg_strawProblem_ST = "Invisible"
 	Var StrawProblemStatus = 1
 	Var StrawStateX = "Invisible"
@@ -312,7 +310,8 @@
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png"
 	EndIf
 	If NoLangObjectShow = "Enable" Then
-		
+		Var SelectMenuBetweenBrewEnable2 = "Invisible"
+
 	EndIf
 
 
@@ -345,6 +344,10 @@
 
 
 	Var GetLidButtonCountDown = 0
+
+	; language instance
+	
+	RootLayoutVisible 3 "hide"
 	
 </EventOpen>
 <EventLanguageOnChange>
diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml
index 50605280..756786ef 100644
--- a/xml/page_catalog.lxml
+++ b/xml/page_catalog.lxml
@@ -248,7 +248,7 @@
 	DEBUGVAR Array2TestInt[2][0]
 	DEBUGVAR Array2TestInt[3][0]
 
-
+	RootLayoutVisible 3 "show"
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -680,16 +680,36 @@
  
 </EventWebApp>
 
-<EventUnitTest1>
-	Var waitAckPay = 1
-</EventUnitTest1>
 
+
+<EventUnitTest1>
+	Var InternationalEnable = 0
+	DEBUGVAR InternationalEnable
+	If InternationalEnable = 1 Then
+		Var LanguageObjectShow = "Enable"
+		Var NoLangObjectShow = "Invisible"
+	Else
+		Var LanguageObjectShow = "Invisible"
+		Var NoLangObjectShow = "Enable"
+	EndIf
+
+</EventUnitTest1>
 <EventUnitTest2>
+	Var waitAckPay = 1
+	Var CountDownBrewing = 122
+
 	Var InternationalEnable = 1
+	DEBUGVAR InternationalEnable
+	If InternationalEnable = 1 Then
+		Var LanguageObjectShow = "Enable"
+		Var NoLangObjectShow = "Invisible"
+	Else
+		Var LanguageObjectShow = "Invisible"
+		Var NoLangObjectShow = "Enable"
+	EndIf
+
 	Var Top2Timeout = 19
 </EventUnitTest2>
 
-
-
 </Popup>
 
diff --git a/xml/topview2.xml b/xml/topview2.xml
index e79bbfa5..f7d990ec 100644
--- a/xml/topview2.xml
+++ b/xml/topview2.xml
@@ -6,12 +6,6 @@
 	Var Top2Timeout = 0
 
 
-	If InternationalEnable = 1 Then
-		RootLayoutVisible 3 "show"
-	Else
-		RootLayoutVisible 3 "hide"
-	EndIf
-
 	Var LanguageButtonListEnable = "Invisible"
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -86,6 +80,19 @@
 	<Image>
 		<Filename> "ROOT/taobin_project/image/lang/lang_bg_center.png" </Filename>
 	</Image>
+	<Button>
+	<X> 13 </X>
+	<Y> 0 </Y>
+	<Width> 56 </Width>
+	<Height> 56 </Height>
+	<State> "Enable" </State>
+	<Filename> "ROOT/taobin_project/image/lang/bn_thai_lang.png" </Filename>
+	<EventClick>
+		SetLanguage "THAI"
+		Var LanguageButtonListEnable = "Invisible"	
+		Refresh
+	</EventClick>
+	</Button>
 </Row1>
 <Row1>
 	<Width> 82 </Width>
@@ -94,6 +101,19 @@
 	<Image>
 		<Filename> "ROOT/taobin_project/image/lang/lang_bg_center.png" </Filename>
 	</Image>
+	<Button>
+	<X> 13 </X>
+	<Y> 0 </Y>
+	<Width> 56 </Width>
+	<Height> 56 </Height>
+	<State> "Enable" </State>
+	<Filename> "ROOT/taobin_project/image/lang/bn_eng_lang.png" </Filename>
+	<EventClick>
+		SetLanguage "ENG"
+		Var LanguageButtonListEnable = "Invisible"	
+		Refresh
+	</EventClick>
+	</Button>
 </Row1>
 <Row1>
 	<Width> 82 </Width>
@@ -118,6 +138,27 @@
 	</Button>
 	
 </Row1>
+<Row1>
+	<Width> 82 </Width>
+	<Height> 51 </Height>
+	<State> "Enable" </State>
+	<Image>
+		<Filename> "ROOT/taobin_project/image/lang/lang_bg_center.png" </Filename>
+	</Image>
+	<Button>
+	<X> 13 </X>
+	<Y> 0 </Y>
+	<Width> 82 </Width>
+	<Height> 56 </Height>
+	<State> "Enable" </State>
+	<Filename> "ROOT/taobin_project/image/lang/bn_china_lang.png" </Filename>
+	<EventClick>
+		SetLanguage "CHINA"
+		Var LanguageButtonListEnable = "Invisible"	
+		Refresh
+	</EventClick>
+	</Button>
+</Row1>
 <Row1>
 	<Width> 82 </Width>
 	<Height> 51 </Height>