Index: main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/searchpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/searchpage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/searchpage.pt	(revision 6460)
@@ -41,5 +41,5 @@
       </tbody>
     </table>
-    <div id="actionsView">
+    <div class="actionButtons">
         <input type="submit" name="disable" value="Disable ACs" />
         <input type="submit" name="enable" value="Enable ACs" />
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt	(revision 6460)
@@ -41,10 +41,8 @@
   </table>
 
-  <div id="actionsView">
-    <span class="actionButtons" tal:condition="view/availableActions">
-      <input tal:repeat="action view/actions"
+  <span class="actionButtons" tal:condition="view/availableActions">
+    <input tal:repeat="action view/actions"
              tal:replace="structure action/render"
              />
-    </span>
-  </div>
+  </span>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt	(revision 6460)
@@ -54,12 +54,10 @@
         </tbody>
       </table>
-      <div id="actionsView">
-        <span class="actionButtons" tal:condition="view/availableActions">
-          <span tal:repeat="action view/actions" tal:omit-tag="">
-            <input tal:condition="python:action.label in view.taboneactions"
-                   tal:replace="structure action/render"/>
-          </span>
-        </span>
-      </div>
+    <span class="actionButtons" tal:condition="view/availableActions">
+      <span tal:repeat="action view/actions" tal:omit-tag="">
+        <input tal:condition="python:action.label in view.taboneactions"
+               tal:replace="structure action/render"/>
+      </span>
+    </span>
     </div>
     <div id="tab-2"> <h3>Applicants</h3>
@@ -90,12 +88,10 @@
         </tbody>
       </table><br /><br />
-      <div id="actionsView">
-        <span class="actionButtons" tal:condition="view/availableActions">
-          <span tal:repeat="action view/actions" tal:omit-tag="">
-            <input tal:condition="python:action.label in view.tabtwoactions"
-                   tal:replace="structure action/render"/>
-          </span>
+      <span class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabtwoactions"
+                 tal:replace="structure action/render"/>
         </span>
-      </div>
+      </span>
     </div>
     <div id="tab-3"> <br />
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootmanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootmanagepage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootmanagepage.pt	(revision 6460)
@@ -10,6 +10,5 @@
   </ul>
 </div>
-<form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data">
+<form action="." tal:attributes="action request/URL" method="POST"  class="edit-form" enctype="multipart/form-data">
   <div id="tabs">
     <ul>
@@ -42,82 +41,66 @@
         <tbody>
           <tr tal:repeat="entry context/values" 	class="gradeB"> <td>
-              <input type="checkbox" name="val_id"
-                     tal:attributes="value entry/__name__" /> </td>
+              <input type="checkbox" name="val_id"   tal:attributes="value entry/__name__" /> </td>
             <td tal:content="entry/year">Year </td> <td>
-              <a href="" 	 tal:attributes="href python:view.url(entry)"
-                 tal:content="entry/__name__">Code</a> </td>
+              <a href="" 	 tal:attributes="href python:view.url(entry)"   tal:content="entry/__name__">Code</a> </td>
             <td tal:content="entry/title">Title </td>
           </tr>
         </tbody>
       </table>
-      <div id="actionsView">
-        <span class="actionButtons" tal:condition="view/availableActions">
-          <span tal:repeat="action view/actions" tal:omit-tag="">
-            <input tal:condition="python:action.label in view.taboneactions"
-                   tal:replace="structure action/render"/>
-          </span>
+      <span class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.taboneactions"   tal:replace="structure action/render"/>
         </span>
-      </div>
+      </span>
     </div>
     <div id="tab-2"> <br />
