diff --git a/inter/tha/xml/page_topping_select6.lxml b/inter/tha/xml/page_topping_select6.lxml
index d184bafa..6f541fa8 100644
--- a/inter/tha/xml/page_topping_select6.lxml
+++ b/inter/tha/xml/page_topping_select6.lxml
@@ -880,139 +880,6 @@
 <Color> "0xeae6e1" </Color>
 </Image>
 
-
-<EventLanguageOnChange>
-	DEBUGVAR LanguageShowByIndex
-	DEBUGVAR LanguageShow
-
-	If LanguageShow = "ENG" Then
-		Var topping_shot_price_x = 630
-		Var text_x_add_oreo_price = 430
-		Var text_show_normal_x = 408
-		Var text_show_blend_x = 892
-		Var SugarZeroCalPrice_X = 540
-		Var text_cancel_xc = 53
-		Var text_cancel_yc = 16
-		Var Text_SugarZeroCalPrice_X = 360
-		Var Text_SugarNormalPrice_Y = 80
-		Var OatMilkPrice_X = 260
-		If show_name_len > 24 Then
-			Var showname = showname + "###size=54"
-		EndIf
-		If BGSugar = "Enable" Then
-			Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
-		EndIf
-		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
-			Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
-			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
-		Else
-			Var ShowTextSelfTestCountDown = "Please wait a moment"
-		EndIf
-	EndIf
-	If LanguageShow = "THAI" Then
-		Var topping_shot_price_x = 600
-		Var text_x_add_oreo_price = 420
-		Var text_show_normal_x = 386
-		Var text_show_blend_x = 852
-		Var SugarZeroCalPrice_X = 495
-		Var text_cancel_xc = 53
-		Var text_cancel_yc = 16
-		Var Text_SugarZeroCalPrice_X = 360
-		Var Text_SugarNormalPrice_Y = 75
-		Var OatMilkPrice_X = 220
-		If show_name_len > 0 Then
-			Var showname = showname + "###size=68"
-		EndIf
-		Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
-		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
-			Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
-			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
-		Else
-			Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
-		EndIf
-	EndIf
-	If LanguageShow = "MYANMAR" Then 
-		Var show_eng = "true"
-		DEBUGVAR show_eng
-		Var topping_shot_price_x = 630
-		Var text_x_add_oreo_price = 430
-		Var text_show_normal_x = 568
-		Var text_show_blend_x = 903
-		Var SugarZeroCalPrice_X = 540
-		Var Text_SugarZeroCalPrice_X = 360
-		Var Text_SugarNormalPrice_Y = 80
-		Var text_cancel_xc = 5
-		Var text_cancel_yc = 30
-		Var show_eng = "true"
-		Var OatMilkPrice_X = 210
-		If show_name_len > 24 Then
-			Var showname = showname + "###size=54"
-		EndIf
-		Var DirImage = "ROOT/taobin_project/image/topping_mmr"
-		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
-			Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
-			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
-		Else
-			Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။"
-		EndIf
-	EndIf
-
-	Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
-	DEBUGVAR StringToppingOatMilkWithPrice
-	Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
-	DEBUGVAR StringToppingOatMilkWithPrice
-
-	Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
-	Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
-
-	;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
-	;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
-
-	Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
-	Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
-
-	Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
-	Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
-
-	Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
-	Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
-
-	Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
-	Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
-
-
-	;Var showname = aliasName[LanguageShowByIndex]
-	;Var showdesc = aliasName[LanguageShowByIndex]
-
-	If SelectDrinkType = 1 Then
-		Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
-		Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
-	Else
-		Var showname = aliasName[LanguageShowByIndex]
-		Var showdesc = aliasName[LanguageShowByIndex]
-		
-	EndIf
-		
-
-	DEBUGVAR showname
-	DEBUGVAR showdesc
-	
-	BackslashNToEnter showname
-	BackslashNToEnter showdesc
-	CRLFToSpace showname
-	CRLFToSpace showdesc
-	Var Timeout = 0
-
-	Var ButtonLanguageCurrentXPosition = 990
-	Var ButtonLanguageCurrentYPosition = 438
-	Var ButtonLanguageListXPosition = 970
-	Var ButtonLanguageListYPosition = 430
-	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
-
-	RefreshAll
-
-</EventLanguageOnChange>
-
 <Button>
 <X> 990 </X>
 <Y> 438 </Y>
@@ -1182,6 +1049,139 @@
 </EventClick>
 </LangSwitch>
 
