diff --git a/UI/Templates/MainUI/SOGoUserHomePage.wox b/UI/Templates/MainUI/SOGoUserHomePage.wox
index d09439a04..c6e38e687 100644
--- a/UI/Templates/MainUI/SOGoUserHomePage.wox
+++ b/UI/Templates/MainUI/SOGoUserHomePage.wox
@@ -12,8 +12,6 @@
     <var:string label:value="Forbidden" const:style="window_label" />
   </var:if>
   <var:if condition="canAccess">
-      <script rsrc:src="generic.js"  > <!-- space required --></script>
-      <script rsrc:src="homepage.js" > <!-- space required --></script>
     <table id="skywintable"
            class="wintable"
            cellspacing="0"
@@ -21,21 +19,7 @@
            width="100%"
     >
       <tr>
-        <td class="wintitle">
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="wintitle">
-                <span class="window_label">
-                <var:string label:value="Homepage"/>
-                </span>
-              </td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose"/>
-              </td>
-            </tr>
-          </table>
-        </td>
+        <td class="window_label"><var:string label:value="Homepage"/></td>
       </tr>
       <tr>
         <td class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox b/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
index 7f7131f5e..8c7f0ecef 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentProposal.wox
@@ -12,19 +12,9 @@
          width="100%"
   >
     <tr>
-      <td class="wintitle">
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="window_label">
-              <var:string label:value="Search appointments" />
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose" />
-            </td>
-          </tr>
-        </table>
-      </td>
+        <td class="window_label">
+          <var:string label:value="Search appointments" />
+        </td>
     </tr>
     <tr>
       <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentView.wox b/UI/Templates/SchedulerUI/UIxAppointmentView.wox
index 292bc05aa..3944c333c 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentView.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentView.wox
@@ -10,18 +10,8 @@
     >
     <table cellspacing="0" cellpadding="5" width="100%">
       <tr>
-        <td>
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="window_label"
-                ><var:string label:value="Appointment viewer" /></td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose" />
-              </td>
-            </tr>
-          </table>
-        </td>
+        <td class="window_label"
+          ><var:string label:value="Appointment viewer" /></td>
       </tr>
 
       <tr>
diff --git a/UI/Templates/SchedulerUI/UIxCalDayChartview.wox b/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
index 2fa497950..adc8e5f32 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayChartview.wox
@@ -15,23 +15,13 @@
          width="100%"
   >
     <tr>
-      <td class="wintitle">
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="wintitle">
-              <var:component className="UIxCalDateLabel"
-                             startDate="startDate"
-                             endDate="endDate"
-                             const:selection="day"
-              />
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose"/>
-            </td>
-          </tr>
-        </table>
-      </td>
+        <td class="window_label">
+          <var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="day"
+            />
+        </td>
     </tr>
     <tr>
       <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxCalDayListview.wox b/UI/Templates/SchedulerUI/UIxCalDayListview.wox
index bd2274b26..0b2a41064 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayListview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayListview.wox
@@ -15,23 +15,13 @@
          width="100%"
   >
     <tr>
-      <td class="wintitle">
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="wintitle">
-              <var:component className="UIxCalDateLabel"
-                             startDate="startDate"
-                             endDate="endDate"
-                             const:selection="day"
-              />
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose"/>
-            </td>
-          </tr>
-        </table>
-      </td>
+        <td class="window_label">
+          <var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="day"
+            />
+        </td>
     </tr>
     <tr>
       <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxCalDayOverview.wox b/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
index b267e328e..f528c559a 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayOverview.wox
@@ -10,23 +10,13 @@
 
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
     <tr>
-      <td class="wintitle">
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="wintitle">
-              <var:component className="UIxCalDateLabel"
-                             startDate="startDate"
-                             endDate="endDate"
-                             const:selection="day"
-              />
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose"/>
-            </td>
-          </tr>
-        </table>
-      </td>
+        <td class="window_label">
+          <var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="day"
+            />
+        </td>
     </tr>
     <tr>
       <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthOverview.wox b/UI/Templates/SchedulerUI/UIxCalMonthOverview.wox
index 150e9b796..795e5f79d 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthOverview.wox
@@ -8,30 +8,20 @@
                title="name"
 >
 
-  <table id="skywintable"
-         class="wintable"
-         cellspacing="0"
-         cellpadding="5"
-         width="100%"
-  >
-    <tr>
-      <td class="wintitle">
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="wintitle">
-              <var:component className="UIxCalDateLabel"
-                             startDate="startDate"
-                             endDate="endDate"
-                             const:selection="month"
-              />
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose"/>
-            </td>
-          </tr>
-        </table>
-      </td>
+    <table id="skywintable"
+      class="wintable"
+      cellspacing="0"
+      cellpadding="5"
+      width="100%"
+      >
+      <tr>
+        <td class="window_label">
+          <var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="month"
+            />
+        </td>
     </tr>
     <tr>
       <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox b/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