-        <table class="display dataTableManage">
-            <thead>
-                <tr>
-                    <th>&nbsp;
-                    </th>
-                    <th>User Id
-                    </th>
-                    <th>Name
-                    </th>
-                    <th>Local Role
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB">
-                    <td>
-                        <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" />
-                    </td>
-                    <td tal:content="entry/user_name"> USERNAME
-                    </td>
-                    <td tal:content="entry/user_title"> USERTITLE
-                    </td>
-                    <td tal:content="entry/local_role_title"> LOCAL ROLE
-                    </td>
-                </tr>
-            </tbody>
-        </table> <br /><br />
-        <div class="actionButtons" tal:condition="view/availableActions">
-            <span tal:repeat="action view/actions" tal:omit-tag="">
-                <input tal:condition="python:action.label in view.tabtwoactions1" tal:replace="structure action/render"/>
-            </span>
-        </div> <br /><br />
-        <table class="zebra">
-            <tr>
-                <td>
-                    <select id="user" name="user">
-                        <option tal:repeat="user view/getUsers" tal:attributes="value user/name">
-                        <span tal:replace="user/val/description">USERTITLE
-                        </span>
-                        </option>
-                    </select>
-                </td>
-                <td>
-                    <select id="local_role" name="local_role">
-                        <option tal:repeat="localrole view/getLocalRoles" tal:attributes="value localrole/name">
-                        <span tal:replace="localrole/title">LOCALROLETITLE
-                        </span>
-                        </option>
-                    </select>
-                </td>
-                <td>
-                    <div class="actionButtons" tal:condition="view/availableActions">
-                        <span tal:repeat="action view/actions" tal:omit-tag="">
-                            <input tal:condition="python:action.label in view.tabtwoactions2" tal:replace="structure action/render"/>
-                        </span>
-                    </div>
-                </td>
-            </tr>
-        </table>
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;
+            </th>
+            <th>User Id
+            </th>
+            <th>Name
+            </th>
+            <th>Local Role
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB">  <td>
+              <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" />  </td>
+            <td tal:content="entry/user_name"> USERNAME   </td>
+            <td tal:content="entry/user_title"> USERTITLE   </td>
+            <td tal:content="entry/local_role_title"> LOCAL ROLE   </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabtwoactions1" tal:replace="structure action/render"/>
+        </span>
+      </div> <br /><br />
+      <table class="zebra">
+        <tr> <td>
+            <select id="user" name="user">
+              <option tal:repeat="user view/getUsers" tal:attributes="value user/name">
+              <span tal:replace="user/val/description">USERTITLE
+              </span>
+              </option>
+            </select> </td> <td>
+            <select id="local_role" name="local_role">
+              <option tal:repeat="localrole view/getLocalRoles" tal:attributes="value localrole/name">
+              <span tal:replace="localrole/title">LOCALROLETITLE
+              </span>
+              </option>
+            </select> </td> <td>
+            <div tal:condition="view/availableActions">
+              <span tal:repeat="action view/actions" tal:omit-tag="">
+                <input tal:condition="python:action.label in view.tabtwoactions2" tal:replace="structure action/render"/>
+              </span>
+            </div> </td>
+        </tr>
+      </table>
     </div>
   </div>
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit.pt	(revision 6460)
@@ -67,10 +67,8 @@
   </p>
 
-  <div id="actionsView">
-    <span class="actionButtons" tal:condition="view/availableActions">
-      <input tal:repeat="action view/actions"
-             tal:replace="structure action/render"
-             />
-    </span>
-  </div>
+  <span class="actionButtons" tal:condition="view/availableActions">
+    <input tal:repeat="action view/actions"
+           tal:replace="structure action/render"
+           />
+  </span>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css	(revision 6460)
@@ -53,5 +53,9 @@
 
 .block .bd {
-    padding-bottom: 3em;
+    padding-bottom: 1em;
+}
+
+.actionButtons {
+    padding-top: 3em;
 }
 
@@ -98,9 +102,9 @@
 
 .dataTables_info {
-  padding-top: 10px;
+  padding-top: 15px;
 }
 
 .dataTables_paginate {
-  padding-top: 10px;
+  padding-top: 15px;
 }
 
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt	(revision 6460)
@@ -47,14 +47,11 @@
       </tbody>
       </table>
-
-    <div id="actionsView">
-        <span class="actionButtons" tal:condition="view/availableActions">
-            <span tal:repeat="action view/actions"
-                  tal:omit-tag="">
-              <input tal:condition="python:action.label in view.taboneactions"
-                     tal:replace="structure action/render"/>
-            </span>
-        </span>
-    </div>   
+      <span class="actionButtons" tal:condition="view/availableActions">
+          <span tal:repeat="action view/actions"
+                tal:omit-tag="">
+            <input tal:condition="python:action.label in view.taboneactions"
+                   tal:replace="structure action/render"/>
+          </span>
+      </span>
 
 </div>    
