Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/actionbutton.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/actionbutton.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/actionbutton.pt	(revision 7459)
@@ -1,10 +1,7 @@
-<span class="yui-button" tal:condition="viewlet/target_url">
-  <span class="first-child">
-    <a href=""
-       tal:attributes="href viewlet/target_url">
-      <img src="" alt="edit"
-	   tal:attributes="src viewlet/icon_url;
-			   alt viewlet/alt"/>
-    <span tal:content="viewlet/text">TEXT</span></a>
-  </span>
-</span>
+<a class="btn actionbar" tal:condition="viewlet/target_url"
+   tal:attributes="href viewlet/target_url">
+  <img src="" alt="edit"
+   tal:attributes="src viewlet/icon_url;
+	   alt viewlet/alt"/>
+  <span tal:replace="viewlet/text">TEXT</span>
+</a>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/breadcrumbs.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/breadcrumbs.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/breadcrumbs.pt	(revision 7459)
@@ -1,13 +1,8 @@
-<div class="breadcrumbs">
-  <span tal:repeat="item viewlet/getEntries">
-    <a href="#"
-       tal:attributes="href item/url">
-      <span tal:content="item/title">
-	Entry
-      </span>
+<span tal:repeat="item viewlet/getEntries">
+  <li>
+    <a href="#" tal:attributes="href item/url">
+      <span tal:content="item/title">Entry</span>
     </a>
-    <span tal:condition="not: repeat/item/end">
-      >
-    </span>
-  </span>
-</div>
+    <span tal:condition="not: repeat/item/end" class="divider">/</span>
+  </li>
+</span>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt	(revision 7459)
@@ -1,5 +1,5 @@
 <h2 tal:content="context/longtitle">TITLE</h2>
 
-<table class="zebra">
+<table class="form-table">
   <thead>
   </thead>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,153 +13,151 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data"> 
+      enctype="multipart/form-data"> 
 
-<div id="tabs">
-  <ul>
-    <li><a href="#tab-1"><span>Settings</span></a></li>
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active"><a href="#tab-1"><span>Settings</span></a></li>
     <li><a href="#tab-2"><span>Course Referrers</span></a></li>
     <li><a href="#tab-3"><span>Local Roles</span></a></li>
   </ul>
    
-  <div id="tab-1">
-        <table class="zebra">
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+          <table class="form-table">
+          <tbody>
+          <tal:block repeat="widget view/widgets">
+            <tr>
+              <td class="fieldname">
+                <span tal:condition="widget/required">*</span>
+                <span i18n:translate="" tal:content="widget/label">label</span>:
+              </td>
+              <td>
+                <span 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 tal:content="structure widget/hint">hint</span>
+                </tal:hint>
+              </td>
+            </tr>
+          </tal:block>
+          </tbody>
+          </table>
+          <div 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>Course Referrers</h3>
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;</th><th>Level</th><th>Semester</th><th>Referrer</th><th>Course</th><th>Title</th>
+            <th>Mandatory</th>
+          </tr>
+        </thead>
         <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>
+          <tr tal:repeat="cc context/values" class="gradeC">
+             <td>
+              <input type="checkbox"
+        		 name="val_id"
+        		 tal:attributes="value cc/__name__" />
             </td>
-            <td class="field">
-              <span class="widget" tal:content="structure widget">
-                <input type="text" />
+             <td>
+              <span tal:content="cc/level">
+        	   LEVEL
               </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>
+            <td tal:content="cc/course/semester">SEMESTER</td>
+            <td>
+              <a tal:attributes="href python: view.url(cc)"
+        	     tal:content="cc/__name__">
+            	REFERRER CODE
+              </a>
+            </td>
+            <td>
+              <a tal:attributes="href python:view.url(cc.course)"
+        	     tal:content="cc/course/code">
+            	COURSE CODE
+              </a>
+            </td>
+            <td>
+              <span tal:content="cc/course/title">
+        	   COURSE TITLE
+              </span>
+            </td>
+            <td>
+              <span tal:content="cc/core_or_elective">
+        	   MANDATORY
+              </span>
             </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>Course Referrers</h3>
-    <table class="display dataTableManage">
-      <thead>
-        <tr>
-          <th>&nbsp;</th><th>Level</th><th>Semester</th><th>Referrer</th><th>Course</th><th>Title</th>
-          <th>Mandatory</th>
+      </table>
+      <div 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="gradeC"> <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 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="form-table">
+        <tr> <td>
+            <select id="user" name="user">
+              <option tal:repeat="user view/getUsers" tal:attributes="value user/name">
+              <span tal:replace="user/val/title">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>
-      </thead>
-      <tbody>
-        <tr tal:repeat="cc context/values">
-           <td>
-            <input type="checkbox"
-      		 name="val_id"
-      		 tal:attributes="value cc/__name__" />
-          </td>
-           <td>
-            <span tal:content="cc/level">
-      	   LEVEL
-            </span>
-          </td>
-          <td tal:content="cc/course/semester">SEMESTER</td>
-          <td>
-            <a tal:attributes="href python: view.url(cc)"
-      	     tal:content="cc/__name__">
-          	REFERRER CODE
-            </a>
-          </td>
-          <td>
-            <a tal:attributes="href python:view.url(cc.course)"
-      	     tal:content="cc/course/code">
-          	COURSE CODE
-            </a>
-          </td>
-          <td>
-            <span tal:content="cc/course/title">
-      	   COURSE TITLE
-            </span>
-          </td>
-          <td>
-            <span tal:content="cc/core_or_elective">
-      	   MANDATORY
-            </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>
+      </table>
     </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/title">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/certificatepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt	(revision 7459)
