Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 5992)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 5993)
@@ -845,5 +845,7 @@
     grok.name('index')
     title = 'Academics'
-    pnav = 1
+    label = 'Faculties'
+    pnav = 1
+    grok.template('facultypage')
 
     #def update(self, code=None, edit=None, delete=None):
@@ -904,4 +906,5 @@
     grok.name('index')
     pnav = 1
+    label = 'Departments'
 
     @property
@@ -995,5 +998,4 @@
     grok.name('index')
     pnav = 1
-    #title = 'xxx'
 
     @property
@@ -1208,4 +1210,5 @@
             mandatory = certcourse.core_or_elective
             title = course.title
+            #import pdb; pdb.set_trace()
             courseref_url = self.url(self.context[key])
             course_url = self.url(course)
Index: in/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultycontainerpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultycontainerpage.pt	(revision 5992)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<h2>Faculties</h2>
-
-<div tal:condition="python: not len(context.keys())">
-There are no faculties registered yet.
-</div>
-
-<table class="zebra">
-  <thead>
-    <tr>
-      <th>Code</th>
-      <th>Title</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr tal:repeat="value context/values">
-      <td> <a tal:attributes="href value/__name__"> <span tal:content="value/code">Name</span></a></td>
-      <td tal:content="value/longtitle">Title</td>
-    </tr>
-  </tbody>
-</table>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 5992)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 5993)
@@ -1,6 +1,6 @@
-<h2>Departments</h2>
+<h2 tal:content="view/label">TITLE</h2>
 
 <div tal:condition="python: not len(context.keys())">
-There are no departments registered yet.
+There no subobjects registered yet.
 </div>
 
@@ -16,6 +16,4 @@
       <td> <a tal:attributes="href value/__name__"> <span tal:content="value/code">Name</span></a></td>
       <td tal:content="value/longtitle">Title</td>
-      <td class="text-right">
-      </td>
     </tr>
   </tbody>