@@ -107,14 +104,11 @@
     </tbody>
   </table>
-  
-  <div id="actionsView">
-        <span class="actionButtons" tal:condition="view/availableActions">
-            <span tal:repeat="action view/actions"
-                  tal:omit-tag="">
-              <input tal:condition="python:action.label in view.tabtwoactions"
-                     tal:replace="structure action/render"/>
-            </span>
-        </span>
-  </div>      
+  <span class="actionButtons" tal:condition="view/availableActions">
+    <span tal:repeat="action view/actions"
+          tal:omit-tag="">
+      <input tal:condition="python:action.label in view.tabtwoactions"
+             tal:replace="structure action/render"/>
+    </span>
+  </span>
   
 </div>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt	(revision 6460)
@@ -40,11 +40,8 @@
     </tbody>
   </table>
-
-  <div id="actionsView">
-    <span class="actionButtons" tal:condition="view/availableActions">
-      <input tal:repeat="action view/actions"
-             tal:replace="structure action/render"
-             />
-    </span>
-  </div>
+  <span class="actionButtons" tal:condition="view/availableActions">
+    <input tal:repeat="action view/actions"
+           tal:replace="structure action/render"
+           />
+  </span>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt	(revision 6460)
@@ -1,165 +1,161 @@
 <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-<div class="form-status"
-    tal:define="status view/status"
-    tal:condition="status">
-    Form Status:
-    <span i18n:translate="" tal:content="view/status">
-      Form status summary
-    </span>
+<div class="form-status"  tal:define="status view/status"  tal:condition="status"> Form Status:
+  <span i18n:translate="" tal:content="view/status"> Form status summary
+  </span>
 </div>
 <form action="." tal:attributes="action request/URL" method="POST" class="edit-form" enctype="multipart/form-data">
-    <div id="tabs">
-        <ul>
-            <li>
-                <a href="#tab-1">
-                    <span>Settings
-                    </span></a>
-            </li>
-            <li>
-                <a href="#tab-2">Courses</a></li>
-            <li>
-                <a href="#tab-3">Certificates</a>
-            </li>
-            <li>
-                <a href="#tab-4">Local Roles</a>
-            </li>
-        </ul>
-        <div id="tab-1">
-            <table class="zebra">
-                <tbody>
-                  <tal:block repeat="widget view/widgets">
-                    <tr>
-                      <td class="label">
-                        <label tal:attributes="for widget/name">
-                          <span class="required" tal:condition="widget/required">*</span>
-                          <span i18n:translate="" tal:content="widget/label">label</span>:
-                        </label>
-                      </td>
-                      <td class="field">
-                        <span class="widget" tal:content="structure widget">
-                          <input type="text" />
-                        </span>
-                        <tal:error tal:condition="widget/error">
-                          <span tal:replace="structure widget/error">error</span>
-                        </tal:error>
-                        <tal:hint tal:condition="widget/hint">
-                          <span class="hint" tal:content="structure widget/hint">hint</span>
-                        </tal:hint>
-                      </td>
-                    </tr>
-                  </tal:block>
-                </tbody>
-            </table>
-            <div class="actionButtons" tal:condition="view/availableActions">
-                <span tal:repeat="action view/actions" tal:omit-tag="">
-                    <input tal:condition="python:action.label in view.taboneactions" tal:replace="structure action/render"/>
+  <div id="tabs">
+    <ul>
+      <li>
+      <a href="#tab-1">
+        <span>Settings
+        </span></a>
+      </li>
+      <li>
+      <a href="#tab-2">Courses</a>
+      </li>
+      <li>
+      <a href="#tab-3">Certificates</a>
+      </li>
+      <li>
+      <a href="#tab-4">Local Roles</a>
+      </li>
+    </ul>
+    <div id="tab-1">
+      <table class="zebra">
+        <tbody>
+          <tal:block repeat="widget view/widgets">
+            <tr>
+              <td class="label">
+                <label tal:attributes="for widget/name">
+                  <span class="required" tal:condition="widget/required">*
+                  </span>
+                  <span i18n:translate="" tal:content="widget/label">label
+                  </span>:
+                </label> </td>
+              <td class="field">
+                <span class="widget" tal:content="structure widget">
+                  <input type="text" />
                 </span>