@@ -1,5 +1,5 @@
 <h2 tal:content="context/longtitle">TITLE</h2>
 
-<table class="zebra">
+<table class="form-table">
 <thead>
 </thead>  
@@ -7,12 +7,10 @@
   <tal:block repeat="widget view/widgets">
     <tr>
-      <td>
-        <label tal:attributes="for widget/name">
-          <span i18n:translate=""
+      <td class="fieldname">
+        <span i18n:translate=""
                          tal:content="widget/label">label</span>:
-        </label>
       </td>
-      <td class="field" tal:on-error="default">
-        <div class="widget" tal:content="structure widget">
+      <td tal:on-error="default">
+        <div tal:content="structure widget">
           <input type="text" />
         </div>
@@ -33,5 +31,5 @@
 </thead>
 <tbody>
-  <tr tal:repeat="cc context/values">
+  <tr tal:repeat="cc context/values" class="gradeC">
      <td>
       <span tal:content="cc/level">
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/configurationmanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/configurationmanagepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/configurationmanagepage.pt	(revision 7459)
@@ -1,11 +1,10 @@
 <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:
+<div class="alert-message error"  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>
+<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+    <ul class="tabs" data-tabs="tabs">
+      <li class="active">
       <a href="#tab-1">
         <span>Site Settings
@@ -16,18 +15,18 @@
       </li>
     </ul>
-    <div id="tab-1">
-      <table class="zebra">
+    <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <tbody>
           <tal:block repeat="widget view/widgets">
             <tr>
-              <td class="label">
-                <label tal:attributes="for widget/name">
-                  <span class="required" tal:condition="widget/required">*
+              <td class="fieldname">
+                  <span 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">
+              </td>
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -37,5 +36,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint
+                  <span tal:content="structure widget/hint">hint
                   </span>
                 </tal:hint> </td>
@@ -44,7 +43,8 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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"/>
+          <input tal:condition="python:action.label in view.taboneactions"
+                 tal:replace="structure action/render"/>
         </span>
       </div>
@@ -61,5 +61,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getSessionConfigurations" class="gradeB"> <td>
+          <tr tal:repeat="entry view/getSessionConfigurations" class="gradeC"> <td>
               <input type="checkbox" name="val_id" tal:attributes="value entry/name" /> </td> <td>
               <a href="" tal:attributes="href entry/url" tal:content="entry/title">Name</a> </td>
@@ -67,5 +67,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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"/>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactform.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactform.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactform.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
       tal:define="status view/status"
       tal:condition="status">
@@ -21,5 +21,5 @@
          tal:content="widget/label">Label
     </div>
-    <div class="widget" tal:content="structure widget">
+    <div tal:content="structure widget">
       Textbody
     </div>
@@ -27,5 +27,5 @@
   </tal:block>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/coursepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/coursepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/coursepage.pt	(revision 7459)
@@ -1,25 +1,25 @@
 <h2 tal:content="context/title">TITLE</h2>
 
-<table class="listing">
+<table class="form-table">
   <thead>
   </thead>
   <tbody>
-    <tr class="odd">
+    <tr>
       <td>Code:</td>
       <td tal:content="context/__name__">CODE</td>
     </tr>  
-    <tr class="even">
+    <tr>
       <td>Title:</td>
       <td tal:content="context/title">THE TITLE</td>
     </tr>
-    <tr class="odd">
+    <tr>
       <td>Credits:</td>
       <td tal:content="context/credits">CREDITS</td>
     </tr>
-    <tr class="even">
+    <tr>
       <td>Passmark:</td>
       <td tal:content="context/passmark">PASSMARK</td>
     </tr>
-    <tr class="odd">
+    <tr>
       <td>Semester/Term:</td>
       <td tal:content="context/semester">SEMESTER</td>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport1page.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport1page.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport1page.pt	(revision 7459)
@@ -16,8 +16,7 @@
     </thead>
     <tbody>
-      <tr tal:repeat="file view/getFiles"
-      tal:attributes="class python: repeat['file'].odd() and 'odd' or ''">
+      <tr tal:repeat="file view/getFiles">
         <td>
-          <button type="submit" name="select"
+          <button type="submit" name="select" class="btn primary"
             tal:attributes="value file/name">Select</button>
         </td>
@@ -29,4 +28,4 @@
     </tbody>
   </table>
-  <input type="submit" name="cancel" value="Cancel" />
+  <input type="submit" name="cancel" class="btn" value="Cancel" />
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport2page.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport2page.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport2page.pt	(revision 7459)
@@ -13,5 +13,5 @@
   </p>
   <div>
-    <table class = "zebra"
+    <table
            tal:define="body view/getPreviewBody;
                         headers view/getPreviewHeader;
@@ -19,6 +19,5 @@
       <thead>
         <tr>
-          <th style="border: 1px solid #888;"
-              tal:repeat="headerfield headers"
+          <th tal:repeat="headerfield headers"
               tal:content="headerfield"> headerfield
           </th>
@@ -28,6 +27,5 @@
         <tr tal:repeat="row body">
           <td tal:repeat="value row"
-              tal:content="value"
-              style="border: 1px solid #000;"> value
+              tal:content="value"> value
           </td>
         </tr>
@@ -62,7 +60,7 @@
     </p>
   </div>
