Index: /WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py	(revision 551)
+++ /WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py	(revision 552)
@@ -31,4 +31,6 @@
     elif context.portal_type == 'Faculty':
         return context.faculty_index_view()
+    elif context.portal_type == 'Department':
+        return context.department_index_view()
     return redirect("%s/academics_contents" % context.absolute_url())
 if isStudent:
Index: /WAeUP_SRP/trunk/skins/waeup_academics/department_index_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_academics/department_index_view.pt	(revision 551)
+++ /WAeUP_SRP/trunk/skins/waeup_academics/department_index_view.pt	(revision 552)
@@ -20,10 +20,18 @@
       <form action="" method="post" class="group"
             tal:attributes="action info/action"
-            tal:define="rows python: info['items'];"
+            tal:define="certs python: info['certificates'];"
             >
         <span tal:condition="python: 0" tal:content="structure rows" />
         <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
-          <tr tal:repeat="row rows"
-            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+          <tr class="even ajaxtd">
+            <th colspan="4"><a href="view" tal:attributes="href string:${context/absolute_url}/courses">
+              Courses</a> </th>
+          </tr>
+          <tr class="even ajaxtd">
+            <th colspan="4"><a href="view" tal:attributes="href string:${context/absolute_url}/certificates">
+             Certificates </a> </th>
+          </tr>
+          <tr tal:repeat="row certs"
+            tal:attributes="class python:test(repeat['row'].odd(), 'even ajaxtd', 'odd ajaxtd')">
             <td align="left" valign="middle" style="width: 5px;" 
                 tal:condition="is_manager">
Index: /WAeUP_SRP/trunk/skins/waeup_default/waeup_content_master.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/waeup_content_master.pt	(revision 552)
+++ /WAeUP_SRP/trunk/skins/waeup_default/waeup_content_master.pt	(revision 552)
@@ -0,0 +1,50 @@
+<!-- a content_lib macro -->
+<!-- $Id: waeup_content_master.pt 33555 2006-02-28 10:00:04Z div $ -->
+
+<!-- Master macro used for content stuff -->
+
+<metal:block define-macro="master"
+  tal:define="proxy here/this;
+  doc nocall:doc|python:here.getContent()">
+<metal:block use-macro="here/main_template/macros/master">
+<metal:block fill-slot="base">
+<metal:block define-slot="base">
+  <base href="" tal:attributes="href python: here_url + '/'" />
+</metal:block>
+</metal:block>
+
+<metal:block fill-slot="head_slot"><metal:block
+  define-slot="head_slot" /></metal:block>
+<metal:block fill-slot="style_slot"><metal:block define-slot="style_slot"
+  /></metal:block>
+  <metal:block fill-slot="javascript_head_slot">
+    <metal:block define-slot="javascript_head_slot" />
+  </metal:block>
+
+  <metal:block fill-slot="header">
+    <metal:block define-slot="header">
+      <a href="" tal:attributes="href string:${here/academicsParent}">
+        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
+        Up one level
+      </a>
+      <h1 tal:content="here/title_or_id">
+        Page Title
+      </h1>
+      <div class="description" tal:content="doc/Description"
+           tal:condition="nothing">
+        Document Description goes here.
+      </div>
+    </metal:block>
+  </metal:block>
+
+<metal:block fill-slot="main">
+<metal:block define-slot="main" />
+</metal:block>
+
+<metal:block fill-slot="sub">
+<metal:block define-slot="sub">
+</metal:block>
+</metal:block>
+
+</metal:block>
+</metal:block>