-            </div>
-        </div>
-        <div id="tab-2">   <br />
-            <table class="display dataTableManage">
-                <thead>
-                    <tr>
-                        <th>&nbsp;</th>
-                        <th>Code</th>
-                        <th>Title</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr tal:repeat="entry view/getCourses"  class="gradeB"> <td>
-                            <input type="checkbox" name="val_id" tal:attributes="value entry/name" /> </td> <td>
-                            <a href="" tal:attributes="href entry/url" tal:content="entry/name">Name</a> </td>
-                        <td tal:content="entry/container/title"> Title </td>
-                    </tr>
-                </tbody>
-            </table> <br /><br />
-            <div class="actionButtons" tal:condition="view/availableActions">
-                <span tal:repeat="action view/actions" tal:omit-tag="">
-                    <input tal:condition="python:action.label in view.tabtwoactions" tal:replace="structure action/render"/>
-                </span>
-            </div>
-        </div>
-        <div id="tab-3">   <br />
-            <table class="display dataTableManage">
-                <thead>
-                    <tr>
-                        <th>&nbsp;</th>
-                        <th>Code</th>
-                        <th>Title</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr tal:repeat="entry view/getCertificates"  class="gradeB">
-                        <td>
-                            <input type="checkbox" name="val_id" tal:attributes="value entry/name" />
-                        </td>
-                        <td>
-                            <a href="" tal:attributes="href entry/url" tal:content="entry/name">Name</a>
-                        </td>
-                        <td tal:content="entry/container/title"> Title
-                        </td>
-                    </tr>
-                </tbody>
-            </table> <br /><br />
-            <div class="actionButtons" tal:condition="view/availableActions">
-                <span tal:repeat="action view/actions" tal:omit-tag="">
-                    <input tal:condition="python:action.label in view.tabthreeactions" tal:replace="structure action/render"/>
-                </span>
-            </div>
-        </div>
-        <div id="tab-4"> <br />
-            <table class="display dataTableManage">
-                <thead>
-                    <tr>
-                        <th>&nbsp;</th>
-                        <th>User Id</th>
-                        <th>Name</th>
-                        <th>Local Role</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr tal:repeat="entry view/getUsersWithLocalRoles"  class="gradeB">
-                        <td>
-                            <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" />
-                        </td>
-                        <td tal:content="entry/user_name"> USERNAME  </td>
-                        <td tal:content="entry/user_title"> USERTITLE  </td>
-                        <td tal:content="entry/local_role_title"> LOCAL ROLE </td>
-                    </tr>
-                </tbody>
-            </table> <br /><br />
-            <div class="actionButtons" tal:condition="view/availableActions">
-                <span tal:repeat="action view/actions" tal:omit-tag="">
-                    <input tal:condition="python:action.label in view.tabfouractions1" tal:replace="structure action/render"/>
-                </span>
-            </div> <br /><br />
-            <table class="zebra">
-                <tr>
-                    <td>
-                        <select id="user" name="user">
-                            <option tal:attributes="value user/name" tal:repeat="user view/getUsers">
-                            <span tal:replace="user/val/description">USERTITLE
-                            </span>
-                            </option>
-                        </select>
-                    </td>
-                    <td>
-                        <select id="local_role" name="local_role">
-                            <option tal:attributes="value localrole/name" tal:repeat="localrole view/getLocalRoles">
-                            <span tal:replace="localrole/title">LOCALROLETITLE
-                            </span>
-                            </option>
-                        </select>
-                    </td>
-                    <td>
-                        <div class="actionButtons" tal:condition="view/availableActions">
-                            <span tal:repeat="action view/actions" tal:omit-tag="">
-                                <input tal:condition="python:action.label in view.tabfouractions2" tal:replace="structure action/render"/>
-                            </span>
-                        </div>
-                    </td>
-                </tr>
-            </table>
-        </div>
+                <tal:error tal:condition="widget/error">
+                  <span tal:replace="structure widget/error">error
+                  </span>
+                </tal:error>
+                <tal:hint tal:condition="widget/hint">
+                  <span class="hint" tal:content="structure widget/hint">hint
+                  </span>
+                </tal:hint> </td>
+            </tr>
+          </tal:block>
+        </tbody>
+      </table>
+      <div class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.taboneactions" tal:replace="structure action/render"/>
+        </span>
+      </div>
     </div>
