diff --git a/site/views/customers/payment.ctp b/site/views/customers/payment.ctp
index 5b0fb43..def1d22 100644
--- a/site/views/customers/payment.ctp
+++ b/site/views/customers/payment.ctp
@@ -127,36 +127,23 @@ echo $form->create(null, array('id' => 'payment-form', 'action' => 'payment'));
 	   '<FIELDSET CLASS="payment subset">' +
 	   '<LEGEND>Payment #%{id} (%{remove})</LEGEND>' +
 
-	   '<DIV ID="payment-type-div-%{id}">'
-	   + (
-	      '<DIV>'
-	      + (
-		 '<INPUT TYPE="radio" NAME="data[Customer][payment][%{id}][type]"' +
-		 ' ONCLICK="switchPaymentType(%{id}, ' + "'cash'" + ')"' +
-		 ' CLASS="payment-type payment-type-%{id}" ID="payment-type-cash-%{id}" VALUE="cash" CHECKED />' +
-		 '<LABEL FOR="payment-type-cash-%{id}">Cash</LABEL>' +
-		 '' ) +
-	      '</DIV>' +
+	   '<DIV ID="payment-type-div-%{id}">' +
+	   <?php
+	   $types = array();
+	   foreach(array('Cash', 'Check', 'Money Order', /*'ACH', 'Credit Card'*/) AS $name)
+	     $types[preg_replace("/ /", "", strtolower($name))] = $name;
 
-	      '<DIV>'
-	      + (
-		 '<INPUT TYPE="radio" NAME="data[Customer][payment][%{id}][type]"' +
-		 ' ONCLICK="switchPaymentType(%{id}, ' + "'check'" + ')"' +
-		 ' CLASS="payment-type payment-type-%{id}" ID="payment-type-check-%{id}" VALUE="check" />' +
-		 '<LABEL FOR="payment-type-check-%{id}">Check</LABEL>' +
-		 '' ) +
-	      '</DIV>' +
-
-	      '<DIV>'
-	      + (
-		 '<INPUT TYPE="radio" NAME="data[Customer][payment][%{id}][type]"' +
-		 ' ONCLICK="switchPaymentType(%{id}, ' + "'moneyorder'" + ')"' +
-		 ' CLASS="payment-type payment-type-%{id}" ID="payment-type-moneyorder-%{id}" VALUE="moneyorder" />' +
-		 '<LABEL FOR="payment-type-moneyorder-%{id}">Money Order</LABEL>' +
-		 '' ) +
-	      '</DIV>' +
-
-	      '' ) +
+	   foreach ($types AS $type => $name) {
+	     $div  = '<DIV>';
+	     $div .= '<INPUT TYPE="radio" NAME="data[Customer][payment][%{id}][type]"';
+	     $div .= ' ONCLICK="switchPaymentType(%{id}, \\\''.$type.'\\\')"';
+	     $div .= ' CLASS="payment-type-%{id}" ID="payment-type-'.$type.'-%{id}"';
+	     $div .= ' VALUE="'.$type.'" ' . ($type == 'cash' ? 'CHECKED ' : '') . '/>';
+	     $div .= ' <LABEL FOR="payment-type-'.$type.'-%{id}">'.$name.'</LABEL>';
+	     $div .= '</DIV>';
+	     echo "'$div' +\n";
+	   }
+	   ?>
 	   '</DIV>' +
 
 	   '<DIV ID="payment-amount-div-%{id}" CLASS="input text required">'
@@ -167,121 +154,26 @@ echo $form->create(null, array('id' => 'payment-form', 'action' => 'payment'));
 	      '' ) +
 	   '</DIV>' +
 
-	   '<DIV ID="payment-check-div-%{id}" CLASS="payment-type-div-%{id}" style="display:none;">'
-	   + (
-/* 	      '<DIV CLASS="input text required">' */
-/* 	      + ( */
-/* 		 '<LABEL FOR="payment-check-number-%{id}">Check Number</LABEL>' + */
-/* 		 '<INPUT TYPE="text" SIZE="6" NAME="data[Customer][payment][%{id}][check][number]"' + */
-/* 		 ' ID="payment-check-number-%{id}" />' + */
-/* 		 '' ) + */
-/* 	      '</DIV>' + */
-	      '' ) +
-	   '</DIV>' +
+	   <?php
+	   foreach ($types AS $type => $name) {
+	     if ($type == 'cash')
+	       continue;
 
-	   '<DIV ID="payment-moneyorder-div-%{id}" CLASS="payment-type-div-%{id}" style="display:none;">'
-	   + (
-/* 	      '<DIV CLASS="input text required">' */
-/* 	      + ( */
-/* 		 '<LABEL FOR="payment-moneyorder-number-%{id}">Money Order Number</LABEL>' + */
-/* 		 '<INPUT TYPE="text" SIZE="6" NAME="data[Customer][payment][%{id}][moneyorder][number]"' + */
-/* 		 ' ID="payment-moneyorder-number-%{id}" />' + */
-/* 		 '' ) + */
-/* 	      '</DIV>' + */
-	      '' ) +
-	   '</DIV>' +
+	     $div  = '<DIV';
+	     $div .= ' ID="payment-'.$type.'-div-%{id}"';
+	     $div .= ' CLASS="payment-type-div-%{id}"';
+	     $div .= ' STYLE="display:none;">';
+	     $div .= '</DIV>';
+	     echo "'$div' +\n";
+	   }
+	   ?>
 
