3 files changed, 32 insertions, 17 deletions
diff --git a/themes/default/template/month_calendar.tpl b/themes/default/template/month_calendar.tpl
index 85415f459..c1603dfd8 100644
--- a/themes/default/template/month_calendar.tpl
+++ b/themes/default/template/month_calendar.tpl
@@ -74,8 +74,8 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
  		{else}
  			<td class="calDayCellEmpty">{$day.DAY}
  		{/if}
- 	{else}
- 		<td class="calDayCellBlank">
+ 	{else}{*blank cell first or last row only*}
+ 		<td>
  	{/if}
  	</td>
  	{/foreach} {*day in week*}
diff --git a/themes/default/template/popuphelp.tpl b/themes/default/template/popuphelp.tpl
index cd02555d5..89cba8578 100644
--- a/themes/default/template/popuphelp.tpl
+++ b/themes/default/template/popuphelp.tpl
@@ -1,12 +1,21 @@
 <div id="content" class="content">
+  <div class="titrePage">
+	<ul class="categoryActions">
+	  <li>
+		<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
+		  <img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
+		</a>
+	  </li>
+	</ul>
+  <h2>{$PAGE_TITLE}</h2>
+  </div>
+
 {$HELP_CONTENT}
+
+<p>
+    <a href="#" onclick="window.close();">{'Close this window'|@translate}</a>
+</p>
+
 </div> <!-- content -->
 
-<ul class="categoryActions">
-  <li>
-    <a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
-      <img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
-    </a>
-  </li>
-</ul>
 
diff --git a/themes/default/template/search_rules.tpl b/themes/default/template/search_rules.tpl
index 9c2ecab7a..adc1f9193 100644
--- a/themes/default/template/search_rules.tpl
+++ b/themes/default/template/search_rules.tpl
@@ -1,5 +1,14 @@
 <div id="content" class="content">
-<h2>{'Search rules'|@translate}</h2>
+  <div class="titrePage">
+	<ul class="categoryActions">
+	  <li>
+		<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
+		  <img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
+		</a>
+	  </li>
+	</ul>
+  <h2>{'Search rules'|@translate}</h2>
+  </div>
 
 {if isset($INTRODUCTION) }
 <p>{$INTRODUCTION}</p>
@@ -46,12 +55,9 @@
   
 </ul>
 
+<p>
+    <a href="#" onclick="window.close();">{'Close this window'|@translate}</a>
+</p>
+
 </div> <!-- content -->
 
-<ul class="categoryActions">
-	<li>
-		<a href="#" onclick="window.close();" title="{'Close this window'|@translate}">
-			<img src="{$ROOT_URL}{$themeconf.icon_dir}/exit.png" class="button" alt="exit">
-		</a>
-	</li>
-</ul>