+    <div id="tab-2"> <br />
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;
+            </th>
+            <th>Code
+            </th>
+            <th>Title
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="entry view/getCourses" class="gradeB"> <td>
+              <input type="checkbox" name="val_id" tal:attributes="value entry/name" /> </td> <td>
+              <a href="" tal:attributes="href entry/url" tal:content="entry/name">Name</a> </td>
+            <td tal:content="entry/container/title"> Title </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabtwoactions" tal:replace="structure action/render"/>
+        </span>
+      </div>
+    </div>
+    <div id="tab-3"> <br />
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;
+            </th>
+            <th>Code
+            </th>
+            <th>Title
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="entry view/getCertificates" class="gradeB"> <td>
+              <input type="checkbox" name="val_id" tal:attributes="value entry/name" /> </td> <td>
+              <a href="" tal:attributes="href entry/url" tal:content="entry/name">Name</a> </td>
+            <td tal:content="entry/container/title"> Title  </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabthreeactions" tal:replace="structure action/render"/>
+        </span>
+      </div>
+    </div>
+    <div id="tab-4"> <br />
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;
+            </th>
+            <th>User Id
+            </th>
+            <th>Name
+            </th>
+            <th>Local Role
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB"> <td>
+              <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
+            <td tal:content="entry/user_name"> USERNAME </td>
+            <td tal:content="entry/user_title"> USERTITLE </td>
+            <td tal:content="entry/local_role_title"> LOCAL ROLE </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabfouractions1" tal:replace="structure action/render"/>
+        </span>
+      </div> <br /><br />
+      <table class="zebra">
+        <tr> <td>
+            <select id="user" name="user">
+              <option tal:attributes="value user/name" tal:repeat="user view/getUsers">
+              <span tal:replace="user/val/description">USERTITLE
+              </span>
+              </option>
+            </select> </td> <td>
+            <select id="local_role" name="local_role">
+              <option tal:attributes="value localrole/name" tal:repeat="localrole view/getLocalRoles">
+              <span tal:replace="localrole/title">LOCALROLETITLE
+              </span>
+              </option>
+            </select> </td> <td>
+            <div tal:condition="view/availableActions">
+              <span tal:repeat="action view/actions" tal:omit-tag="">
+                <input tal:condition="python:action.label in view.tabfouractions2" tal:replace="structure action/render"/>
+              </span>
+            </div> </td>
+        </tr>
+      </table>
+    </div>
+  </div>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultycontainermanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultycontainermanagepage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultycontainermanagepage.pt	(revision 6460)
@@ -51,14 +51,11 @@
         </tbody>
       </table>
-
-      <div id="actionsView">
-        <span class="actionButtons" tal:condition="view/availableActions">
-          <span tal:repeat="action view/actions"
-                tal:omit-tag="">
-            <input tal:condition="python:action.label in view.taboneactions"
-                   tal:replace="structure action/render"/>
-          </span>
+      <span class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions"
+              tal:omit-tag="">
+          <input tal:condition="python:action.label in view.taboneactions"
+                 tal:replace="structure action/render"/>
         </span>
-      </div>
+      </span>
 
     </div>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 6460)
@@ -1,149 +1,138 @@
 <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-<div class="form-status"
-    tal:define="status view/status"
-    tal:condition="status">
-    Form Status:
-    <span i18n:translate="" tal:content="view/status">
-      Form status summary
-    </span>
+<div class="form-status" tal:define="status view/status" tal:condition="status"> Form Status:
+  <span i18n:translate="" tal:content="view/status"> Form status summary
+  </span>
 </div>
 <form action="." tal:attributes="action request/URL" method="POST" class="edit-form" enctype="multipart/form-data">