-  <input type="submit" name="cancel" value="Cancel" />
-  <input type="submit" name="back1" value="Back to step 1" />
-  <input tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''"
+  <input class="btn" type="submit" name="cancel" value="Cancel" />
+  <input class="btn danger" type="submit" name="back1" value="Back to step 1" />
+  <input class="btn primary" tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''"
     type="submit" name="proceed" value="Proceed to step 3..." />
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport3page.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport3page.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport3page.pt	(revision 7459)
@@ -1,2 +1,6 @@
+<div class="alert-message success" tal:condition="not: view/getWarnings">
+  Header fields OK
+</div>
+
 <h2 i18n:translate=""
 tal:condition="view/label"
@@ -25,10 +29,7 @@
      tal:attributes="value view/mode" />
   </p>
-  <div class="alert notice ui-state-info" tal:condition="not: view/getWarnings">
-    <span class="ui-icon ui-icon-info">A</span>
-    Header fields OK
-  </div>
+
   <div>
-    <table class = "zebra"
+    <table class="condensed-table"
      tal:define="body view/getPreviewBody;
            headers view/headerfields;
@@ -36,6 +37,5 @@
       <thead>
         <tr>
-          <th style="border: 1px solid #888;"
-              tal:repeat="headerfield headers"
+          <th tal:repeat="headerfield headers"
               tal:content="headerfield">
             headerfield
@@ -43,12 +43,10 @@
         </tr>
         <tr>
-          <th style="border: 1px solid #888; text-align=center;"
-              tal:repeat="headerfield headers">
+          <th tal:repeat="headerfield headers">
             <i>change to:</i>
           </th>
         </tr>
         <tr>
-          <th style="border: 1px solid #888;"
-              tal:repeat="headerfield headers">
+          <th tal:repeat="headerfield headers">
             <select name="headerfield">
               <option tal:repeat="opt view/getPossibleHeaders"
@@ -65,6 +63,5 @@
         <tr tal:repeat="row body">
           <td tal:repeat="value row"
-              tal:content="value"
-              style="border: 1px solid #000;">
+              tal:content="value">
             value
           </td>
@@ -74,10 +71,10 @@
   </div>
 
-  <input type="submit" name="cancel" value="Cancel" />
-  <input type="reset" name="reset" value="Reset" />
-  <input type="submit" name="update" value="Set headerfields" />
-  <br />
-  <input type="submit" name="back2" value="Back to step 2" />
-  <input tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''"
+  <input class="btn" type="submit" name="cancel" value="Cancel" />
+  <input class="btn" type="reset" name="reset" value="Reset" />
+  <input class="btn" type="submit" name="update" value="Set headerfields" />
+  <br /><br />
+  <input class="btn danger" type="submit" name="back2" value="Back to step 2" />
+  <input class="btn primary" tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''"
    type="submit" name="proceed" value="Perform import..." />
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport4page.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport4page.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport4page.pt	(revision 7459)
@@ -18,5 +18,5 @@
 </p>
 <form method="POST">
-  <input type="submit" name="finish" value="Back to data center" />
-  <input type="submit" name="showlog" value="View processing log" />
+  <input class="btn primary" type="submit" name="finish" value="Back to data center" />
+  <input class="btn" type="submit" name="showlog" value="View processing log" />
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogspage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogspage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogspage.pt	(revision 7459)
@@ -1,36 +1,34 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
+<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
 <div tal:define="files view/files">
-  <p tal:condition="not: files">
-    Currently no log files are available.
+  <p tal:condition="not: files">Currently no log files are available.
   </p>
-  <table tal:condition="files">
+  <table tal:condition="files" class="condensed-table">
     <thead>
       <tr>
-  <th></th><th>File</th><th>Date</th><th>Size</th>
+        <th>
+        </th>
+        <th>File
+        </th>
+        <th>Date
+        </th>
+        <th>Size
+        </th>
       </tr>
     </thead>
     <tbody>
-      <tr tal:repeat="file files"
-    tal:attributes="class python: repeat['file'].odd() and 'odd' or 'even'">
-  <td class="text-center">
-    <form method="POST">
-      <input type="submit" name="show" value="Show" />
-      <input type="hidden" name="logname"
-       tal:attributes="value file/name" />
-    </form>
-  </td>
-  <td tal:content="file/name">file.name</td>
-  <td tal:content="file/uploaddate">Fri Jan 15 17:44:25 2010</td>
-  <td tal:content="file/getSize">12 bytes</td>
+      <tr tal:repeat="file files" tal:attributes="class python: repeat['file'].odd() and 'odd' or 'even'">
+        <td class="text-center">
+          <form method="POST">
+            <input type="submit" class="btn primary" name="show" value="Show" />
+            <input type="hidden" name="logname" tal:attributes="value file/name" />
+          </form></td>
+        <td tal:content="file/name">file.name</td>
+        <td tal:content="file/uploaddate">Fri Jan 15 17:44:25 2010</td>
+        <td tal:content="file/getSize">12 bytes</td>
       </tr>
     </tbody>
   </table>
-
   <form method="POST">
-    <input type="submit" name="back" value="Back to Data Center" />
+    <input type="submit" class="btn" name="back" value="Back to Data Center" />
   </form>
-
 </div>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogsshowfilepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogsshowfilepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogsshowfilepage.pt	(revision 7459)
@@ -4,8 +4,8 @@
 
 <form method="POST">