+<EventLanguageOnChange>
+	DEBUGVAR LanguageShowByIndex
+	DEBUGVAR LanguageShow
+
+	If LanguageShow = "ENG" Then
+		Var topping_shot_price_x = 630
+		Var text_x_add_oreo_price = 430
+		Var text_show_normal_x = 408
+		Var text_show_blend_x = 892
+		Var SugarZeroCalPrice_X = 540
+		Var text_cancel_xc = 53
+		Var text_cancel_yc = 16
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 80
+		Var OatMilkPrice_X = 260
+		If show_name_len > 24 Then
+			Var showname = showname + "###size=54"
+		EndIf
+		If BGSugar = "Enable" Then
+			Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
+		EndIf
+		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
+			Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
+			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
+		Else
+			Var ShowTextSelfTestCountDown = "Please wait a moment"
+		EndIf
+	EndIf
+	If LanguageShow = "THAI" Then
+		Var topping_shot_price_x = 600
+		Var text_x_add_oreo_price = 420
+		Var text_show_normal_x = 386
+		Var text_show_blend_x = 852
+		Var SugarZeroCalPrice_X = 495
+		Var text_cancel_xc = 53
+		Var text_cancel_yc = 16
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 75
+		Var OatMilkPrice_X = 220
+		If show_name_len > 0 Then
+			Var showname = showname + "###size=68"
+		EndIf
+		Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
+		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
+			Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
+			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
+		Else
+			Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
+		EndIf
+	EndIf
+	If LanguageShow = "MYANMAR" Then 
+		Var show_eng = "true"
+		DEBUGVAR show_eng
+		Var topping_shot_price_x = 630
+		Var text_x_add_oreo_price = 430
+		Var text_show_normal_x = 568
+		Var text_show_blend_x = 903
+		Var SugarZeroCalPrice_X = 540
+		Var Text_SugarZeroCalPrice_X = 360
+		Var Text_SugarNormalPrice_Y = 80
+		Var text_cancel_xc = 5
+		Var text_cancel_yc = 30
+		Var show_eng = "true"
+		Var OatMilkPrice_X = 210
+		If show_name_len > 24 Then
+			Var showname = showname + "###size=54"
+		EndIf
+		Var DirImage = "ROOT/taobin_project/image/topping_mmr"
+		If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
+			Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
+			Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
+		Else
+			Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။"
+		EndIf
+	EndIf
+
+	;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
+	;DEBUGVAR StringToppingOatMilkWithPrice
+	;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
+	;DEBUGVAR StringToppingOatMilkWithPrice
+
+	Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
+	Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
+
+	;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
+	;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
+
+	Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
+	Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
+
+	Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
+	Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
+
+	Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
+	Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
+
+	Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
+	Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
+
+
+	;Var showname = aliasName[LanguageShowByIndex]
+	;Var showdesc = aliasName[LanguageShowByIndex]
+
+	If SelectDrinkType = 1 Then
+		Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
+		Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
+	Else
+		Var showname = aliasName[LanguageShowByIndex]
+		Var showdesc = aliasName[LanguageShowByIndex]
+		
+	EndIf
+		
+
+	DEBUGVAR showname
+	DEBUGVAR showdesc
+	DEBUGVAR IndexDrinktType
+	
+	BackslashNToEnter showname
+	BackslashNToEnter showdesc
+	CRLFToSpace showname
+	CRLFToSpace showdesc
+	Var Timeout = 0
+
+	Var ButtonLanguageCurrentXPosition = 990
+	Var ButtonLanguageCurrentYPosition = 438
+	Var ButtonLanguageListXPosition = 970
+	Var ButtonLanguageListYPosition = 430
+	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+
+	RefreshAll
+
+</EventLanguageOnChange>
+
 ; back
 <Button>
 <X> 19 </X>
@@ -6075,19 +6075,19 @@
 <Height> 65 </Height>
 <Language>
 	<ID> 000113 </ID>
-	<SubValue> OatMilkPrice </SubValue>
+	;<SubValue> OatMilkPrice </SubValue>
 </Language>
 </Text>
 
-;<Text>
-;<X> OatMilkPrice_X </X>
-;<Y> 77 </Y>
-;<Font> KanitRegularTTF </Font>
-;<State> "Enable" </State>
-;<Size> 28 </Size>
-;<Color> 0x84776F </Color>
-;<Value> OatMilkPrice </Value>
-;</Text>
+<Text>
+<X> OatMilkPrice_X </X>
+<Y> 77 </Y>
+<Font> KanitRegularTTF </Font>
+<State> "Enable" </State>
+<Size> 28 </Size>
+<Color> 0x84776F </Color>
+<Value> OatMilkPrice </Value>
+</Text>
 
 </Block>
 ;