-    <div id="tabs">
-        <ul> <li>
-            <a href="#tab-1">
-                <span>Settings
-                </span></a></li> <li>
-            <a href="#tab-2">
-                <span tal:content="view/subunits">Contents
-                </span> </a></li> <li>
-            <a href="#tab-3">
-                <span>Local Roles
-                </span></a></li>
-        </ul>
-        <div id="tab-1">
-            <table class="zebra">
-                <tbody>
-                  <tal:block repeat="widget view/widgets">
-                    <tr>
-                      <td class="label">
-                        <label tal:attributes="for widget/name">
-                          <span class="required" tal:condition="widget/required">*</span>
-                          <span i18n:translate="" tal:content="widget/label">label</span>:
-                        </label>
-                      </td>
-                      <td class="field">
-                        <span class="widget" tal:content="structure widget">
-                          <input type="text" />
-                        </span>
-                        <tal:error tal:condition="widget/error">
-                          <span tal:replace="structure widget/error">error</span>
-                        </tal:error>
-                        <tal:hint tal:condition="widget/hint">
-                          <span class="hint" tal:content="structure widget/hint">hint</span>
-                        </tal:hint>
-                      </td>
-                    </tr>
-                  </tal:block>
-                </tbody>
-            </table>
-            <div class="actionButtons" tal:condition="view/availableActions">
-                <span tal:repeat="action view/actions" tal:omit-tag="">
-                    <input tal:condition="python:action.label in view.taboneactions" tal:replace="structure action/render"/>
+  <div id="tabs">
+    <ul>
+      <li>
+      <a href="#tab-1">
+        <span>Settings
+        </span></a>
+      </li>
+      <li>
+      <a href="#tab-2">
+        <span tal:content="view/subunits">Contents
+        </span> </a>
+      </li>
+      <li>
+      <a href="#tab-3">
+        <span>Local Roles
+        </span></a>
+      </li>
+    </ul>
+    <div id="tab-1">
+      <table class="zebra">
+        <tbody>
+          <tal:block repeat="widget view/widgets">
+            <tr>
+              <td class="label">
+                <label tal:attributes="for widget/name">
+                  <span class="required" tal:condition="widget/required">*
+                  </span>
+                  <span i18n:translate="" tal:content="widget/label">label
+                  </span>:
+                </label> </td>
+              <td class="field">
+                <span class="widget" tal:content="structure widget">
+                  <input type="text" />
                 </span>