-  <input type="submit" name="back" value="Back" />
+  <input class="btn primary" type="submit" name="back" value="Back" />
 </form>
 
-<div class="bd">
+<div>
   <pre tal:content="view/filecontents">
     blah, blah
@@ -14,4 +14,4 @@
 
 <form method="POST">
-  <input type="submit" name="back" value="Back" />
+  <input class="btn primary" type="submit" name="back" value="Back" />
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacentermanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacentermanagepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacentermanagepage.pt	(revision 7459)
@@ -5,20 +5,17 @@
 <form method="POST">
   <div>
-    <label for="newpath">Storage path:</label>
+    Storage path:
     <input type="text" name="newpath"
      tal:attributes="value context/storage" />
     <br /><br />
-    <div>
-      <input type="checkbox" name="move" checked="checked" />
-      <label for="move">Copy existing data to new storage?</label>
-    </div>
-    <div>
-      <input type="checkbox" name="overwrite" checked="no" />
-      <label for="overwrite">Overwrite contents in new location?</label>
-    </div>
-    <br />
-    <input type="submit" name="save" value="Save" />
-    <input type="reset" name="reset" value="Reset" />
-    <input type="submit" name="cancel" value="Cancel" />
+    Copy existing data to new storage? &nbsp;&nbsp;
+    <input type="checkbox" name="move" checked="checked" />
+    <br /><br />
+    Overwrite contents in new location? &nbsp;&nbsp;
+    <input type="checkbox" name="overwrite" checked="no" />
+    <br /><br />
+    <input class="btn primary" type="submit" name="save" value="Save" />
+    <input class="btn" type="reset" name="reset" value="Reset" />
+    <input class="btn" type="submit" name="cancel" value="Cancel" />
   </div>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterpage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterpage.pt	(revision 7459)
@@ -19,6 +19,5 @@
   </thead>
   <tbody>
-    <tr tal:repeat="file context/getFiles"
-	tal:attributes="class python: repeat['file'].odd() and 'odd' or 'even'">
+    <tr tal:repeat="file context/getFiles">
       <td tal:content="file/name">thefilename</td>
       <td tal:content="file/size">12 k</td>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenteruploadpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenteruploadpage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenteruploadpage.pt	(revision 7459)
@@ -5,7 +5,8 @@
 <form method="post" enctype="multipart/form-data">
   <input type="file" name="uploadfile:file" />
+  <br /><br />
   <div>
-    <input type="submit" name="SUBMIT" value="Upload" />
-    <input type="submit" name="CANCEL" value="Cancel" />
+    <input class="btn primary" type="submit" name="SUBMIT" value="Upload" />
+    <input class="btn" type="submit" name="CANCEL" value="Cancel" />
   </div>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_display_form.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_display_form.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_display_form.pt	(revision 7459)
@@ -3,9 +3,9 @@
     tal:content="view/label">Label</h2>
 
-<table class="zebra">
+<table class="form-table">
   <tbody>
     <tal:block repeat="widget view/widgets">
       <tr>
-        <td class="fieldname" width="33%">
+        <td class="fieldname">
           <tal:block content="widget/label"/>:
         </td>
@@ -18,5 +18,5 @@
   </tbody>
   <tfoot>
-    <tr class="controls">
+    <tr>
       <td colspan="2" class="align-right">
         <input tal:repeat="action view/actions"
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 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
       tal:define="status view/status"
       tal:condition="status">
@@ -13,23 +13,16 @@
         Form status summary
       </span>
-      <ul tal:condition="view/errors">
-        <li tal:repeat="error view/error_views">
-           <span tal:replace="structure error">Error Type</span>
-        </li>
-      </ul>
   </div>
 
-  <table class="zebra">
+  <table class="form-table">
     <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 class="fieldname">
+            <span tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -38,5 +31,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -46,5 +39,5 @@
     </tbody>
   </table>
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt	(revision 7459)
@@ -1,39 +1,38 @@
 <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:
+<div class="alert-message error"  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">
+<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active">
+    <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 class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <tbody>
           <tal:block repeat="widget view/widgets">
             <tr>
-              <td class="label">
-                <label tal:attributes="for widget/name">
-                  <span class="required" tal:condition="widget/required">*
+              <td class="fieldname">
+                  <span 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">
+              </td>
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -43,5 +42,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint
+                  <span tal:content="structure widget/hint">hint
                   </span>
                 </tal:hint> </td>
@@ -50,5 +49,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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"/>
@@ -69,5 +68,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getCourses" class="gradeB"> <td>
+          <tr tal:repeat="entry view/getCourses" class="gradeC"> <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>
@@ -76,5 +75,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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"/>
@@ -95,5 +94,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getCertificates" class="gradeB"> <td>
+          <tr tal:repeat="entry view/getCertificates" class="gradeC"> <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>
@@ -102,5 +101,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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"/>
@@ -123,5 +122,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB"> <td>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC"> <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>
@@ -131,10 +130,10 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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">
+      <table class="form-table">
         <tr> <td>
             <select id="user" name="user">
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt	(revision 7459)
@@ -3,11 +3,10 @@
 tal:content="view/label">Label</h2>
 
-<div id="tabs">
-    <ul>
-      <li><a href="#tab-1"><span>Courses</span></a></li>
-      <li><a href="#tab-2"><span>Certificates</span></a></li>
-    </ul>
-    
-    <div id="tab-1"> 
+<ul class="tabs" data-tabs="tabs">
+  <li class="active"><a href="#tab-1"><span>Courses</span></a></li>
+  <li><a href="#tab-2"><span>Certificates</span></a></li>
+</ul>
+<div class="tab-content">
+    <div id="tab-1" class="active">
     <br /> 
     <table class="display dataTable">
