Index: branches/5.2.x/admin_templates/orders/order_product_edit.tpl
===================================================================
diff -u -N -r13845 -r14089
--- branches/5.2.x/admin_templates/orders/order_product_edit.tpl	(.../order_product_edit.tpl)	(revision 13845)
+++ branches/5.2.x/admin_templates/orders/order_product_edit.tpl	(.../order_product_edit.tpl)	(revision 14089)
@@ -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) -->
@@ -145,7 +141,7 @@
 
 		<div id="scroll_container">
 			<table class="edit-form">
-				<inp2:m_RenderElement name="subsection" title="!lu_comm_SelectOptions!"/>
+				<inp2:m_RenderElement name="subsection" title="lu_comm_SelectOptions"/>
 
 				<inp2:p_ListOptions no_table="1" per_page="-1" render_as="option_element" row_start_render_as="html:" row_end_render_as="html:"/>
 				<inp2:m_RenderElement name="inp_edit_filler"/>