Index: branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
diff -u -N -r13908 -r13923
--- branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13908)
+++ branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13923)
@@ -216,16 +216,15 @@
 				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingCustomerAccount" title="!la_fld_ShippingCustomerAccount!" size="30"/>
 
 				<inp2:m_DefineElement name="inp_shipping_label" 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 valign="top" class="control-cell">
 							<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
 
 							<inp2:m_if check="{$prefix}_USPSLabelFound" field="$field">
 								&nbsp; &nbsp;<a href="#" onClick="javascript:submit_event('<inp2:m_Param name="prefix"/>', 'OnDownloadLabel'); return false;"><inp2:m_Phrase label="la_ViewLabel"/></a>
 							</inp2:m_if>
 						</td>
-					</tr>
+					</inp2:m_RenderElement>
 				</inp2:m_DefineElement>
 
 				<inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="!la_fld_ShippingTracking!" size="30"/>