diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index ed8861d84..c298f6856 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -55,10 +55,10 @@
 </fieldset>
 
 <!-- BEGIN move -->
-<fieldset>
+<fieldset id="move">
   <legend>{lang:Move}</legend>
   {lang:Parent category}
-  <select name="parent">
+  <select class="categoryDropDown" name="parent">
     <!-- BEGIN parent_option -->
     <option class="{move.parent_option.CLASS}" {move.parent_option.SELECTED} value="{move.parent_option.VALUE}">{move.parent_option.OPTION}</option>
     <!-- END parent_option -->
@@ -66,7 +66,7 @@
 </fieldset>
 <!-- END move -->
 
-<fieldset>
+<fieldset id="options">
   <legend>{lang:Options}</legend>
   <table>
     <tr>
@@ -108,7 +108,7 @@
 </p>
 
 <!-- BEGIN representant -->
-<fieldset>
+<fieldset id="representant">
   <legend>{lang:Representant}</legend>
   <table>
     <tr>
@@ -139,7 +139,7 @@
 
 <form action="{F_ACTION}" method="POST" id="links">
   
-<fieldset>
+<fieldset id="linkAllNew">
   <legend>{lang:Link all category elements to a new category}</legend>
 
   <table>
@@ -151,7 +151,7 @@
     <tr>
       <td>{lang:Parent category}</td>
       <td>
-        <select class="categoryList" name="parent">
+        <select class="categoryDropDown" name="parent">
           <!-- BEGIN category_option_parent -->
           <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
           <!-- END category_option_parent -->
@@ -167,7 +167,7 @@
 
 </fieldset>
 
-<fieldset>
+<fieldset id="linkAllExist">
   <legend>{lang:Link all category elements to some existing categories}</legend>
 
   <table>
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index a0578692d..ea4c202c6 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -8,8 +8,8 @@
 
 <form method="post" action="{F_ACTION}" class="properties">
 
-<fieldset>
 <!-- BEGIN general -->
+<fieldset id="generalConf">
   <legend>{lang:conf_general_title}</legend>
 
   <ul>
@@ -24,7 +24,7 @@
       <span class="property">
         <label for="page_banner">{lang:Page banner}</label>
       </span>
-      <textarea cols="50" rows="5" name="page_banner" id="page_banner" onfocus="this.className='focus';" onblur="this.className='nofocus';">{general.CONF_PAGE_BANNER}</textarea>
+      <textarea class="description" name="page_banner" id="page_banner" onfocus="this.className='description focus';" onblur="this.className='description nofocus';">{general.CONF_PAGE_BANNER}</textarea>
     </li>
 
     <li>
@@ -58,9 +58,11 @@
       <label><input type="radio" class="radio" name="rate_anonymous" value="false" {general.RATE_ANONYMOUS_NO} />{lang:No}</label>
     </li>
   </ul>
+</fieldset>
 <!-- END general -->
 
 <!-- BEGIN comments -->
+<fieldset id="commentsConf">
   <legend>{lang:conf_comments_title}</legend>
 
   <ul>
@@ -83,8 +85,10 @@
       <label><input type="radio" class="radio" name="comments_validation" value="false" {comments.VALIDATE_NO} />{lang:No}</label>
     </li>
   </ul>
+</fieldset>
 <!-- END comments -->
 <!-- BEGIN default -->
+<fieldset id="commentsConf">
   <legend>{lang:conf_default_title}</legend>
 
   <ul>
@@ -157,8 +161,8 @@
       <input type="text" size="4" maxlength="4" id="default_maxheight" name="default_maxheight" value="{default.MAXHEIGHT}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
     </li>
   </ul>
+</fieldset>
 <!-- END default -->
-  </fieldset>
 
   <p>
     <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}>
diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css
index f65251a2e..64276df26 100644
--- a/template/yoga/admin/default-layout.css
+++ b/template/yoga/admin/default-layout.css
@@ -88,8 +88,18 @@ TABLE.doubleSelect TD {
   width: 50%;
 }
 
+TABLE.doubleSelect SELECT.categoryList {
+  width: 100%;
+}
+
 FORM#categoryPermissions LI {
   display:inline;
   white-space: nowrap;
 }
 
+FIELDSET#generalConf SPAN.property {
+  width: 25%;
+}
+FIELDSET#generalConf TEXTAREA.description {
+  width: 70%;
+}
diff --git a/template/yoga/admin/site_update.tpl b/template/yoga/admin/site_update.tpl
index d3d0221ca..91aef24a7 100644
--- a/template/yoga/admin/site_update.tpl
+++ b/template/yoga/admin/site_update.tpl
@@ -1,4 +1,4 @@
-<!-- $Id: update.tpl 980 2005-12-10 15:24:53Z chrisaga $ -->
+<!-- $Id$ -->
 
 <div class="titrePage">
   <ul class="categoryActions">
@@ -61,7 +61,7 @@
 <h3>{lang:update_default_title}</h3>
 <form action="{F_ACTION}" method="post" id="update">
 
-  <fieldset>
+  <fieldset id="syncFiles">
     <legend>{lang:update_sync_files}</legend>
     <ul>
       <li><label><input type="radio" name="sync" value="dirs" {SYNC_DIRS_CHECKED} /> {lang:update_sync_dirs}</label></li>
@@ -70,7 +70,7 @@
     </ul>
   </fieldset>
 
-  <fieldset>
+  <fieldset id="syncMetadata">
     <legend>{lang:update_sync_metadata}</legend>
     {lang:update_used_metadata} : {METADATA_LIST}.<br/>
     <ul>
@@ -79,16 +79,16 @@
     </ul>
   </fieldset>
 
-  <fieldset>
+  <fieldset id="syncSimulate">
     <legend></legend>
     <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {TAG_INPUT_ENABLED} /> {lang:update_simulate}</label></li></ul>
   </fieldset>
 
-  <fieldset>
+  <fieldset id="catSubset">
     <legend>{lang:update_cats_subset}</legend>
     <ul>
     <li>
-    <select style="width:500px" name="cat" size="10">
+    <select class="categoryList" name="cat" size="10">
       <!-- BEGIN category_option -->
       <option {introduction.category_option.SELECTED} value="{introduction.category_option.VALUE}">{introduction.category_option.OPTION}</option>
       <!-- END category_option -->
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 824578303..d087bc8fa 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -75,14 +75,15 @@ FORM P {
 }
 
 TEXTAREA.description {
-  height: 100px;
-  width: 500px;
+  height: 6em;
+  width: 40em;
   overflow: auto;
 }
 
 SELECT.categoryList {
   height: 20em;
-  width: 30em;
+  /*max-width: 60em;*/
+  width: auto;
 }
 
 /**
diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css
index 264885b8b..99d2b311b 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/template/yoga/fix-ie5-ie6.css
@@ -18,7 +18,7 @@ H1, #theHeader {
 
 /* to get less hugly checkboxes at least in tagSelection */
 /* as well as several forms */
-FORM#update INPUT,
+FORM#update FIELDSET INPUT,
 UL.tagSelection LI INPUT,
 #content UL.thumbnails SPAN.wrap2 INPUT {
   border: none;