diff --git a/template/cclear/admin/configuration.tpl b/template/cclear/admin/configuration.tpl
index 9349c63b7..1277de25a 100644
--- a/template/cclear/admin/configuration.tpl
+++ b/template/cclear/admin/configuration.tpl
@@ -1,15 +1,6 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
-<!-- BEGIN confirmation -->
-<div class="info">{L_CONFIRM}</div>
-<!-- END confirmation -->
+<!-- $Id$ -->
+<h2>{lang:title_configuration}</h2>
+
 <form method="post" action="{F_ACTION}">
 <table width="100%" align="center">
 <!-- BEGIN general -->
diff --git a/template/cclear/admin/thumbnail.tpl b/template/cclear/admin/thumbnail.tpl
index d362b017d..e6e140f7d 100644
--- a/template/cclear/admin/thumbnail.tpl
+++ b/template/cclear/admin/thumbnail.tpl
@@ -1,12 +1,5 @@
-<!-- BEGIN errors -->
-<div class="errors">
-<ul>
-  <!-- BEGIN error -->
-  <li>{errors.error.ERROR}</li>
-  <!-- END error -->
-</ul>
-</div>
-<!-- END errors -->
+<!-- $Id$ -->
+<h2>{lang:title_thumbnails}</h2>
 
 <!-- BEGIN results -->
 <div class="admin">{L_RESULTS}</div>
diff --git a/template/cclear/admin/update.tpl b/template/cclear/admin/update.tpl
index 3f33689f7..af8c53654 100644
--- a/template/cclear/admin/update.tpl
+++ b/template/cclear/admin/update.tpl
@@ -1,3 +1,7 @@
+<!-- $Id$ -->
+
+<h2>{lang:title_update}</h2>
+
 <!-- BEGIN update -->
 <h3>{L_RESULT_UPDATE}</h3>
 <ul>
diff --git a/template/cclear/admin/waiting.tpl b/template/cclear/admin/waiting.tpl
index 6c2cbd104..8da061a2e 100644
--- a/template/cclear/admin/waiting.tpl
+++ b/template/cclear/admin/waiting.tpl
@@ -1,7 +1,7 @@
-<form action="{F_ACTION}" method="post">
-  <!-- BEGIN confirmation -->
-  <div class="info">{L_WAITING_CONFIRMATION}</div>
-  <!-- END confirmation -->
+<!-- $Id$ -->
+<h2>{lang:title_waiting}</h2>
+
+<form action="{F_ACTION}" method="post" id="waiting">
   <table style="width:100%;" >
     <tr class="throw">
       <th style="width:20%;">{L_CATEGORY}</th>
@@ -32,11 +32,9 @@
       </td>
     </tr>
     <!-- END picture -->
-    <tr>
-      <td colspan="6" align="center">
-	  <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
-          <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
-	  </td>
-    </tr>
   </table>
+  <p>
+    <input type="submit" name="submit" value="{L_SUBMIT}" class="bouton" />
+    <input type="reset" name="reset" value="{L_RESET}" class="bouton" />
+  </p>
 </form>