Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_options.elm.tpl
===================================================================
diff -u -r14274 -r14857
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_options.elm.tpl	(.../shipping_options.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_options.elm.tpl	(.../shipping_options.elm.tpl)	(revision 14857)
@@ -2,6 +2,52 @@
 	<option <inp2:m_param name="selected"/> value="<inp2:m_param name="ShippingId"/>"><inp2:m_param name="ShippingName"/> (<inp2:m_if check="m_param" name="ShippingFree" value="1"><inp2:m_Phrase label="lu_comm_FreeShipping" /><inp2:m_else/><inp2:m_param name="TotalCost"/></inp2:m_if>)</option>
 </inp2:m_DefineElement>
 
+<inp2:m_include template="in-commerce/elements/options_blocks.elm"/>
+
+<inp2:m_DefineElement name="shipping_group_item">
+	<inp2:Field name="ProductName"/><inp2:m_if check="ord_BackorderFlag"> <span class="backordered-product"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if><br />
+
+	<inp2:m_if check="HasOptions">
+		<br/>
+		<span style="font-size: 8pt">
+			<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
+				<inp2:PrintOptions render_as="option_element" currency="selected"/>
+			<inp2:m_else/> <!-- listed combinations -->
+				<inp2:PrintOptions render_as="option_element_no_price"/>
+			</inp2:m_if>
+			<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0"> <!-- selectable options -->
+				<a href="<inp2:m_link template="__default__" pass="m,p,orditems"/>"><inp2:m_Phrase label="lu_comm_edit_options"/></a><br />
+			</inp2:m_if>
+		</span>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="order_shipment">
+	<tr class="cart-item">
+		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="shipment"/><br/>
+			<b><inp2:m_Phrase label="lu_Items"/>:</b><br />
+			<inp2:ord_PrintCart item_render_as="shipping_group_item" requery="1" package_num="$package_num" product_type="1"/>
+		</td>
+		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="items"/></td>
+		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="weight"/></td>
+		<td class="shopping-cart-cell-item-padding">
+			<select class="input-select" name="<inp2:m_param name="field_name"/>">
+				<inp2:ord_PrintShippingTypes render_as="order_shipping_type" currency="selected"/>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="4">
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="no_shipments">
+	<div class="field-error"><inp2:m_Recall name="usps_errors"/></div>
+	<inp2:m_Phrase label="lu_comm_ErrorNoShippingTypes"/> (<a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a>).
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="shippings_table_header">
 	<table width="100%">
 		<tr>
@@ -58,6 +104,58 @@
 		</inp2:m_if>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="products_total">
+	<tr class="cart-subtotal">
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td style="text-align: right">
+			<strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong>
+		</td>
+		<td>
+			<inp2:ord_Field name="SubTotal" currency="selected"/>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="processing_total">
+	<tr class="cart-subtotal">
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td style="text-align: right">
+			<strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>:</strong>
+		</td>
+		<td>
+			<inp2:ord_Field name="ProcessingFee" currency="selected"/>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="sub_total">
+	<tr>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td align="right" class="shopping-cart-cell-item-padding">
+			<strong><inp2:m_Phrase label="lu_comm_SubTotal"/>:</strong>
+		</td>
+		<td class="shopping-cart-cell-item-padding">
+			<span class="price1"><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></span>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="vat_total">
+	<tr>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td class="shopping-cart-cell-item-padding" align="right">
+			<strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%:</strong>
+		</td>
+		<td class="shopping-cart-cell-item-padding">
+			<span class="price1"><inp2:ord_Field name="VAT" currency="selected"/></span>
+		</td>
+	</tr>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="shippings_table_footer">
 		<tr>
 			<td class="shopping-cart-cell-item-padding">
@@ -83,64 +181,8 @@
 			</td>
 		</tr>
 
-		<inp2:m_DefineElement name="products_total">
-			<tr class="cart-subtotal">
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td style="text-align: right">
-					<strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong>
-				</td>
-				<td>
-					<inp2:ord_Field name="SubTotal" currency="selected"/>
-				</td>
-			</tr>
-		</inp2:m_DefineElement>
+		<inp2:ord_PrintTotals products_render_as="products_total" processing_render_as="processing_total" sub_total_render_as="sub_total" vat_render_as="vat_total"/>
 
-		<inp2:m_DefineElement name="processing_total">
-			<tr class="cart-subtotal">
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td style="text-align: right">
-					<strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>:</strong>
-				</td>
-				<td>
-					<inp2:ord_Field name="ProcessingFee" currency="selected"/>
-				</td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="sub_total">
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td align="right" class="shopping-cart-cell-item-padding">
-					<strong><inp2:m_Phrase label="lu_comm_SubTotal"/>:</strong>
-				</td>
-				<td class="shopping-cart-cell-item-padding">
-					<span class="price1"><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></span>
-				</td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:m_DefineElement name="vat_total">
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="shopping-cart-cell-item-padding" align="right">
-					<strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%:</strong>
-				</td>
-				<td class="shopping-cart-cell-item-padding">
-					<span class="price1"><inp2:ord_Field name="VAT" currency="selected"/></span>
-				</td>
-			</tr>
-		</inp2:m_DefineElement>
-
-		<inp2:ord_PrintTotals
-			products_render_as="products_total"
-			processing_render_as="processing_total"
-			sub_total_render_as="sub_total"
-			vat_render_as="vat_total"/>
-
 		<inp2:m_if check="ord_Field" name="GiftCertificateId">
 			<tr>
 				<td>&nbsp;</td>
@@ -174,63 +216,17 @@
 				<input type="submit" name="events[ord][OnProceedToBilling]" value="<inp2:m_Phrase label="lu_comm_ProceedToBilling" no_editing="1"/>" class="button">
 			</td>
 		</tr>
-
 	</table>
 </inp2:m_DefineElement>
 
-<inp2:m_include template="in-commerce/elements/options_blocks.elm"/>
-
-<inp2:m_DefineElement name="shipping_group_item">
-	<inp2:Field name="Name"/><inp2:m_if check="ord_BackorderFlag"> <span class="backordered-product"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if><br />
-	<inp2:m_if check="HasOptions">
-		<br/>
-		<span style="font-size: 8pt">
-		<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
-			<inp2:PrintOptions render_as="option_element" currency="selected"/>
-		<inp2:m_else/> <!-- listed combinations -->
-			<inp2:PrintOptions render_as="option_element_no_price"/>
-		</inp2:m_if>
-		<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0"> <!-- selectable options -->
-			<a href="<inp2:m_link template="__default__" pass="m,p,orditems"/>"><inp2:m_Phrase label="lu_comm_edit_options"/></a><br />
-		</inp2:m_if>
-		</span>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_shipment">
-	<tr class="cart-item">
-		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="shipment"/><br/>
-			<b><inp2:m_Phrase label="lu_Items"/>:</b><br />
-			<inp2:ord_PrintCart item_render_as="shipping_group_item" requery="1" package_num="$package_num" product_type="1" header_render_as="html:" footer_render_as="html:"/>
-		</td>
-		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="items"/></td>
-		<td class="shopping-cart-cell-item-padding"><inp2:m_param name="weight"/></td>
-		<td class="shopping-cart-cell-item-padding">
-			<select class="input-select" name="<inp2:m_param name="field_name"/>">
-				<inp2:ord_PrintShippingTypes render_as="order_shipping_type" currency="selected" />
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="4">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="no_shipments">
-	<div class="field-error"><inp2:m_Recall name="usps_errors"/></div>
-	<inp2:m_Phrase label="lu_comm_ErrorNoShippingTypes"/> (<a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a>).
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="invalid_address">
-	<inp2:m_Phrase label="lu_comm_ErrorInvalidShippingAddress"/>.
-</inp2:m_DefineElement>
-
 <inp2:m_RenderElement design="content_box">
 	<inp2:m_Capture to_var="header">
 		<inp2:m_Phrase label="lu_title_ShippingOptions"/>
 	</inp2:m_Capture>
 
-	<inp2:ord_PrintShippings render_as="order_shipment" currency="selected" no_shipments_render_as="no_shipments" invalid_address_render_as="invalid_address" table_header_render_as="shippings_table_header" table_footer_render_as="shippings_table_footer" />
+	<inp2:m_if check="ord_AddressValid" type="shipping">
+			<inp2:ord_PrintShippings render_as="order_shipment" currency="selected" no_shipments_render_as="no_shipments" table_header_render_as="shippings_table_header" table_footer_render_as="shippings_table_footer"/>
+	<inp2:m_else/>
+		<inp2:m_Phrase label="lu_comm_ErrorInvalidShippingAddress"/>.
+	</inp2:m_if>
 </inp2:m_RenderElement>
\ No newline at end of file
Index: branches/1.2.x/in-commerce/checkout/shop_cart.tpl
===================================================================
diff -u -r14274 -r14857
--- branches/1.2.x/in-commerce/checkout/shop_cart.tpl	(.../shop_cart.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/checkout/shop_cart.tpl	(.../shop_cart.tpl)	(revision 14857)
@@ -101,7 +101,7 @@
 										<td>
 											<inp2:m_if check="FieldEquals" field="Virtual" value="0">
 												<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a>
-												<inp2:m_if check="ord_FreePromoShippingAvailable">&nbsp;<sup><inp2:m_phrase label="lu_cart_FreeShippingAvailable" /></sup>
+												<inp2:m_if check="FreePromoShippingAvailable">&nbsp;<sup><inp2:m_phrase label="lu_cart_FreeShippingAvailable" /></sup>
 												</inp2:m_if>
 											<inp2:m_else/>
 												<inp2:Field name="Name" />
Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl
===================================================================
diff -u -r14274 -r14857
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl	(.../shipping_address.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/shipping_address.elm.tpl	(.../shipping_address.elm.tpl)	(revision 14857)
@@ -31,7 +31,7 @@
 			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingZip" title="lu_fld_Zip"/>
 			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingCountry" title="lu_fld_Country"/>
 			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingPhone" title="lu_fld_Phone"/>
-			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="ShippingEmail" title="lu_fld_Email" is_last="1"/>
+			<inp2:m_RenderElement name="inp_edit_label" prefix="ord" field="BillingEmail" title="lu_fld_Email" is_last="1"/>
 		<inp2:m_else/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="lu_fld_FullName" style="width: 300px;" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="lu_fld_Company" style="width: 300px;" />
@@ -42,7 +42,7 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" style="width: 100px;" />
 			<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" style="width: 300px;" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingPhone" title="lu_fld_Phone" style="width: 150px;" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_Email" style="width: 150px;" is_last="1"/>
 		</inp2:m_if>
 
 		<inp2:m_RenderElement design="inp_edit_buttons" width="200">
Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
===================================================================
diff -u -r14274 -r14857
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 14857)
@@ -64,10 +64,43 @@
 		<!-- // credit card CVV2 -->
 
 		<inp2:m_RenderElement design="inp_edit_buttons">
-			<input type="hidden" name="check_credit_card" value="true"/>
+			<input type="hidden" name="check_credit_card" id="check_credit_card" value="0"/>
 			<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
 
-			<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label="lu_btn_ProceedToPreview" no_editing="1"/>">
+			<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label='lu_btn_ProceedToPreview' no_editing='1'/>">
+
+			<script type="text/javascript">
+				var $submit_event = '';
+
+				$(document).ready(
+					function () {
+						// mark all submit buttons on form ("Update Address" & "Proceed to preview")
+						$("input[type='submit']", '#billing_info').each(
+							function () {
+								var $me = $(this);
+
+								if ( $me.attr('name').match(/^events\[ord\]\[(.*)\]$/) ) {
+									$me
+									.attr('event_name', RegExp.$1)
+									.click(
+										function ($e) {
+											$submit_event = $(this).attr('event_name');
+										}
+									);
+
+								}
+							}
+						);
+
+						$('#billing_info').submit(
+							function ($e) {
+								$('#check_credit_card').val($submit_event == 'OnProceedToPreview' ? 1 : 0);
+							}
+						);
+					}
+				)
+			</script>
+
 		</inp2:m_RenderElement>
 	</table>
 	<br />
Index: branches/1.2.x/platform/inc/styles.css
===================================================================
diff -u -r14274 -r14857
--- branches/1.2.x/platform/inc/styles.css	(.../styles.css)	(revision 14274)
+++ branches/1.2.x/platform/inc/styles.css	(.../styles.css)	(revision 14857)
@@ -508,7 +508,7 @@
 	vertical-align:top;
 	}
 
-/* --- Item Raring Styles --- */
+/* --- Item Rating Styles --- */
 .ratingblock, .ratingblock div {
 	display: -moz-inline-block;
 }
Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl
===================================================================
diff -u -r14720 -r14857
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl	(.../form_register.elm.tpl)	(revision 14720)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl	(.../form_register.elm.tpl)	(revision 14857)
@@ -15,7 +15,7 @@
 
 	<form method="post" action="<inp2:m_FormAction/>">
 		<table class="form-data fullwidth">
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Username" title="lu_fld_Login" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Username" title="lu_fld_Username" style="width:155px" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Email" title="lu_fld_Email" style="width:155px" />
 
 			<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
@@ -36,8 +36,8 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="State" title="lu_fld_State" style="width:155px" />
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" title="lu_fld_Zip" style="width:55px" />
 			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
-			
 
+
 			<inp2:m_RenderElement design="inp_edit_buttons">
 				<input type="hidden" name="next_template" value="<inp2:m_get var='next_template'/>">
 				<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm">