Index: WAeUP_SRP/base/skins/waeup_layout/layout_application_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_layout/layout_application_view.pt	(revision 2571)
+++ WAeUP_SRP/base/skins/waeup_layout/layout_application_view.pt	(revision 2573)
@@ -1,9 +1,18 @@
 <!-- a layout_lib macro -->
 <!-- $Id: layout_application_view.pt 1435 2007-02-19 10:35:10Z henrik $ -->
+
+<metal:define tal:define="isStaff context/isStaff;
+                          isStudent context/isStudent;">
+
+<metal:block tal:condition="isStaff">              
+<metal:block use-macro="here/layout_waeup_lib/macros/table_view"/>              
+</metal:block>              
+
 <metal:block define-macro="default_view"
-  tal:define="layout options/layout;
-              dm options/datastructure/getDataModel;
-              widgets python:context.getRenderedWidgets(layout);
-              fields python:('jamb_reg_no',
+       tal:condition="isStudent"
+       tal:define="dm options/datastructure/getDataModel;
+                   layout options/layout;
+                   widgets python:context.getRenderedWidgets(layout);
+                   fields python:('jamb_reg_no',
                                  'app_ac_pin',
                                  'app_ac_date',
@@ -70,2 +79,3 @@
   </table>
 </metal:block>
+</metal:define>
Index: WAeUP_SRP/base/skins/waeup_student/application_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/application_view.pt	(revision 2571)
+++ WAeUP_SRP/base/skins/waeup_student/application_view.pt	(revision 2573)
@@ -26,5 +26,5 @@
               tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
               layout_mode='view', 
-              layout_id='student_application_fe')" 
+              layout_id='student_application')" 
               />
       </span>
