diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html
index 1abfd454e..cadc6c25e 100644
--- a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.html
@@ -81,15 +81,21 @@
               </td>
               </tr>
               <tr>
-              <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font> {$SCH_START_DATE} </td>
-              <td class="FormFieldContent">{$form.SCH_START_DATE}
-                  <table id="endDateTable">
+
+              <td  colspan="2" align="center">
+                 <table id="endDateTable" border="0">
                       <tr>
-                          <td class="FormFieldContent" width="{$form_labelWidth}" align="right" valign="top">{$SCH_END_DATE} End Date</td>
-                        <td class="FormFieldContent">{$form.SCH_END_DATE}</td>
+                         <td colspan="2"><font color="red">*  </font>
+                         <label class="FormLabel" width="{$form_labelWidth}" align="right" valign="top">{$SCH_START_DATE}</label>
+                         <label class="FormFieldContent">{$form.SCH_START_DATE}</label>
+                         <label class="FormLabel" width="{$form_labelWidth}" align="right" valign="top">{$SCH_END_DATE}</label>
+                         <font class="FormFieldContent">{$form.SCH_END_DATE}</font>
+                         </td>
                     </tr>
                   </table>
               </td>
+
+              </td>
               </tr>
               <tr>
               <td class="FormLabel" width="{$form_labelWidth}"><font color="red">*  </font> {$SCH_START_TIME} </td>
@@ -154,7 +160,7 @@
 														<td style="width: 20%">{$form.SCH_START_DAY}</td>
 														<td> {$SCH_START_DAY_OPT_1} {$form.SCH_START_DAY_OPT_1} <br/> 
 															{$SCH_START_DAY_OPT_2_WEEKS} {$SCH_START_DAY_OPT_2_DAYS_WEEK} 
-															{$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} 
+															{$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/> 
 														</td>
 													</tr>
 												</table>
diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml
index 4c1b595dc..7c8dd72d0 100644
--- a/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_Edit.xml
@@ -142,11 +142,11 @@ WHERE A.PRO_UID='@#PRO_UID' AND A.TAS_START = 'TRUE' ]]>
 </SELECT_3>
 
 <SCH_START_DAY type="radiogroup" required="0" mode="edit" options="Array">
-<en>Day <option name="1">Day</option>
+<en> <option name="1">Day</option>
 <option name="2">The</option>
 </en>
 </SCH_START_DAY>
-<SCH_START_DAY_OPT_1 type="text" maxlength="2" validate="Any" required="0" readonly="0" defaultvalue="1" size="2" mode="edit">
+<SCH_START_DAY_OPT_1 type="text" maxlength="2" validate="Int" mask="##" required="0" readonly="0" defaultvalue="1" size="2" mode="edit">
 <en/>
 </SCH_START_DAY_OPT_1>
 <SCH_START_DAY_OPT_2_WEEKS type="dropdown" required="0" readonly="0" savelabel="0" mode="edit" options="Array" dependentfields="" defaultvalue="" hint="" sqlconnection="">
diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_New.html b/workflow/engine/xmlform/cases/cases_Scheduler_New.html
index e3a5e0131..0359ef017 100644
--- a/workflow/engine/xmlform/cases/cases_Scheduler_New.html
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_New.html
@@ -155,7 +155,7 @@
 														<td style="width: 35%">{$form.SCH_START_DAY}</td>
 														<td> {$SCH_START_DAY_OPT_1} {$form.SCH_START_DAY_OPT_1} <br/> 
 															{$SCH_START_DAY_OPT_2_WEEKS} {$SCH_START_DAY_OPT_2_DAYS_WEEK} 
-															{$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} 
+															{$form.SCH_START_DAY_OPT_2_WEEKS} {$form.SCH_START_DAY_OPT_2_DAYS_WEEK} <br/> 
 														</td>
 													</tr>
 												</table>
diff --git a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml
index 63b3bdc69..b92c2f4ab 100644
--- a/workflow/engine/xmlform/cases/cases_Scheduler_New.xml
+++ b/workflow/engine/xmlform/cases/cases_Scheduler_New.xml
@@ -128,7 +128,7 @@
 <option name="2">The day </option>
 </en>
 </SCH_START_DAY>
-<SCH_START_DAY_OPT_1 type="text" maxlength="2" validate="Any" required="0" readonly="0" defaultvalue="1" size="2" mode="edit">
+<SCH_START_DAY_OPT_1 type="text" maxlength="2" validate="Int" mask="##" required="0" readonly="0" defaultvalue="1" size="2" mode="edit">
 <en/>
 </SCH_START_DAY_OPT_1>
 <SCH_START_DAY_OPT_2_WEEKS type="dropdown" required="0" readonly="0" savelabel="0" mode="edit" options="Array" dependentfields="" defaultvalue="" hint="" sqlconnection="">