diff --git a/views/customers/payment.ctp b/views/customers/payment.ctp
index def1d22..b3c2b88 100644
--- a/views/customers/payment.ctp
+++ b/views/customers/payment.ctp
@@ -86,7 +86,12 @@ echo $form->create(null, array('id' => 'payment-form', 'action' => 'payment'));
       // $.ajax options can be used here too, for example: 
       //timeout:   3000 
       }; 
- 
+
+    // Get a clean slate for our payments
+    $('#payments').html('');
+    $('#payment-id').val(1);
+    addPaymentSource(false);
+
     // bind form using 'ajaxForm' 
     $('#payment-form').ajaxForm(options); 
     }); 
@@ -146,12 +151,11 @@ echo $form->create(null, array('id' => 'payment-form', 'action' => 'payment'));
 	   ?>
 	   '</DIV>' +
 
-	   '<DIV ID="payment-amount-div-%{id}" CLASS="input text required">'
-	   + (
-	      '<LABEL FOR="payment-amount-%{id}">Amount</LABEL>' +
-	      '<INPUT TYPE="text" SIZE="20" NAME="data[Customer][payment][%{id}][amount]"' +
-	      ' ID="payment-amount-%{id}" />' +
-	      '' ) +
+	   '<DIV ID="payment-amount-div-%{id}" CLASS="input text required">' +
+	   ' <LABEL FOR="payment-amount-%{id}">Amount</LABEL>' +
+	   ' <INPUT TYPE="text" SIZE="20"' +
+	   '  NAME="data[Customer][payment][%{id}][amount]"' +
+	   '  ID="payment-amount-%{id}" />' +
 	   '</DIV>' +
 
 	   <?php
@@ -168,11 +172,6 @@ echo $form->create(null, array('id' => 'payment-form', 'action' => 'payment'));
 	   }
 	   ?>
 
-/* 	   '<DIV ID="payment-check-div-%{id}"      CLASS="payment-type-div-%{id}" style="display:none;"></DIV>' + */
-/* 	   '<DIV ID="payment-moneyorder-div-%{id}" CLASS="payment-type-div-%{id}" style="display:none;"></DIV>' + */
-/* 	   '<DIV ID="payment-ach-div-%{id}"        CLASS="payment-type-div-%{id}" style="display:none;"></DIV>' + */
-/* 	   '<DIV ID="payment-creditcard-div-%{id}" CLASS="payment-type-div-%{id}" style="display:none;"></DIV>' + */
-
 	   '</FIELDSET>'
 	   );
 
@@ -269,8 +268,6 @@ function switchPaymentType(paymentid, type) {
 echo '<div type="text" id="datepicker"></div>' . "\n";
 echo $form->end('Send');
 
-echo '<div type="text" id="datepicker"></div>' . "\n";
-
 ?>
 <a href="#" onClick="$('#debug').html(''); return false;">Clear Debug Output</a>
 <div id="debug"></div>
@@ -281,9 +278,6 @@ echo '<div type="text" id="datepicker"></div>' . "\n";
   <script type="text/javascript">
 
   $(document).ready(function(){
-      $('#payments').html('');
-      $('#payment-id').val(1);
-      addPaymentSource(false);
       $("#datepicker").datepicker();
   });
   </script>