-	   '<DIV ID="payment-ach-div-%{id}" CLASS="payment-type-div-%{id}" style="display:none;">'
-	   + (
-/* 	      '<DIV CLASS="input text required">' */
-/* 	      + ( */
-/* 		 '<LABEL FOR="payment-ach-routing-%{id}">Routing Number</LABEL>' + */
-/* 		 '<INPUT TYPE="text" SIZE="9" NAME="data[Customer][payment][%{id}][ach][routing]"' + */
-/* 		 ' ID="payment-ach-routing-%{id}" />' + */
-/* 		 '' ) + */
-/* 	      '</DIV>' + */
+/* 	   '<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>' + */
 
-/* 	      '<DIV CLASS="input text required">' */
-/* 	      + ( */
-/* 		 '<LABEL FOR="payment-ach-account-%{id}">Account Number</LABEL>' + */
-/* 		 '<INPUT TYPE="text" SIZE="17" NAME="data[Customer][payment][%{id}][ach][account]"' + */
-/* 		 ' ID="payment-ach-account-%{id}" />' + */
-/* 		 '' ) + */
-/* 	      '</DIV>' + */
-	      '' ) +
-	   '</DIV>' +
-
-	   '<DIV ID="payment-creditcard-div-%{id}" CLASS="payment-type-div-%{id}" style="display:none;">'
-	   + (
-/* 	      '<DIV CLASS="input text required">' */
-/* 	      + ( */
-/* 		 '<LABEL FOR="payment-creditcard-account-%{id}">Account Number</LABEL>' + */
-/* 		 '<INPUT TYPE="text" SIZE="16" NAME="data[Customer][payment][%{id}][creditcard][account]"' + */
-/* 		 ' ID="payment-creditcard-account-%{id}" />' + */
-/* 		 '' ) + */
-/* 	      '</DIV>' + */
-
-/* 	      '<DIV CLASS="input text required">' */
-/* 	      + ( */
-/* 		 '<LABEL FOR="payment-creditcard-expiration-%{id}">Expiration Date</LABEL>' + */
-/* 		 '<INPUT TYPE="text" SIZE="10" NAME="data[Customer][payment][%{id}][creditcard][expiration]"' + */
-/* 		 ' ID="payment-creditcard-expiration-%{id}" />' + */
-/* 		 '' ) + */
-/* 	      '</DIV>' + */
-
-/* 	      '<DIV CLASS="input text required">' */
-/* 	      + ( */
-/* 		 '<LABEL FOR="payment-creditcard-cvv2-%{id}">CVV2 Code</LABEL>' + */
-/* 		 '<INPUT TYPE="text" SIZE="10" NAME="data[Customer][payment][%{id}][creditcard][cvv2]"' + */
-/* 		 ' ID="payment-creditcard-cvv2-%{id}" />' + */
-/* 		 '' ) + */
-/* 	      '</DIV>' + */
-	      '' ) +
-	   '</DIV>' +
-
-	   '</FIELDSET>',
-
-	   // Javascript section
-/* 	   '$("#payment-type-cash-%{id}").click(function () {' + */
-/* 	   ' $("#payment-check-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-moneyorder-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-ach-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-creditcard-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-cash-div-%{id}").slideDown();' + */
-/* 	   '});' + */
-
-/* 	   '$("#payment-type-check-%{id}").click(function () {' + */
-/* 	   ' $("#payment-cash-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-moneyorder-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-ach-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-creditcard-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-check-div-%{id}").slideDown();' + */
-/* 	   '});' + */
-
-/* 	   '$("#payment-type-moneyorder-%{id}").click(function () {' + */
-/* 	   ' $("#payment-cash-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-check-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-ach-div-%{id}").slideUp();' + */
-/* 	   ' $("#payment-creditcard-div-%{id}").slideUp();' + */
-
-/* 	   ' $("#payment-moneyorder-div-%{id}").html(\'' + */
-/* 	   '   <DIV CLASS="input text required">' + */
-/* 	   '   <LABEL FOR="payment-moneyorder-number-%{id}">Money Order Number</LABEL>' + */
-/* 	   '   <INPUT TYPE="text" SIZE="6" NAME="data[Customer][payment][%{id}][moneyorder][number]"' + */
-/* 	   '    ID="payment-moneyorder-number-%{id}" />' + */
-/* 	   '   </DIV>\');' + */
-/* 	   ' $("#payment-moneyorder-div-%{id}").slideDown();' + */
-/* 	   '});' + */
-
-/* 	   '$(".payment-type-%{id}").click(function () {' + */
-/* 	   '  switchPaymentType(%{id}, this);' + */
-/* 	   '});' + */
-
-/* 	   '$(".payment-type-%{id}").click(function () {' + */
-/* 	   'alert("hello");' + */
-/* 	   '});' + */
-
-	   ''
+	   '</FIELDSET>'
 	   );
 
 	   
