Index: /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py	(revision 14028)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py	(revision 14029)
@@ -310,15 +310,17 @@
         state = IWorkflowState(self.context).getState()
         # If the form is unlocked, applicants are allowed to save the form
-        actions = [[_('Save')],]
+        # and remove unused tickets.
+        actions = [[_('Save')], []]
         # Only in state started they can also add tickets.
         if state == STARTED:
-            actions = [[_('Save')], [_('Add online payment ticket'),]]
+            actions = [[_('Save')],
+                [_('Add online payment ticket')]]
         # In state paid, they can submit the data and further add tickets
         # if the application is special.
         elif self.context.special and state == PAID:
             actions = [[_('Save'), _('Finally Submit')],
-                [_('Add online payment ticket'),]]
+                [_('Add online payment ticket')]]
         elif state == PAID:
-            actions = [[_('Save'), _('Finally Submit')],]
+            actions = [[_('Save'), _('Finally Submit')], []]
         return actions
 
Index: /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicanteditpage.pt
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicanteditpage.pt	(revision 14028)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser_templates/applicanteditpage.pt	(revision 14029)
@@ -119,8 +119,7 @@
       </thead>
       <tbody>
-        <tr tal:repeat="cl context/values">
-           <td>
-            <input type="checkbox"
-      		 name="val_id"
+        <tr tal:repeat="cl context/payments">
+          <td>
+           <input type="checkbox" name="val_id"
       		 tal:attributes="value cl/__name__"
            tal:condition="python: not view.unremovable(cl)" />
@@ -130,7 +129,7 @@
           <td tal:content="python: layout.formatDatetime(cl.creation_date)">CREATION DATE</td>
           <td tal:content="python: layout.formatDatetime(cl.payment_date)">PAYMENT DATE</td>
-        <td tal:content ="cl/category">CATEGORY</td>
-        <td tal:content ="cl/display_item">ITEM</td>
-        <td tal:content ="cl/p_state_title">STATE</td>
+          <td tal:content ="cl/category">CATEGORY</td>
+          <td tal:content ="cl/display_item">ITEM</td>
+          <td tal:content ="cl/p_state_title">STATE</td>
         </tr>
       </tbody>