@@ -18,6 +17,5 @@
       </thead>
       <tbody>
-        <tr tal:repeat="entry view/getCourses"
-    	class="gradeB">
+        <tr tal:repeat="entry view/getCourses" class="gradeC">
           <td>
         	<a href=""
@@ -42,6 +40,5 @@
       </thead>
       <tbody>
-        <tr tal:repeat="entry view/getCertificates"
-    	class="gradeB">
+        <tr tal:repeat="entry view/getCertificates" class="gradeC">
           <td>
         	<a href=""
@@ -55,5 +52,4 @@
       </tbody>
     </table>
-    <br /><br />
     </div>
 </div>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultiescontainermanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultiescontainermanagepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultiescontainermanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
     tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,51 +13,39 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
-  <div id="tabs">
-    <ul>
-      <li><a href="#tab-1">
-        <span tal:content="view/subunits">Contents</span>
-      </a></li>
-    </ul>
-
-    <div id="tab-1">
-      <h3 tal:content="view/subunits">Faculties</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.taboneactions"
-                 tal:replace="structure action/render"/>
-        </span>
-      </div>
-
-    </div>
+  <table>
+    <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 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>
 </form>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 7459)
@@ -1,40 +1,40 @@
 <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:
+<div class="alert-message error" 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">
+<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active">
+    <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 class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <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">
+              <td class="fieldname">
+                <span tal:condition="widget/required">*
+                </span>
+                <span i18n:translate="" tal:content="widget/label">label
+                </span>:
+              </td>
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -44,5 +44,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint
+                  <span tal:content="structure widget/hint">hint
                   </span>
                 </tal:hint> </td>
@@ -51,7 +51,8 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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"/>
+          <input tal:condition="python:action.label in view.taboneactions"
+                 tal:replace="structure action/render"/>
         </span>
       </div>
@@ -59,5 +60,5 @@
     <div id="tab-2">
       <h3 tal:content="view/subunits">Departments</h3>
-      <table class="zebra">
+      <table>
         <thead>
           <tr>
@@ -72,6 +73,8 @@
         <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>
+              <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>
@@ -79,7 +82,8 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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"/>
+          <input tal:condition="python:action.label in view.tabtwoactions"
+                 tal:replace="structure action/render"/>
         </span>
       </div>
@@ -100,6 +104,7 @@
         </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>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC"> <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>
@@ -108,10 +113,11 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div 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"/>
+          <input tal:condition="python:action.label in view.tabthreeactions1"
+                 tal:replace="structure action/render"/>
         </span>
       </div><br /><br />
-      <table class="zebra">
+      <table class="form-table">
         <tr> <td>
             <select id="user" name="user">
@@ -122,5 +128,6 @@
             </select> </td> <td>
             <select id="local_role" name="local_role">
-              <option tal:repeat="localrole view/getLocalRoles" tal:attributes="value localrole/name">
+              <option tal:repeat="localrole view/getLocalRoles"
+                      tal:attributes="value localrole/name">
               <span tal:replace="localrole/title">LOCALROLETITLE
               </span>
@@ -129,5 +136,6 @@
             <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"/>
+                <input tal:condition="python:action.label in view.tabthreeactions2"
+                       tal:replace="structure action/render"/>
               </span>
             </div> </td>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 7459)
@@ -5,5 +5,5 @@
 </div>
 
-<table class="zebra">
+<table>
   <thead>
     <tr>
@@ -14,5 +14,6 @@
   <tbody>
     <tr tal:repeat="value context/values">
-      <td> <a tal:attributes="href value/__name__"> <span tal:content="value/code">Name</span></a></td>
+      <td> <a tal:attributes="href value/__name__">
+          <span tal:content="value/code">Name</span></a></td>
       <td tal:content="value/longtitle">Title</td>
     </tr>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt	(revision 7459)
@@ -1,18 +1,19 @@
 <h2 i18n:translate=""  tal:condition="view/label"  tal:content="view/label">Label</h2>
 <form method="post">
-  <table id="login" class="form"   summary="Table for entering login information">
+  <table id="login" class="form-table" summary="Table for entering login information">
     <tbody>
       <tr>
-        <th>
-          <label for="form.login">User Name or Student Id
-          </label>
-        </th> <td>
-          <input type="text" id="login" name="form.login" size="20" /> </td>
+        <td class="fieldname">
+          User Name or Student Id:
+        </td>
+        <td>
+          <input type="text" id="login" name="form.login" size="20" />
+        </td>
       </tr>
       <tr>
-        <th>
-          <label for="form.password">Password
-          </label>
-        </th><td>
+        <td class="fieldname">
+          Password:
+        </td>
+        <td>
           <input type="password" id="password" name="form.password"  size="20" value="" />
           &nbsp;&nbsp;
@@ -23,5 +24,5 @@
   </table>
   <input type="hidden" name="camefrom"   tal:attributes="value view/camefrom" />
