Index: branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl	(.../orders_edit_billing.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/orders/orders_edit_billing.tpl	(.../orders_edit_billing.tpl)	(revision 13923)
@@ -72,14 +72,12 @@
 </script>
 
 <inp2:m_DefineElement name="inp_gwresults" is_last="" as_label="" currency="" is_last="">
-	<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
+	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell">
 			<inp2:m_if check="m_Param" name="display_field"><inp2:m_Param name="display_field"/>: <inp2:Field name="$field" format="$display_field"/></inp2:m_if>
 			<a href="javascript:OpenGWResults('<inp2:m_param name="field"/>')"><inp2:m_Phrase label="la_Details"/></a>
 		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_RenderElement name="inp_edit_hidden" prefix="ord" field="Status" db="db"/>
@@ -115,17 +113,13 @@
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="!la_fld_CreditCardNumber!" size="20"/>
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="!la_fld_PaymentNameOnCard!" size="20"/>
 
-					<inp2:m_if check="ord_FieldVisible" field="PaymentCCExpDate">
-						<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-							<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="!la_fld_PaymentCCExpDate!"/>
-							<td class="control-cell">
-								<input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>" id="<inp2:ord_InputName field="PaymentCCExpMonth"/>" value="<inp2:ord_Field field="PaymentCCExpMonth"/>">
-								/
-								<input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpYear"/>" id="<inp2:ord_InputName field="PaymentCCExpYear"/>" value="<inp2:ord_Field field="PaymentCCExpYear"/>">
-							</td>
-							<inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="PaymentCCExpDate"/>
-						</tr>
-					</inp2:m_if>
+					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate">
+						<td class="control-cell">
+							<input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>" id="<inp2:ord_InputName field="PaymentCCExpMonth"/>" value="<inp2:ord_Field field="PaymentCCExpMonth"/>">
+							/
+							<input type="text" size="3" maxlength="2" name="<inp2:ord_InputName field="PaymentCCExpYear"/>" id="<inp2:ord_InputName field="PaymentCCExpYear"/>" value="<inp2:ord_Field field="PaymentCCExpYear"/>">
+						</td>
+					</inp2:m_RenderElement>
 
 					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="!la_fld_PaymentCVV2!" size="5" maxlength="5"/>
 					<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentExpires!" size="16"/>
@@ -167,15 +161,11 @@
 					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentAccount" title="!la_fld_CreditCardNumber!"/>
 					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentNameOnCard" title="!la_fld_PaymentNameOnCard!"/>
 
-					<inp2:m_if check="ord_FieldVisible" field="PaymentCCExpDate">
-						<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-							<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="!la_fld_PaymentCCExpDate!"/>
-							<td class="control-cell">
-								<inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/>
-							</td>
-							<inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="PaymentCCExpDate"/>
-						</tr>
-					</inp2:m_if>
+					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="la_fld_PaymentCCExpDate">
+						<td class="control-cell">
+							<inp2:ord_Field field="PaymentCCExpMonth"/> / <inp2:ord_Field field="PaymentCCExpYear"/>
+						</td>
+					</inp2:m_RenderElement>
 
 					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentCVV2" title="!la_fld_PaymentCVV2!"/>
 					<inp2:m_RenderElement name="inp_label" prefix="ord" field="PaymentExpires" title="!la_fld_PaymentExpires!"/>