diff --git a/site/views/customers/receipt.ctp b/site/views/customers/receipt.ctp
index 7222fc6..fcd4d21 100644
--- a/site/views/customers/receipt.ctp
+++ b/site/views/customers/receipt.ctp
@@ -170,49 +170,38 @@ function addPaymentSource(flash) {
 	 ?>
 	 '</DIV>' +
 
-	 '<TABLE ID="payment-table-%{id}">' +
-	 '<TR ID="payment-amount-div-%{id}">' +
-	 ' <TD>Amount</TD>' +
-	 ' <TD>' +
-	 '  <SPAN CLASS="input text required">' +
-	 '   <INPUT TYPE="text" SIZE="20"' +
-	 '    NAME="data[Entry][%{id}][amount]"' +
-	 '    ID="payment-amount-%{id}" />' +
-	 '  </SPAN>' +
-	 ' </TD>' +
-	 '</TR>' +
+	 '<DIV ID="payment-amount-div-%{id}" CLASS="input text required">' +
+	 ' <LABEL FOR="payment-amount-%{id}">Amount</LABEL>' +
+	 ' <INPUT TYPE="text" SIZE="20"' +
+	 '  NAME="data[Entry][%{id}][amount]"' +
+	 '  ID="payment-amount-%{id}" />' +
+	 '</DIV>' +
 
 	 <?php
 	 foreach ($paymentTypes AS $type) {
 	   $type = $type['TenderType'];
+	   $div  = '<DIV';
+	   $div .= ' ID="payment-type-div-%{id}-'.$type['id'].'"';
+	   $div .= ' CLASS="payment-type-div-%{id}"';
+	   if ($type['id'] != $defaultType)
+	     $div .= ' STYLE="display:none;"';
+	   $div .= '>';
 
 	   for ($i=1; $i<=4; ++$i) {
 	     if (!empty($type["data{$i}_name"])) {
-	       $div  = '<TR';
-	       $div .= ' ID="payment-type-div-%{id}-'.$type['id'].'"';
-	       $div .= ' CLASS="payment-type-div-%{id}"';
-	       if ($type['id'] != $defaultType)
-		 $div .= ' STYLE="display:none;"';
-	       $div .= '>';
-
-	       $div .= ' <TD>'.$type["data{$i}_name"].'</TD>';
-	       $div .= ' <TD>';
-	       $div .= '  <SPAN CLASS="input text required">';
-	       $div .= '   <INPUT TYPE="text" SIZE="20"';
-	       $div .= '    NAME="data[Entry][%{id}][type]['.$type['id'].'][data'.$i.']"';
-	       $div .= '    ID="payment-data'.$i.'-%{id}" />';
-	       $div .= '  </SPAN>';
-	       $div .= ' </TD>';
-	       
-	       $div .= '</TR>';
+	       $div .= '<DIV CLASS="input text required">';
+	       $div .= ' <LABEL FOR="payment-data'.$i.'-%{id}">'.$type["data{$i}_name"].'</LABEL>';
+	       $div .= ' <INPUT TYPE="text" SIZE="20" NAME="data[Entry][%{id}][type]['.$type['id'].'][data'.$i.']"';
+	       $div .= '  ID="payment-data'.$i.'-%{id}" />';
+	       $div .= '</DIV>';
 	     }
 	   }
 
+	   $div .= '</DIV>';
 	   echo "'$div' +\n";
 	 }
 	 ?>
 
-	 '</TABLE>' +
 	 '</FIELDSET>'
 	 );
   }