-  <input type="submit" name="SUBMIT" value="Login" /><br /><br />
+  <input class="btn primary" type="submit" name="SUBMIT" value="Login" /><br /><br />
   <p>Don't forget to logout or exit your browser when you're done.
   If you are having trouble logging in, make sure to enable  cookies in your web browser.
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/messages.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/messages.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/messages.pt	(revision 7459)
@@ -1,7 +1,6 @@
-<ul>
-  <li
-    tal:repeat="message view/messages"
-    tal:attributes="class message/type"
-    tal:content="structure message/message">Sauron will arrive soon!
-  </li>
-</ul>
+<div
+  tal:repeat="message view/messages"
+  tal:attributes="class message/type"
+  tal:content="structure message/message">Sauron will arrive soon!
+</div>
+
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt	(revision 7459)
@@ -1,9 +1,13 @@
 <h3 i18n:translate="">My Portal Roles:</h3>
-<span tal:repeat="role view/getSiteRoles">
-  <div tal:content="role" >ROLE</div>
-</span>
-<br /><br />
+<table class="form-table">
+<tr tal:repeat="role view/getSiteRoles">
+    <td>
+      <div tal:content="role" >ROLE</div>
+    </td>
+  </tr>
+</table>
+
 <h3 i18n:translate="">My Local Roles:</h3>
-<table>
+<table class="form-table">
   <tr tal:repeat="role view/getLocalRoles">
     <td valign="top" ><span tal:content="role" >ROLE</span>:</td>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt	(revision 7459)
@@ -3,5 +3,5 @@
 </h2>
 
-<div class="error"><b>Please note the following:</b></div>
+<div><b>Please note the following:</b></div>
 <div>
   <ol class="list">
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/plainactionbutton.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/plainactionbutton.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/plainactionbutton.pt	(revision 7459)
@@ -1,4 +1,4 @@
-<span class="yui-button" tal:condition="viewlet/target_url">
-  <span class="first-child">
+<span tal:condition="viewlet/target_url">
+  <span>
     <a href=""
        tal:attributes="href viewlet/target_url">
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/removesubobjectspage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/removesubobjectspage.pt	(revision 7384)
+++ 	(revision )
@@ -1,32 +1,0 @@
-  <div tal:condition="python: not len(context.keys())">
-    There are no subobjects registered yet.
-  </div>
-  <form method="POST" tal:condition="python: len(context.keys())">
-    <div tal:condition="python: not len(context.keys())">
-    There are no faculties registered yet.
-    </div>
-    
-    <table>
-      <thead>
-        <tr>
-          <th>&nbsp;</th>
-          <th>Code</th>
-          <th>Title</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="value context/values"
-    	tal:attributes="class python: repeat['value'].odd() and 'odd' or 'even'">
-    	  <td>
-    	  <input type="checkbox"
-    		 name="val_id"
-    		 tal:attributes="value value/__name__" />
-    	  </td>    	
-          <td> <a tal:attributes="href value/__name__"> <span tal:content="value/code">Name</span></a></td>
-          <td tal:content="value/title">Title</td>
-        </tr>
-      </tbody>
-    </table>
-    <input type="submit" name="REMOVE" value="Remove selected" onclick="return confirmPost('All sububjects will be removed too. Are you sure?')"/>
-    <input type="submit" name="CANCEL" value="Cancel" />
-  </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 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt	(revision 7459)
@@ -3,5 +3,5 @@
   <input type="text" name="query"
 	 tal:attributes="value view/query" />
-    <input type="submit" name="SUBMIT" value="Search" />
+    <input class="btn primary" type="submit" name="SUBMIT" value="Search" />
 </form>
 <br />
@@ -31,5 +31,3 @@
         </tbody>
     </table>
-    <div class="actionButtons">
-    </div>
 </span>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt	(revision 7459)
@@ -13,100 +13,80 @@
         tal:attributes="title string:RSS feed of ${layout/getAppTitle};
             href python: view.url(layout.site, 'feed.rss')" />
+  </head>
+  <body>
+    <div class="topbar" data-scrollspy="scrollspy" >
+      <div class="topbar-inner">
+        <div class="container-fluid">
+          <a class="brand" href="#" tal:content="layout/getAppAcronym">Acronym</a>
+          <ul class="nav">
+            <tal:primary_nav content="structure provider:primary_nav" />
+          </ul>
+          <ul class="nav secondary-nav">
+            <li tal:condition="not: layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
+                Login
+            </a>
+            </li>
+            <li tal:condition="layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
+                Contact
+            </a>
+            </li>
+            <li tal:condition="layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
 
-  </head>
-  <body class="rounded yui-skin-sam">
-    <div id="doc3" class="yui-t1">
-      <div id="hd" role="banner">
-        <div id="hd">
-          <h1 id="logo">
-            <a href="" tal:attributes="href view/application_url">
-              <span class="uni-logo">
-              </span> </a>
-            <span id="uni-title" tal:content="layout/getAppTitle"> Sample University
-            </span> </h1>
-          <div id="navigation" class="yui-navset" style="text-align:right;">
-            <ul id="primary-navigation">
-              <tal:primary_nav content="structure provider:primary_nav" />
+    <ul class="breadcrumb">
+      <tal:breadcrumbs
+            tal:condition="python: layout.isAuthenticated()"
+            tal:content="structure provider:breadcrumbs" />
+      <span tal:condition="layout/getStudentName" class="wfstatus">
+            Student Id:
+          <span tal:replace="python:context.getStudent().student_id">Id
+          </span>&nbsp;&nbsp;
+          State:
+          <span tal:replace="python:context.getStudent().state">State
+          </span>
+      </span>
+    </ul>
+
+    <div class="container-fluid">
+      <div class="sidebar">
+        <div class="well">
+          <div tal:condition="layout/getStudentName">
+            <h5 tal:content="layout/getStudentName">Student name</h5>
+            <ul>
+              <tal:left content="structure provider:left_studentmanage" />
             </ul>
