Index: WAeUP_SRP/trunk/skins/waeup_student/apply_pume_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/apply_pume_form.pt	(revision 2098)
+++ WAeUP_SRP/trunk/skins/waeup_student/apply_pume_form.pt	(revision 2100)
@@ -9,5 +9,5 @@
     <metal:block use-macro="here/main_template/macros/master">
       <metal:block fill-slot="main">
-        <h3>Apppply for the Post University Matriculation Examination! </h3>
+        <h3>Apply for the Post University Matriculation Examination! </h3>
         <br />
         <form action="" id="editForm" method="post" 
@@ -24,13 +24,13 @@
                  value="" 
             />
-            I confirm that Passport Photograph uploaded on this form is a true picture of me
+            I confirm that the Passport Photograph uploaded on this form is a true picture of me.
           </div>
           
           <input type="submit" class="standalone" 
                  name="edit"
-                 value="Edit" 
+                 value="Save" 
                  tal:condition="python: mode == 'edit'" />
           <input type="submit" class="standalone" name="apply"
-                 value="apply for Pume"
+                 value="Save & Apply for PUME"
                  tal:condition="python: mode == 'edit'"
                  />
@@ -46,5 +46,5 @@
             <li>Enter your JAMB Registration Number and the Application PIN above.</li> 
             <li>Upload your passport picture.</li> 
-            <li>Apply for Pume.</li>
+            <li>Apply for PUME.</li>
           </ul>
           <ul tal:condition="python: mode == 'view'">
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_apply_pume_edit.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_apply_pume_edit.pt	(revision 2098)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_apply_pume_edit.pt	(revision 2100)
@@ -7,9 +7,9 @@
   proceed options/proceed|nothing;
   ">
-<table width="100%" cellpadding="2" cellspacing="2" summary="Form layout"
+<table width="100%" cellpadding="2" cellspacing="2" summary="Form layout" border=1
        tal:condition="layout/rows">
   <tr tal:repeat="row layout/rows" valign="top">
-    <td tal:repeat="cell row"
-      tal:attributes="colspan cell/ncols">
+
+<span tal:repeat="cell row"> 
       <tal:block define="widget cell/widget;
                          wid widget/getWidgetId;
@@ -20,32 +20,17 @@
                          widget_css_class cell/widget_css_class|nothing;
                          css_class python:test(err, 'row error','row')">
-        <div tal:attributes="class widget_css_class;
+        <span tal:attributes="class widget_css_class;
                              id python:widget.getHtmlWidgetId()+'_widget';
                             ">
-          <div class="label" tal:condition="widget/label_edit"
-            tal:attributes="class python:test(is_required, 'label required',
-                                              'label')">
-            <label i18n:translate="" tal:condition="widget/is_i18n"
-              tal:content="widget/label_edit"
-              tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-            <label tal:condition="not:widget/is_i18n"
-              tal:content="widget/label_edit"
+                            
+          <td tal:condition="widget/label_edit">               
+          <div tal:attributes="class python:test(is_required, 'label required','label')">
+            <label tal:content="widget/label_edit"
               tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
           </div>
-          <button type="button" class="tooltipControl"
-                  tal:condition="widget/help"
-                  tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
-          <div class="field">
-            <div tal:replace="structure cell/widget_rendered"/>
-          </div>
-          <div class="tooltipArea" style="visibility: hidden;"
-               tal:condition="widget/help"
-               tal:attributes="id tooltip_id;
-                               onclick python:'showElement(false, \'%s\')' % tooltip_id;">
-            <tal:block i18n:translate="" tal:condition="widget/is_i18n"
-              tal:content="widget/help">i18_key-help_for_this_field</tal:block>
-            <tal:block tal:condition="not:widget/is_i18n"
-              tal:content="widget/help">This is the help for this field</tal:block>
-          </div>
+          </td>
+          <td>
+          <label tal:replace="structure cell/widget_rendered"/> 
+          </td>
           <tal:block condition="err">
               <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
@@ -54,8 +39,10 @@
               </tal:block>
           </tal:block>
-        </div>
+        </span>
       </tal:block>
-    </td>
+</span>      
+    
   </tr>
 </table>
-                                </metal:block>
+                                
+</metal:block>
