diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl
index 9d9a6c706f..977b4de152 100644
--- a/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/npl/en/opac-account.tmpl
@@ -11,31 +11,33 @@
 <!-- /TMPL_LOOP -->
 
 <!-- TMPL_IF NAME="ACCOUNT_LINES" -->
-<div class="table"><table>
-<caption><h3>Fines and Charges</h3></caption>
+<table>
+<caption>Fines and Charges</caption>
+<thead>
 <tr><th>Date</th>
 <th>Description</th>
 <th>Fine Amount</th>
 <th>Amount Outstanding</th>
 </tr>
+</thead>
 
+<tfoot><tr>
+<th colspan="3">Total Due</th>
+<td class="sum">$<!-- TMPL_VAR NAME="total" --></td>
+</tr></tfoot>
 
+<tbody>
 <!-- TMPL_LOOP NAME="ACCOUNT_LINES" -->
-<tr>
+<!-- TMPL_IF NAME="odd" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 <td><!-- TMPL_VAR NAME="date" --></td>
 <td><!-- TMPL_VAR NAME="description" -->
 <!-- TMPL_IF NAME="print_title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
-<td>$<!-- TMPL_VAR NAME="amount" --></td>
-<td>$<!-- TMPL_VAR NAME="amountoutstanding" --></td></tr>
+<!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amount" --></td>
+<!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amountoutstanding" --></td></tr>
 <!-- /TMPL_LOOP -->
+</tbody>
 
-<tr>
-<td>&nbsp;</td>
-<td>&nbsp;</td>
-<td><span class="label">Total Due</span></td>
-<td><span class="label">$<!-- TMPL_VAR NAME="total" --></span></td>
-</tr>
-</table></div>
+</table>
 <!-- TMPL_ELSE --><h4>You have no Fines or Charges</h4><!-- /TMPL_IF -->
 </div>