-            <ul id="user-navigation">
-              <li tal:condition="not: layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
-                  Login
-              </a>
-              </li>
-              <li tal:condition="layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
-                  Contact
-              </a>
-              </li>
-              <li tal:condition="layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
-              </li>
+          </div>
+          <div tal:condition="layout/isAuthenticated">
+            <h5 tal:content="layout/getUserTitle">Username</h5>
+            <ul>
+              <tal:left content="structure provider:left" />
             </ul>
-            <div class="clear">
-            </div>
           </div>
         </div>
       </div>
-      <div id="bd" role="main">
-        <span tal:condition="python: layout.isAuthenticated()"
-              tal:content="structure provider:breadcrumbs" />
-
-        <div class="yui-b">
-          <div class="block" tal:condition="layout/getStudentName">
-            <div class="hd">
-              <h2 tal:content="layout/getStudentName">Student name</h2>
-            </div>
-            <div class="bd">
-              <tal:left content="structure provider:left_studentmanage" />
-            </div>
-          </div>
-          <div class="block" tal:condition="layout/isAuthenticated">
-            <div class="hd">
-              <h2 tal:content="layout/getUserTitle">Username</h2>
-            </div>
-            <div class="bd">
-              <tal:left content="structure provider:left" />
-            </div>
+      <div class="span13 content">
+        <div
+            tal:define="message context/@@messages"
+            tal:condition="python: len(message)>11">
+          <div tal:content="structure message">
           </div>
         </div>
-
-        <div id="yui-main">
-          <div class="yui-b">
-            <div class="yui-g">
-              <div class="block">
-                <div class="hd" tal:condition="python: layout.isAuthenticated()">
-                  <span tal:content="view/title"> THE CONTENT TITLE </span>
-                  <span tal:condition="layout/getStudentName" class="wfstatus">
-                  Sudent Id: <span tal:content="python:context.getStudent().student_id">Student Id</span>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                  State: <span tal:content="python:context.getStudent().state">State</span>
-                  </span>
-                </div>
-                <div class="bd">
-                  <div class="actionbar">
-                    <tal:actionbar content="structure provider:actionbar" />
-                  </div>
-                  <div class="alert warning ui-state-error"
-                      tal:define="message context/@@messages"
-                      tal:condition="python: len(message)>11">
-                    <span class="ui-icon ui-icon-alert">A
-                    </span>
-                    <span tal:content="structure message">
-                    </span>
-                  </div>
-                  <div tal:replace="structure view/content"> THE CONTENT
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
+        <span tal:replace="structure provider:actionbar" />
+        <div tal:content="structure view/content"> THE CONTENT
         </div>
-
-      </div>
-      <div id="ft" role="contentinfo">
-        <p>Student Information and Registration Portal<br />
-            Copyright &copy; WAeUP Group, 2008-2011
-        </p>
+        <div class="footer">
+          <p class="pull-right"><a href="#">Back to top</a></p>
+          <p>
+            Student Information and Registration Portal<br />
+            Copyright &copy; WAeUP Group, 2008-2012
+          </p>
+        </div>
       </div>
     </div>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 7459)
@@ -10,5 +10,6 @@
     <meta name="viewport" content="width=320, initial-scale=1, maximum-scale=1"/>
     <link rel="stylesheet" media="only screen and (max-device-width: 480px)"
-        tal:attributes="href python: view.url(layout.site, '@@/waeup.sirp.browser/mobile.css')" type="text/css" />
+        tal:attributes="href python: view.url(layout.site, '@@/waeup.sirp.browser/mobile.css')"
+        type="text/css" />
     <link rel="shortcut icon" tal:attributes="href static/favicon.ico" type="image/x-icon" />
     <link rel="alternate" type="application/rss+xml" title="RSS"
@@ -16,94 +17,62 @@
         tal:attributes="title string:RSS feed of ${layout/getAppTitle};
             href python: view.url(layout.site, 'feed.rss')" />
-
   </head>
-  <body class="rounded yui-skin-sam">
-    <div id="doc3" class="yui-t7">
-      <div id="hd" role="banner">
-        <div id="hd">
-          <h1 id="logo">
-            <a href="" tal:attributes="href view/application_url">
-              <span class="uni-logo">
-              </span> </a>
-            <span id="uni-title" tal:content="layout/getAppTitle"> Sample University
-            </span> </h1>
-          <div id="navigation" class="yui-navset" style="text-align:right;">
-            <ul id="primary-navigation">
+  <body>
+    <div class="topbar" data-scrollspy="scrollspy" >
+      <div class="topbar-inner">
+        <div  class="container">
+          <a class="brand" href="#" tal:content="layout/getAppAcronym">Acronym</a>
+          <ul class="nav">
               <tal:primary_nav content="structure provider:primary_nav" />
               <tal:primary_nav content="structure provider:primary_nav_student" />
