Index: branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl
===================================================================
diff -u -N -r13891 -r13908
--- branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13891)
+++ branches/5.1.x/admin_templates/orders/orders_edit_shipping.tpl	(.../orders_edit_shipping.tpl)	(revision 13908)
@@ -70,14 +70,10 @@
 <inp2:ord_SaveWarning name="grid_save_warning"/>
 
 <inp2:m_if check="m_Recall" name="usps_errors">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
-  		<tr>
-    		<td valign="top" class="form-warning">
-    			<inp2:m_Recall name="usps_errors" />
-    			<inp2:m_RemoveVar name="usps_errors"/>
-    		</td>
-  		</tr>
-	</table>
+	<inp2:m_RenderElement design="form_message" pass_params="1">
+		<inp2:m_Recall name="usps_errors" />
+    	<inp2:m_RemoveVar name="usps_errors"/>
+	</inp2:m_RenderElement>
 </inp2:m_if>
 
 <inp2:ord_ErrorWarning name="form_error_warning"/>
Index: branches/5.1.x/admin_templates/orders/order_product_edit.tpl
===================================================================
diff -u -N -r13100 -r13908
--- branches/5.1.x/admin_templates/orders/order_product_edit.tpl	(.../order_product_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/orders/order_product_edit.tpl	(.../order_product_edit.tpl)	(revision 13908)
@@ -57,13 +57,9 @@
 	<input type="hidden" name="p_id" value="<inp2:p_Field name='ProductId'/>">
 
 	<inp2:m_if check="p_OptionsHaveError">
-		<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
-  		<tr>
-    		<td valign="top" class="hint_red">
-    			<inp2:p_OptionsError required="lu_comm_OptionsRequired" not_available="lu_comm_OptionsNotAvailable"/>
-    		</td>
-  		</tr>
-		</table>
+		<inp2:m_RenderElement design="form_message" pass_params="1">
+			<inp2:p_OptionsError required="lu_comm_OptionsRequired" not_available="lu_comm_OptionsNotAvailable"/>
+		</inp2:m_RenderElement>
 	</inp2:m_if>
 
 	<inp2:m_if check="p_FieldEquals" field="OptionsSelectionMode" value="1"> <!-- Listable options (combinations) -->
Index: branches/5.1.x/admin_templates/orders/orders_toship_list.tpl
===================================================================
diff -u -N -r13100 -r13908
--- branches/5.1.x/admin_templates/orders/orders_toship_list.tpl	(.../orders_toship_list.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/orders/orders_toship_list.tpl	(.../orders_toship_list.tpl)	(revision 13908)
@@ -63,16 +63,12 @@
 </table>
 
 <inp2:m_DefineElement name="usps_errors">
-	<table width="100%" border="0" cellspacing="0" cellpadding="4" class="warning-table">
-  		<tr>
-    		<td valign="top" class="form-warning">
-    			Order: <inp2:m_Param name="order_number"/>. USPS error: <inp2:m_Param name="error_description"/>
-    		</td>
-  		</tr>
-	</table>
+	Order: <inp2:m_Param name="order_number"/>. USPS error: <inp2:m_Param name="error_description"/><br/>
 </inp2:m_DefineElement>
 
-<inp2:ord_PrintUSPSErrors render_as="usps_errors" />
+<inp2:m_RenderElement design="form_message" pass_params="1">
+	<inp2:ord_PrintUSPSErrors render_as="usps_errors" />
+</inp2:m_RenderElement>
 
 <inp2:m_RenderElement name="grid" PrefixSpecial="ord.toship" IdField="OrderId" grid="Default"/>
 <script type="text/javascript">