@@ -291,14 +183,13 @@ function switchPaymentType(paymentid, type) {
   $(".payment-type-div-"+paymentid).slideUp();
   $(".payment-type-div-"+paymentid).html('');
 
-  html = ''; // '<DIV ID="payment-'+type+'-div-'+paymentid+'">'; // STYLE="display:inline;"
   switch(type)
     {
     case 'cash':
       break;
 
     case 'check':
-      html +=
+      html =
 	'<DIV CLASS="input text required">' +
 	' <LABEL FOR="payment-check-number-'+paymentid+'">Check Number</LABEL>' +
 	' <INPUT TYPE="text" SIZE="6" NAME="data[Customer][payment]['+paymentid+'][check][number]"' +
@@ -307,7 +198,7 @@ function switchPaymentType(paymentid, type) {
       break;
 
     case 'moneyorder':
-      html +=
+      html =
 	'<DIV CLASS="input text required">' +
 	' <LABEL FOR="payment-moneyorder-number-'+paymentid+'">Money Order Number</LABEL>' +
 	' <INPUT TYPE="text" SIZE="6" NAME="data[Customer][payment]['+paymentid+'][moneyorder][number]"' +
@@ -316,7 +207,7 @@ function switchPaymentType(paymentid, type) {
       break;
 
     case 'ach':
-      html +=
+      html =
 	'<DIV CLASS="input text required">' +
 	' <LABEL FOR="payment-ach-routing-'+paymentid+'">Routing Number</LABEL>' +
 	' <INPUT TYPE="text" SIZE="9" NAME="data[Customer][payment]['+paymentid+'][ach][routing]"' +
@@ -331,29 +222,30 @@ function switchPaymentType(paymentid, type) {
       break;
 
     case 'creditcard':
-      html +=
+      html =
 	'<DIV CLASS="input text required">' +
 	' <LABEL FOR="payment-creditcard-account-'+paymentid+'">Account Number</LABEL>' +
 	' <INPUT TYPE="text" SIZE="16" NAME="data[Customer][payment]['+paymentid+'][creditcard][account]"' +
 	'  ID="payment-creditcard-account-'+paymentid+'" />' +
 	'</DIV>' +
 
-	'<DIV CLASS="input text required">'
+	'<DIV CLASS="input text required">' +
 	' <LABEL FOR="payment-creditcard-expiration-'+paymentid+'">Expiration Date</LABEL>' +
 	' <INPUT TYPE="text" SIZE="10" NAME="data[Customer][payment]['+paymentid+'][creditcard][expiration]"' +
 	'  ID="payment-creditcard-expiration-'+paymentid+'" />' +
 	' </DIV>' +
 
-	'<DIV CLASS="input text required">'
+	'<DIV CLASS="input text required">' +
 	' <LABEL FOR="payment-creditcard-cvv2-'+paymentid+'">CVV2 Code</LABEL>' +
 	' <INPUT TYPE="text" SIZE="10" NAME="data[Customer][payment]['+paymentid+'][creditcard][cvv2]"' +
 	'  ID="payment-creditcard-cvv2-'+paymentid+'" />' +
 	'</DIV>';
+      break;
 
     default:
+      html = '<DIV><H2>INVALID TYPE ('+type+')</H2></DIV>';
       break;
     }
-  //html += '</DIV>';
 
   $("#payment-"+type+"-div-"+paymentid).html(html);
   $("#payment-"+type+"-div-"+paymentid).slideDown();
@@ -363,12 +255,12 @@ function switchPaymentType(paymentid, type) {
   --></script>
 
 <fieldset CLASS="payment superset">
-<legend>Payments</legend>
-<input type="hidden" id="payment-id" value="1">
-<div id="payments"></div>
-<fieldset> <legend>
- <a href="#" onClick="addPaymentSource(true); return false;">Add Another Payment</a>
-</legend> </fieldset>
+ <legend>Payments</legend>
+ <input type="hidden" id="payment-id" value="1">
+ <div id="payments"></div>
+  <fieldset> <legend>
+   <a href="#" onClick="addPaymentSource(true); return false;">Add Another Payment</a>
+  </legend> </fieldset>
 </fieldset>
 
 <?php
@@ -393,14 +285,9 @@ echo '<div type="text" id="datepicker"></div>' . "\n";
       $('#payment-id').val(1);
       addPaymentSource(false);
       $("#datepicker").datepicker();
-      //$("#debug").html(htmlEncode($("#datepicker").html()));
   });
   </script>
 
-<!--
-<div class="ui-datepicker-inline ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"><div class="ui-datepicker-header ui-widget-header ui-helper-clearfix ui-corner-all"><a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery.datepicker._adjustDate('#datepicker', -1, 'M');" title="Prev"><span class="ui-icon ui-icon-circle-triangle-w">Prev</span></a><a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery.datepicker._adjustDate('#datepicker', +1, 'M');" title="Next"><span class="ui-icon ui-icon-circle-triangle-e">Next</span></a><div class="ui-datepicker-title"><span class="ui-datepicker-month">June</span> <span class="ui-datepicker-year">2009</span></div></div><table class="ui-datepicker-calendar"><thead><tr><th class="ui-datepicker-week-end"><span title="Sunday">Su</span></th><th><span title="Monday">Mo</span></th><th><span title="Tuesday">Tu</span></th><th><span title="Wednesday">We</span></th><th><span title="Thursday">Th</span></th><th><span title="Friday">Fr</span></th><th class="ui-datepicker-week-end"><span title="Saturday">Sa</span></th></tr></thead><tbody><tr><td class="ui-datepicker-week-end ui-datepicker-other-month ui-datepicker-unselectable ui-state-disabled"> </td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">1</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">2</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">3</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">4</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">5</a></td><td class="ui-datepicker-week-end" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">6</a></td></tr><tr><td class="ui-datepicker-week-end" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">7</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">8</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">9</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">10</a></td><td class="ui-datepicker-days-cell-over ui-datepicker-current-day ui-datepicker-today" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default ui-state-highlight ui-state-active ui-state-hover" href="#">11</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">12</a></td><td class="ui-datepicker-week-end" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">13</a></td></tr><tr><td class="ui-datepicker-week-end" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">14</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">15</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">16</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">17</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">18</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">19</a></td><td class="ui-datepicker-week-end" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">20</a></td></tr><tr><td class="ui-datepicker-week-end" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">21</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">22</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">23</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">24</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">25</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">26</a></td><td class="ui-datepicker-week-end" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">27</a></td></tr><tr><td class="ui-datepicker-week-end" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">28</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">29</a></td><td class="" onclick="DP_jQuery.datepicker._selectDay('#datepicker',5,2009, this);return false;"><a class="ui-state-default" href="#">30</a></td><td class="ui-datepicker-other-month ui-datepicker-unselectable ui-state-disabled"> </td><td class="ui-datepicker-other-month ui-datepicker-unselectable ui-state-disabled"> </td><td class="ui-datepicker-other-month ui-datepicker-unselectable ui-state-disabled"> </td><td class="ui-datepicker-week-end ui-datepicker-other-month ui-datepicker-unselectable ui-state-disabled"> </td></tr></tbody></table></div>
--->
-
 </div>
 
 
diff --git a/site/webroot/js/pmgr.js b/site/webroot/js/pmgr.js
index d45892d..4586006 100644
--- a/site/webroot/js/pmgr.js
+++ b/site/webroot/js/pmgr.js
@@ -92,7 +92,7 @@ function addDiv(id_name, div_name, into_div_name, flash, html, script) {
 	             ("$2" == "" ? "$2" : 'remove') + '</A>' + '</SPAN>') +
 	    '</DIV>';
 
-    if (script != "") {
+    if (script) {
 	    html += '<SCRIPT TYPE="text/javascript">';
 	    html += script.replace(/%{id}/g, id);
 	    html += '</SCRIPT>';