-            </ul>
-            <ul id="user-navigation">
-              <li tal:condition="not: layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
-                  Login
-              </a>
-              </li>
-              <li tal:condition="layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
-                  Contact
-              </a>
-              </li>
-              <li tal:condition="layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
-              </li>
-            </ul>
-            <div class="clear">
-            </div>
+          </ul>
+          <ul class="nav secondary-nav">
+            <li tal:condition="not: layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
+                Login
+            </a>
+            </li>
+            <li tal:condition="layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
+                Contact
+            </a>
+            </li>
+            <li tal:condition="layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="container">
+      <ul class="student-info-bar" tal:condition="layout/isAuthenticated">
+        <tal:breadcrumbs
+              tal:condition="python: layout.isAuthenticated()"
+              tal:content="structure provider:breadcrumbs" />
+        <span tal:condition="layout/getStudentName" class="wfstatus">
+              Student Id:
+            <span tal:replace="python:context.getStudent().student_id">Id
+            </span>&nbsp;&nbsp;
+            State:
+            <span tal:replace="python:context.getStudent().state">State
+            </span>
+        </span>
+      </ul>
+      <div class="content">
+        <div tal:define="message context/@@messages"
+             tal:condition="python: len(message)>11">
+          <div tal:content="structure message">
           </div>
         </div>
-      </div>
-      <div id="bd" role="main">
-
-        <div class="yui-b">
-          <div class="block" >
-            <div class="studentmenu">
-              <div tal:condition="layout/getStudentName"
-                   tal:replace="structure provider:top_student">
-                Student Links
-              </div>
-              <div tal:content="structure provider:actionbar">
-                Student Actions
-              </div>
-            </div>
-          </div>
+        <span tal:replace="structure provider:actionbar" />
+        <div tal:content="structure view/content"> THE CONTENT
         </div>
-
-        <div id="yui-main">
-          <div class="yui-b">
-            <div class="yui-g">
-              <div class="block">
-                <div class="bd">
-                  <div class="actionbar">
-                    <span tal:condition="layout/getStudentName" class="wfstatus">
-                    Id:
-                    <span tal:replace="python:context.getStudent().student_id"
-                        class="wfstatus">Id</span>
-                    &nbsp;&nbsp;
-                    State:
-                    <span tal:replace="python:context.getStudent().state"
-                        class="wfstatus">State</span>
-                    </span>
-                  </div>
-                  <div class="alert warning ui-state-error"
-                      tal:define="message context/@@messages"
-                      tal:condition="python: len(message)>11">
-                    <span class="ui-icon ui-icon-alert">A
-                    </span>
-                    <span tal:content="structure message">
-                    </span>
-                  </div>
-                  <div tal:replace="structure view/content"> THE CONTENT
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
+        <div class="footer">
+          <p class="pull-right"><a href="#">Back to top</a></p>
+          <p>
+            Student Information and Registration Portal<br />
+            Copyright &copy; WAeUP Group, 2008-2012
+          </p>
         </div>
-
-      </div>
-      <div id="ft" role="contentinfo">
-        <p>Student Information and Registration Portal<br />
-            Copyright &copy; WAeUP Group, 2008-2011
-        </p>
       </div>
     </div>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt	(revision 7459)
@@ -8,6 +8,5 @@
   </thead>
   <tbody>
-    <tr tal:repeat="row viewletmanager/rows"
-	tal:attributes="class python: repeat['row'].odd() and 'odd' or 'even'">
+    <tr tal:repeat="row viewletmanager/rows">
       <td tal:repeat="viewlet row">
 	<div tal:replace="structure viewlet/render">
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/universitypage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/universitypage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/universitypage.pt	(revision 7459)
@@ -1,3 +1,3 @@
-<h2 tal:content="view/label">Title</h2>
+<h1 tal:content="view/label">Title</h1>
 
 <span tal:replace="structure view/frontpage">Frontpage</span>
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
       tal:define="status view/status"
       tal:condition="status">
@@ -20,16 +20,14 @@
   </div>
 
-  <table class="zebra">
+  <table class="form-table">
     <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 class="fieldname">
+            <span tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -38,5 +36,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -44,5 +42,5 @@
       </tal:block>
       <tr>
-        <td class="label"><label>Password:</label></td>
+        <td class="fieldname">Password:</td>
         <td>
           <input name="password" type="password"  />
@@ -50,5 +48,5 @@
       </tr>
       <tr>
-        <td class="label"><label>Retype password:</label></td>
+        <td class="fieldname">Retype password:</td>
         <td>
           <input name="control_password" type="password" />
@@ -58,5 +56,5 @@
     </tbody>
   </table>
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt	(revision 7384)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt	(revision 7459)
@@ -1,14 +1,9 @@
 <h2>Portal Users</h2>
 
-<p>
-  Here you can manage portal users.  
-</p>
-
-<table class="zebra">
+<table>
   <thead>
     <tr>
       <th>User ID</th>
       <th>Name</th>
-      <th>Description</th>
       <th>Portal Roles</th>
       <th>Local Roles</th>
@@ -20,5 +15,4 @@
       <td tal:content="account/name">User name</td>
       <td tal:content="account/title">Title</td>
-      <td tal:content="account/description">Description</td>
       <td tal:content="structure python:view.getSiteRoles(account)">SITE ROLES</td>
       <td tal:content="structure python:view.getLocalRoles(account)">LOCAL ROLES</td>
@@ -27,6 +21,6 @@
           <input type="hidden" name="userid"
            tal:attributes="value account/name"/>
-            <input type="submit" name="manage" value="manage" />
-            <input type="submit" name="delete" value="delete" />
+            <input class="btn" type="submit" name="manage" value="manage" />
+            <input class="btn" type="submit" name="delete" value="delete" />
         </form>
       </td>
