Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 6686)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 6687)
@@ -11,8 +11,9 @@
 from zope.interface import Interface
 from zope.site.hooks import getSite
-from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.interfaces import IWAeUPObject, IUserAccount
 from waeup.sirp.browser.interfaces import ITheme
 from waeup.sirp.browser.theming import get_all_themes, WAeUPThemeGray1
 from waeup.sirp.students.interfaces import IStudentNavigation
+from waeup.sirp.authentication import get_principal_role_manager
 
 grok.templatedir('templates')
@@ -160,4 +161,14 @@
         return
 
+    def isStudent(self):
+        prm = get_principal_role_manager()
+        roles = [x[0] for x in prm.getRolesForPrincipal(self.request.principal.id)]
+        return 'waeup.Student' in roles
+
+    def tableClass(self):
+        if self.isStudent():
+            return 'yui-t7'
+        return 'yui-t1'
+
     def update(self):
         """Include the resources required by the chosen skin/theme.
Index: main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/sitelayout.pt
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/sitelayout.pt	(revision 6686)
+++ main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/sitelayout.pt	(revision 6687)
@@ -15,5 +15,5 @@
   </head>
   <body class="rounded yui-skin-sam">
-    <div id="doc3" class="yui-t1">
+    <div id="doc3" tal:attributes= "class layout/tableClass">
       <div id="hd" role="banner">
         <div id="hd">
@@ -25,6 +25,9 @@
             </span> </h1>
           <div id="navigation" class="yui-navset" style="text-align:right;">
-            <ul id="primary-navigation">
+            <ul id="primary-navigation" tal:condition="not: layout/isStudent">
               <tal:primary_nav content="structure provider:primary_nav" />
+            </ul>
+            <ul id="primary-navigation" tal:condition="layout/isStudent">
+              <tal:primary_nav content="structure provider:primary_nav_student" />
             </ul>
             <ul id="user-navigation" tal:condition="layout/isAuthenticated">
@@ -44,11 +47,39 @@
       </div>
       <div id="bd" role="main">
-        <span tal:condition="layout/isAuthenticated"
+        <span tal:condition="python: layout.isAuthenticated() and not layout.isStudent()"
               tal:content="structure provider:breadcrumbs" />
+
+        <div class="yui-b" tal:condition="not: layout/isStudent">
+          <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">
+            <div class="hd">
+              <h2 tal:content="layout/getUserTitle">Username</h2>
+            </div>
+            <div class="bd">
+              <tal:left content="structure provider:left" />
+            </div>
+          </div>
+        </div>
+
+        <div class="yui-b" tal:condition="layout/isStudent">
+          <div class="block" tal:condition="layout/getStudentName">
+            <div>
+              <tal:left content="structure provider:top_student" />
+            </div>
+          </div>
+        </div>
+
         <div id="yui-main">
           <div class="yui-b">
             <div class="yui-g">
               <div class="block">
-                <div class="hd">
+                <div class="hd" tal:condition="not: layout/isStudent">
                   <span tal:content="view/title"> THE CONTENT TITLE </span>
                   <span tal:condition="layout/getStudentName" class="wfstatus">
@@ -77,22 +108,5 @@
           </div>
         </div>
-        <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_student" />
-            </div>
-          </div>
-          <div class="block">
-            <div class="hd">
-              <h2 tal:content="layout/getUserTitle">Username</h2>
-            </div>
-            <div class="bd">
-              <tal:left content="structure provider:left" />
-            </div>
-          </div>
-        </div>
+
       </div>
       <div id="ft" role="contentinfo">
