diff --git a/upptst/TestChStyle/TestChStyle.lay b/upptst/TestChStyle/TestChStyle.lay
index 99555ad2a..f9c183a96 100644
--- a/upptst/TestChStyle/TestChStyle.lay
+++ b/upptst/TestChStyle/TestChStyle.lay
@@ -1,26 +1,28 @@
-LAYOUT(TestChStyleLayout, 484, 492)
+LAYOUT(TestChStyleLayout, 680, 492)
 	ITEM(OptionBox, dv___0, SetLabel(t_("OptionBox")).LeftPosZ(8, 468).TopPosZ(8, 328))
 	ITEM(EditString, normal, LeftPosZ(20, 80).TopPosZ(28, 19))
 	ITEM(DropList, dl_normal, LeftPosZ(108, 96).TopPosZ(28, 19))
+	ITEM(DropList, dl_empty, LeftPosZ(496, 96).TopPosZ(12, 19))
 	ITEM(WithDropChoice<EditString>, dc_normal, LeftPosZ(212, 96).TopPosZ(28, 19))
+	ITEM(WithDropChoice<EditString>, dc_empty, LeftPosZ(496, 96).TopPosZ(36, 19))
 	ITEM(EditString, readonly, SetEditable(false).LeftPosZ(20, 80).TopPosZ(52, 19))
 	ITEM(DropList, dl_readonly, SetEditable(false).LeftPosZ(108, 96).TopPosZ(52, 19))
 	ITEM(WithDropChoice<EditString>, dc_readonly, SetEditable(false).LeftPosZ(212, 96).TopPosZ(52, 19))
 	ITEM(EditString, disabled, LeftPosZ(20, 80).TopPosZ(76, 19))
 	ITEM(DropList, dl_disabled, LeftPosZ(108, 96).TopPosZ(76, 19))
 	ITEM(WithDropChoice<EditString>, dc_disabled, LeftPosZ(212, 96).TopPosZ(76, 19))
-	ITEM(DropTime, dv___10, LeftPosZ(20, 120).TopPosZ(100, 19))
-	ITEM(DropDate, dv___11, LeftPosZ(144, 104).TopPosZ(100, 19))
-	ITEM(LabelBox, dv___12, SetLabel(t_("LabelBox")).LeftPosZ(316, 148).TopPosZ(24, 104))
-	ITEM(EditIntSpin, dv___13, LeftPosZ(20, 64).TopPosZ(124, 19))
-	ITEM(Option, dv___14, ThreeState(true).SetLabel(t_("Option")).LeftPosZ(92, 80).TopPosZ(124, 16))
+	ITEM(DropTime, dv___12, LeftPosZ(20, 120).TopPosZ(100, 19))
+	ITEM(DropDate, dv___13, LeftPosZ(144, 104).TopPosZ(100, 19))
+	ITEM(LabelBox, dv___14, SetLabel(t_("LabelBox")).LeftPosZ(316, 148).TopPosZ(24, 104))
+	ITEM(EditIntSpin, dv___15, LeftPosZ(20, 64).TopPosZ(124, 19))
+	ITEM(Option, dv___16, ThreeState(true).SetLabel(t_("Option")).LeftPosZ(92, 80).TopPosZ(124, 16))
 	ITEM(Option, option1, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(144, 16))
 	ITEM(Option, option2, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(164, 16))
 	ITEM(Option, option3, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(184, 16))
-	ITEM(Switch, dv___18, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(124, 40))
+	ITEM(Switch, dv___20, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(124, 40))
 	ITEM(Switch, switch1, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(168, 40))
-	ITEM(SliderCtrl, dv___20, LeftPosZ(16, 64).TopPosZ(272, 24))
-	ITEM(SliderCtrl, dv___21, LeftPosZ(180, 20).TopPosZ(356, 88))
+	ITEM(SliderCtrl, dv___22, LeftPosZ(16, 64).TopPosZ(272, 24))
+	ITEM(SliderCtrl, dv___23, LeftPosZ(180, 20).TopPosZ(356, 88))
 	ITEM(ProgressIndicator, pi, LeftPosZ(172, 136).TopPosZ(320, 24))
 	ITEM(ArrayCtrl, list, LeftPosZ(16, 150).TopPosZ(304, 136))
 	ITEM(TabCtrl, tab, LeftPosZ(316, 150).TopPosZ(136, 100))
@@ -29,11 +31,11 @@ LAYOUT(TestChStyleLayout, 484, 492)
 	ITEM(Button, host, SetLabel(t_("Host")).LeftPosZ(184, 80).TopPosZ(464, 20))
 	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(304, 80).TopPosZ(464, 20))
 	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(392, 80).TopPosZ(464, 20))
-	ITEM(Label, dv___30, SetLabel(t_("Label")).LeftPosZ(324, 40).TopPosZ(52, 19))
+	ITEM(Label, dv___32, SetLabel(t_("Label")).LeftPosZ(324, 40).TopPosZ(52, 19))
 	UNTYPED(sample, LeftPosZ(228, 232).TopPosZ(360, 80))
 	ITEM(Button, dis, SetLabel(t_("disabled")).LeftPosZ(88, 56).TopPosZ(272, 24))
-	ITEM(Label, dv___33, SetLabel(t_("This is label")).LeftPosZ(16, 168).TopPosZ(240, 19))
-	ITEM(DropTime, dv___34, LeftPosZ(316, 120).TopPosZ(252, 19))
-	ITEM(ArrayCtrl, dv___35, LeftPosZ(196, 112).TopPosZ(216, 100))
+	ITEM(Label, dv___35, SetLabel(t_("This is label")).LeftPosZ(16, 168).TopPosZ(240, 19))
+	ITEM(DropTime, dv___36, LeftPosZ(316, 120).TopPosZ(252, 19))
+	ITEM(ArrayCtrl, dv___37, LeftPosZ(196, 112).TopPosZ(216, 100))
 END_LAYOUT