Index: /WAeUP_SRP/trunk/profiles/default/vocabularies/scratch_card_search_mode.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/vocabularies/scratch_card_search_mode.xml	(revision 1060)
+++ /WAeUP_SRP/trunk/profiles/default/vocabularies/scratch_card_search_mode.xml	(revision 1061)
@@ -7,4 +7,4 @@
  <item key="student" msgid="">used by Student with ID (JAMBRegNo for APP SCs)</item>
  <item key="pin" msgid="">with PIN</item>
- <item key="serial" msgid="">with PIN</item>
+ <item key="serial" msgid="">with Serial No</item>
 </object>
Index: /WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt	(revision 1060)
+++ /WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt	(revision 1061)
@@ -45,5 +45,5 @@
               layout_id='student_clearance_fe')" 
               />
-              
+        <span tal:condition="not:context/isStudent">   
               <br /><br />
               <table  width=100%>
@@ -58,6 +58,6 @@
               <td width=50%>Student</td><td>Clearance Officer</td>
               </tr>
-              </table>              
-              
+              </table>
+         </span>              
               
       </span>
Index: /WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt	(revision 1060)
+++ /WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt	(revision 1061)
@@ -9,4 +9,7 @@
     <span tal:repeat="row layout/rows">
         <span tal:repeat="cell row">
+          <span tal:condition="python:cell['widget_rendered'] 
+                               and not cell['widget_rendered'] in ('None','-',)
+                               or cell['widget_id'] == 'birth_certificate'">
           <span tal:define="widget cell/widget"
                 tal:condition="python:cell['widget_id'] not in fields_not_displayed">
@@ -32,10 +35,11 @@
             </tal:block>              
             <td valign="top">
-             <div class="ddescription" tal:condition="cell" tal:content="structure cell/widget_rendered"></div>
+             <div class="ddescription" tal:condition="cell/widget_rendered" tal:content="structure cell/widget_rendered"></div>
              <div class="ddescription" tal:condition="not:cell/widget_rendered"> none </div>
               </td>
             </tr>
-          </div>
-        </span>
+            </div>
+          </span>
+          </span>
       </span>
     </span>
