Index: branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
diff -u -N -r14257 -r14403
--- branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 14257)
+++ branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 14403)
@@ -156,8 +156,7 @@
 				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCost" title="la_fld_ShippingCost" size="10"/>
 				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" currency="selected"/>
 				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCustomerAccount" title="la_fld_ShippingCustomerAccount" size="30"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30"/>
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate" size="16"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" style="width: auto;" size="30"/>
 
 			<inp2:m_else/>
 
@@ -214,25 +213,20 @@
 				<inp2:m_RenderElement name="inp_label" prefix="ord" field="InsuranceFee" title="la_fld_InsuranceFee" size="10" format="$ %.2f"/>
 				<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="">
-					<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_RenderElement design="form_row" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30">
+					<td valign="top" class="control-cell">
+						<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" tabindex="<inp2:m_Get name='tab_index'/>" size="<inp2:m_param name='size'/>"/>
 
-							<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>
-					</inp2:m_RenderElement>
-				</inp2:m_DefineElement>
+						<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>
+				</inp2:m_RenderElement>
 
-				<inp2:m_RenderElement name="inp_shipping_label" prefix="ord" field="ShippingTracking" title="la_fld_ShippingTracking" size="30"/>
-
-
-				<inp2:m_RenderElement name="inp_label" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate" size="16"/>
-
 			</inp2:m_if>
 
+			<inp2:m_RenderElement name="inp_edit_date_time" prefix="ord" field="ShippingDate" title="la_fld_ShippingDate"/>
+
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>