Index: /waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py
===================================================================
--- /waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 183)
+++ /waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 184)
@@ -288,17 +288,18 @@
           'visible' : 0,
           },
-         {'id'        : 'eligibility',
-          'name'      : 'Post-Primary Results',
+          {
+          'id'        : 'PERSONAL',
+          'name'      : 'Personal Data',
+          'action'    : 'string:${object/absolute_url}/PERSONAL',
+          'condition':  "python: object.getContent().memberIsOwner() and getattr(object,'PERSONAL',None)",
+          'permission': (ModifyPortalContent,)
+          },
+          {
+          'id'        : 'eligibility',
+          'name'      : 'Eligibility Data',
           'action'    : 'eligibility',
           'condition':  'object/memberIsOwner',
           'permission': (ModifyPortalContent,),
           'visible': True,
-          },
-         {'id'        : 'JAMB',
-          'name'      : 'JAMB Data',
-          'action'    : 'string:${object/absolute_url}/JAMB',
-          'condition':  'python:object.getContent().memberIsOwner()',
-          'permission': (ModifyPortalContent,),
-          'visible': False,
           },
           {
@@ -307,11 +308,6 @@
           'action'    : 'string:${object/absolute_url}/DOCUMENTS',
           'condition':  "python: object.getContent().memberIsOwner() and getattr(object,'PERSONAL',None)",
-          'permission': (ModifyPortalContent,)},
-          {
-          'id'        : 'PERSONAL',
-          'name'      : 'Personal Data',
-          'action'    : 'string:${object/absolute_url}/PERSONAL',
-          'condition':  "python: object.getContent().memberIsOwner() and getattr(object,'PERSONAL',None)",
-          'permission': (ModifyPortalContent,)},
+          'permission': (ModifyPortalContent,)
+          },
           {
           'id'        : 'register_study_level',
@@ -319,5 +315,6 @@
           'action'    : 'string:${object/absolute_url}/register_level',
           'condition':  'python: object.getContent().memberIsOwner() and not object.getContent().isRegisteredForCurrentLevel()',
-          'permission': (ModifyPortalContent,)},
+          'permission': (ModifyPortalContent,)
+          },
           {
           'id'        : 'book_accomodation',
@@ -325,5 +322,6 @@
           'action'    : 'string:${object/absolute_url}/book_accommodation',
           'condition':  'python: object.getContent().memberIsOwner() and not object.getContent().accommodationIsBooked()',
-          'permission': (ModifyPortalContent,)},
+          'permission': (ModifyPortalContent,)
+          },
           {
           'id'        : 'pay_hostel_fee',
@@ -331,5 +329,14 @@
           'action'    : 'string:${object/absolute_url}/pay_hostel_fee',
           'condition':  'python: object.getContent().memberIsOwner() and not object.getContent().accommodationIsPayed()',
-          'permission': (ModifyPortalContent,)},
+          'permission': (ModifyPortalContent,)
+          },
+          {
+          'id'        : 'JAMB',
+          'name'      : '(JAMB Data)',
+          'action'    : 'string:${object/absolute_url}/JAMB',
+          'condition':  'python:object.getContent().memberIsOwner()',
+          'permission': (ModifyPortalContent,),
+          'visible': True,
+          },
           )
 }###)
