diff --git a/gui/dialogs/timeofday.xml b/gui/dialogs/timeofday.xml
index 2b121cec5..c6fcd7404 100644
--- a/gui/dialogs/timeofday.xml
+++ b/gui/dialogs/timeofday.xml
@@ -40,64 +40,142 @@
true
- hbox
-
-
- vbox
-
-
-
-
- /sim/time/demand-year
-
- dialog-apply
-
-
- nasal
-
-
-
-
-
- vbox
-
-
-
+
+ 0
+ 0
+
+
- /sim/time/demand-month
-
- dialog-apply
-
-
- nasal
-
-
-
-
-
- vbox
-
-
-
-
- /sim/time/demand-day
+ 1
+ 0
+ 1
+ demand-year
+ /sim/time/demand-year
dialog-apply
+ demand-year
nasal
-
+
+ 2
+ 0
+ sl_year
+ /sim/time/demand-year
+ 1
+ 1971
+ 2037
+ 1
+
+ dialog-apply
+ sl_year
+
+
+ nasal
+
+
+
+
+ 0
+ 1
+
+
+
+ 1
+ 1
+ 1
+ month-combo
+ /sim/time/demand-month
+ false
+ 130
+ fill
+
+ dialog-apply
+ month-combo
+
+
+ nasal
+
+
+
+
+ 2
+ 1
+ sl_month
+ /sim/time/demand-month-idx
+ 1
+ 0
+ 11
+ 1
+
+ sl_month
+ dialog-apply
+
+
+ nasal
+
+
+
+
+
+ 0
+ 2
+
+
+
+ 1
+ 2
+ demand-day
+ /sim/time/demand-day
+ 1
+
+ dialog-apply
+ demand-day
+
+
+ nasal
+
+
+
+
+ 2
+ 2
+ sl_day
+ /sim/time/demand-day
+ 1
+ 1
+ 31
+ 1
+
+ dialog-apply
+ sl_day
+
+
+ nasal
+
+
+
@@ -233,10 +311,18 @@
2
-
- vbox
+
+
+ 5
+ vbox
0
-
@@ -338,13 +424,39 @@