Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
===================================================================
diff -u -N -r14857 -r15526
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 14857)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 15526)
@@ -31,36 +31,23 @@
 		<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="lu_billing_NameOnCard" style="width: 260px;"/>
 
 		<!-- credit card expiration -->
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="lu_billing_CardExpiration"/>
-			<td class="field-value">
-				<inp2:m_if check="ord_HasError" field="PaymentCCExpDate">
-					<span class="field-error"><inp2:ord_Error field="PaymentCCExpDate"/></span><br />
-				</inp2:m_if>
-				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>">
-					<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
-				</select>
-				/
-				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpYear"/>">
-					<option value=''></option>
-					<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
-				</select>
-			</td>
-		</tr>
-		<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
+		<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="lu_billing_CardExpiration" field_type="cc_expiration">
+			<select class="input-select" name="<inp2:ord_InputName field='PaymentCCExpMonth'/>">
+				<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
+			</select>
+			/
+			<select class="input-select" name="<inp2:ord_InputName field='PaymentCCExpYear'/>">
+				<option value=''></option>
+				<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
+			</select>
+		</inp2:m_RenderElement>
 		<!-- // credit card expiration -->
 
 		<!-- credit card CVV2 -->
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCVV2" title="lu_billing_CVV2"/>
-			<td class="field-value">
-				<inp2:m_if check="ord_HasError" field="PaymentCVV2">
-					<span class="field-error"><inp2:ord_Error field="PaymentCVV2"/></span><br />
-				</inp2:m_if>
-				<input type="text" class="input-text" name="<inp2:ord_InputName field="PaymentCVV2"/>" value="<inp2:ord_Field field="PaymentCVV2"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 50px;">
-				&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
-			</td>
-		</tr>
+		<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCVV2" title="lu_billing_CVV2">
+			<input type="text" class="input-text" name="<inp2:ord_InputName field='PaymentCVV2'/>" value="<inp2:ord_Field field='PaymentCVV2'/>" tabindex="<inp2:m_get param='tab_index'/>" style="width: 50px;">
+			&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
+		</inp2:m_RenderElement>
 		<!-- // credit card CVV2 -->
 
 		<inp2:m_RenderElement design="inp_edit_buttons">