-            </div>
-        </div>
-        <div id="tab-2">
-            <h3 tal:content="view/subunits">Departments</h3>
-            <table class="zebra">
-                <thead>
-                    <tr>
-                        <th>&nbsp;
-                        </th>
-                        <th>Code
-                        </th>
-                        <th>Title
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr tal:repeat="dep context/values">
-                        <td>
-                            <input type="checkbox" name="val_id" tal:attributes="value dep/code" />
-                        </td>
-                        <td>
-                            <a tal:attributes="href python: view.url(dep)" tal:content="dep/__name__"> ID</a> </td> <td>
-                            <span tal:content="dep/title">ID
-                            </span>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-            <div class="actionButtons" tal:condition="view/availableActions">
-                <span tal:repeat="action view/actions" tal:omit-tag="">
-                    <input tal:condition="python:action.label in view.tabtwoactions" tal:replace="structure action/render"/>
-                </span>
-            </div>
-        </div>
-        <div id="tab-3"> <br />
-            <table class="display dataTableManage">
-                <thead>
-                    <tr>
-                        <th>&nbsp;
-                        </th>
-                        <th>User Id
-                        </th>
-                        <th>Name
-                        </th>
-                        <th>Local Role
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB">
-                        <td>
-                            <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" />
-                        </td>
-                        <td tal:content="entry/user_name"> USERNAME
-                        </td>
-                        <td tal:content="entry/user_title"> USERTITLE
-                        </td>
-                        <td tal:content="entry/local_role_title"> LOCAL ROLE
-                        </td>
-                    </tr>
-                </tbody>
-            </table> <br /><br />
-            <div class="actionButtons" tal:condition="view/availableActions">
-                <span tal:repeat="action view/actions" tal:omit-tag="">
-                    <input tal:condition="python:action.label in view.tabthreeactions1" tal:replace="structure action/render"/>
-                </span>
-            </div> <br /><br />
-            <table class="zebra">
-                <tr>
-                    <td>
-                        <select id="user" name="user">
-                            <option tal:repeat="user view/getUsers" tal:attributes="value user/name">
-                            <span tal:replace="user/val/description">USERTITLE
-                            </span>
-                            </option>
-                        </select>
-                    </td>
-                    <td>
-                        <select id="local_role" name="local_role">
-                            <option tal:repeat="localrole view/getLocalRoles" tal:attributes="value localrole/name">
-                            <span tal:replace="localrole/title">LOCALROLETITLE
-                            </span>
-                            </option>
-                        </select>
-                    </td>
-                    <td>
-                        <div class="actionButtons" tal:condition="view/availableActions">
-                            <span tal:repeat="action view/actions" tal:omit-tag="">
-                                <input tal:condition="python:action.label in view.tabthreeactions2" tal:replace="structure action/render"/>
-                            </span>
-                        </div>
-                    </td>
-                </tr>
-            </table>
-        </div>
+                <tal:error tal:condition="widget/error">
+                  <span tal:replace="structure widget/error">error
+                  </span>
+                </tal:error>
+                <tal:hint tal:condition="widget/hint">
+                  <span class="hint" tal:content="structure widget/hint">hint
+                  </span>
+                </tal:hint> </td>
+            </tr>
+          </tal:block>
+        </tbody>
+      </table>
+      <div class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.taboneactions" tal:replace="structure action/render"/>
+        </span>
+      </div>
     </div>
+    <div id="tab-2">
+      <h3 tal:content="view/subunits">Departments</h3>
+      <table class="zebra">
+        <thead>
+          <tr>
+            <th>&nbsp;
+            </th>
+            <th>Code
+            </th>
+            <th>Title
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="dep context/values"> <td>
+              <input type="checkbox" name="val_id" tal:attributes="value dep/code" /> </td> <td>
+              <a tal:attributes="href python: view.url(dep)" tal:content="dep/__name__"> ID</a> </td> <td>
+              <span tal:content="dep/title">ID
+              </span> </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabtwoactions" tal:replace="structure action/render"/>
+        </span>
+      </div>
+    </div>
+    <div id="tab-3"> <br />
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;
+            </th>
+            <th>User Id
+            </th>
+            <th>Name
+            </th>
+            <th>Local Role
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB"> <td>
+              <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
+            <td tal:content="entry/user_name"> USERNAME </td>
+            <td tal:content="entry/user_title"> USERTITLE </td>
+            <td tal:content="entry/local_role_title"> LOCAL ROLE </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="actionButtons" tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabthreeactions1" tal:replace="structure action/render"/>
+        </span>
+      </div><br /><br />
+      <table class="zebra">
+        <tr> <td>
+            <select id="user" name="user">
+              <option tal:repeat="user view/getUsers" tal:attributes="value user/name">
+              <span tal:replace="user/val/description">USERTITLE
+              </span>
+              </option>
+            </select> </td> <td>
+            <select id="local_role" name="local_role">
+              <option tal:repeat="localrole view/getLocalRoles" tal:attributes="value localrole/name">
+              <span tal:replace="localrole/title">LOCALROLETITLE
+              </span>
+              </option>
+            </select> </td> <td>
+            <div tal:condition="view/availableActions">
+              <span tal:repeat="action view/actions" tal:omit-tag="">
+                <input tal:condition="python:action.label in view.tabthreeactions2" tal:replace="structure action/render"/>
+              </span>
+            </div> </td>
+        </tr>
+      </table>
+    </div>
+  </div>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt	(revision 6459)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt	(revision 6460)
@@ -31,3 +31,5 @@
         </tbody>
     </table>
+    <div class="actionButtons">
+    </div>
 </span>