index f262778c6..0004f143a 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekChartview.wox
@@ -10,21 +10,11 @@
 
     <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
       <tr>
-        <td class="wintitle">
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="wintitle"><var:component className="UIxCalDateLabel"
-                  startDate="startDate"
-                  endDate="endDate"
-                  const:selection="week"
-                  /></td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose" />
-              </td>
-            </tr>
-          </table>
-        </td>
+        <td class="window_label"><var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="week"
+            /></td>
       </tr>
       <tr>
         <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox b/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
index 194485c23..fd168ef96 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekColumnsview.wox
@@ -10,21 +10,11 @@
 
     <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
       <tr>
-        <td class="wintitle">
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="wintitle"><var:component className="UIxCalDateLabel"
-                  startDate="startDate"
-                  endDate="endDate"
-                  const:selection="week"
-                  /></td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose" />
-              </td>
-            </tr>
-          </table>
-        </td>
+        <td class="window_label"><var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="week"
+            /></td>
       </tr>
       <tr>
         <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekListview.wox b/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
index f6fba6b84..8eec36248 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekListview.wox
@@ -16,21 +16,11 @@
       width="100%"
       >
       <tr>
-        <td class="wintitle">
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="wintitle"><var:component className="UIxCalDateLabel"
-                  startDate="startDate"
-                  endDate="endDate"
-                  const:selection="week"
-                  /></td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose" />
-              </td>
-            </tr>
-          </table>
-        </td>
+        <td class="window_label"><var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="week"
+            /></td>
       </tr>
       <tr>
         <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox b/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
index 0e1c0fc1b..e503e8def 100644
--- a/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalWeekOverview.wox
@@ -11,21 +11,11 @@
     <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
       width="100%">
       <tr>
-        <td class="wintitle">
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="wintitle">[<var:component className="UIxCalDateLabel"
-                  startDate="startDate"
-                  endDate="endDate"
-                  const:selection="week"
-                  />]</td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose" />
-              </td>
-            </tr>
-          </table>
-        </td>
+        <td class="window_label">[<var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="week"
+            />]</td>
       </tr>
 
       <tr>
diff --git a/UI/Templates/SchedulerUI/UIxCalYearOverview.wox b/UI/Templates/SchedulerUI/UIxCalYearOverview.wox
index 2c2bfcddb..958f522fe 100644
--- a/UI/Templates/SchedulerUI/UIxCalYearOverview.wox
+++ b/UI/Templates/SchedulerUI/UIxCalYearOverview.wox
@@ -11,23 +11,12 @@
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
          width="100%">
     <tr>
-      <td class="wintitle">
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="wintitle">
-              <var:component className="UIxCalDateLabel"
-                             startDate="startDate"
-                             endDate="endDate"
-                             const:selection="year"
-              />
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose"/>
-            </td>
-          </tr>
-        </table>
-      </td>
+        <td class="window_label">
+          <var:component className="UIxCalDateLabel"
+            startDate="startDate"
+            endDate="endDate"
+            const:selection="year"
+            /></td>
     </tr>
     <tr>
       <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxTaskProposal.wox b/UI/Templates/SchedulerUI/UIxTaskProposal.wox
index 7f7131f5e..8c7f0ecef 100644
--- a/UI/Templates/SchedulerUI/UIxTaskProposal.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskProposal.wox
@@ -12,19 +12,9 @@
          width="100%"
   >
     <tr>
-      <td class="wintitle">
-        <table cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-            <td width="5"/>
-            <td class="window_label">
-              <var:string label:value="Search appointments" />
-            </td>
-            <td width="36" align="right" valign="center">
-              <var:component className="UIxWinClose" />
-            </td>
-          </tr>
-        </table>
-      </td>
+        <td class="window_label">
+          <var:string label:value="Search appointments" />
+        </td>
     </tr>
     <tr>
       <td id="skywinbodycell" class="wincontent">
diff --git a/UI/Templates/SchedulerUI/UIxTaskView.wox b/UI/Templates/SchedulerUI/UIxTaskView.wox
index 292bc05aa..3944c333c 100644
--- a/UI/Templates/SchedulerUI/UIxTaskView.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskView.wox
@@ -10,18 +10,8 @@
     >
     <table cellspacing="0" cellpadding="5" width="100%">
       <tr>
-        <td>
-          <table cellpadding="0" cellspacing="0" width="100%">
-            <tr>
-              <td width="5"/>
-              <td class="window_label"
-                ><var:string label:value="Appointment viewer" /></td>
-              <td width="36" align="right" valign="center">
-                <var:component className="UIxWinClose" />
-              </td>
-            </tr>
-          </table>
-        </td>
+        <td class="window_label"
+          ><var:string label:value="Appointment viewer" /></td>
       </tr>
 
       <tr>