Index: branches/5.1.x/admin_templates/export.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13923)
@@ -45,8 +45,7 @@
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>
 
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.export" field="ExportColumns" title="la_fld_ExportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="p.export" field="ExportColumns" title="la_fld_ExportColumns">
 				<td class="control-cell">
 					<table cellpadding="0" cellspacing="0" border="0">
 						<tr>
@@ -78,11 +77,9 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="p.export" field="ExportColumns"/>
-			</tr>
+			</inp2:m_RenderElement>
 
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>
+			<inp2:m_RenderElement design="form_row" prefix="p.export" field="CategoryFormat" title="la_fld_CategoryFormat">
 				<td class="control-cell">
 					<table cellspacing="0" cellpadding="0">
 						<tr>
@@ -113,8 +110,7 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="p.export" field="CategoryFormat"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 			<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0" inverse="inverse">
 				<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" />
Index: branches/5.1.x/admin_templates/import.tpl
===================================================================
diff -u -N -r13786 -r13923
--- branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13786)
+++ branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13923)
@@ -91,9 +91,7 @@
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
-
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename"/>
+			<inp2:m_RenderElement design="form_row" prefix="p.import" field="ImportSource" title="la_fld_ImportFilename">
 				<td class="control-cell">
 					<table border="0">
 						<tr>
@@ -124,17 +122,15 @@
 
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="ImportSource"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="p.import" field="FieldTitles" title="la_fld_FieldTitles" onclick="reflectFormFields();"/>
 
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="p.import" field="ExportColumns" title="la_fld_ImportColumns">
 				<td class="control-cell">
 					<table cellpadding="0" cellspacing="0" border="0">
 						<tr>
@@ -166,8 +162,7 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="ExportColumns"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 	<!-- CATEGORY SELECTOR: BEGIN -->
 		<inp2:m_DefineElement name="root_cat_caption">
@@ -178,22 +173,19 @@
 			<inp2:m_param name="separator"/><inp2:m_param name="cat_name"/>
 		</inp2:m_DefineElement>
 
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory"/>
+		<inp2:m_RenderElement design="form_row" prefix="p.import" field="CategoryId" title="la_fld_ImportCategory">
 			<td class="control-cell">
 				<b><inp2:p.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
 				<input type="hidden" name="<inp2:p.import_InputName field='CategoryId'/>" value="<inp2:p.import_Field field='CategoryId' db='db'/>" />
 				<a href="javascript:openSelector('p.import', '<inp2:adm_SelectorLink prefix="p.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
 			</td>
-			<td class="error"><inp2:p.import_Error field="CategoryId"/>&nbsp;</td>
-		</tr>
+		</inp2:m_RenderElement>
 
 	<!-- CATEGORY SELECTOR: END -->
 		<inp2:m_RenderElement name="inp_edit_box" prefix="p.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="p.import" field="ReplaceDuplicates" title="la_fld_ReplaceDuplicates" />
 
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>
+		<inp2:m_RenderElement design="form_row" prefix="p.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
 			<td class="control-cell">
 				<table cellspacing="0" cellpadding="0">
 					<tr>
@@ -218,8 +210,7 @@
 					</tr>
 				</table>
 			</td>
-			<inp2:m_RenderElement name="inp_edit_error" prefix="p.import" field="CheckDuplicatesMethod"/>
-		</tr>
+		</inp2:m_RenderElement>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/orders/export/export.tpl
===================================================================
diff -u -N -r13549 -r13923
--- branches/5.1.x/admin_templates/orders/export/export.tpl	(.../export.tpl)	(revision 13549)
+++ branches/5.1.x/admin_templates/orders/export/export.tpl	(.../export.tpl)	(revision 13923)
@@ -43,19 +43,17 @@
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="IncludeFieldTitles" title="la_fld_IncludeFieldTitles"/>
 
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets"/>
+			<inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportPresets" title="la_fld_ExportPresets">
 				<td class="control-cell">
 					<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:ord.export_InputName field="ExportPresets"/>" id="<inp2:ord.export_InputName field="ExportPresets"/>" onchange="update_fields(this.value)">
 						<inp2:ord.export_PredefinedOptions field="ExportPresets" block="inp_option_item" selected="selected"/>
 					</select>
 					&nbsp;&nbsp;
 					<input class="button" type="button" value="<inp2:m_Phrase label="la_Text_Delete"/>" onclick="delete_preset()">
 				</td>
-			</tr>
+			</inp2:m_RenderElement>
 
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="ord.export" field="ExportColumns" title="la_fld_ExportColumns">
 				<td class="control-cell">
 					<table cellpadding="0" cellspacing="0" border="0">
 						<tr>
@@ -87,8 +85,7 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="ord.export" field="ExportColumns"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ord.export" field="ExportSavePreset" title="la_fld_ExportSavePreset" size="2" maxlength="1" onclick="update_preset_field(this.checked)"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="ord.export" field="ExportPresetName" title="la_fld_ExportPresetName" size="20" />
@@ -113,7 +110,7 @@
 		$kf.elements['events[ord.export]'].value = tmp;
 		Request.makeRequest('<inp2:m_t ajax="1" ord.export_event="OnDeleteExportPreset" js_escape="1" no_amp="1"/>', delete_busy, '', function() {
 			presets = document.getElementById('<inp2:ord.export_InputName field="ExportPresets"/>');
-			
+
 			for (i=0; i< presets.options.length; i++) {
 				if (presets.options[i].selected) {
 					presets.options.remove[i];
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"/>
Index: branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl
===================================================================
diff -u -N -r13465 -r13923
--- branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl	(.../gift_certificate_edit.tpl)	(revision 13465)
+++ branches/5.1.x/admin_templates/discounts/gift_certificate_edit.tpl	(.../gift_certificate_edit.tpl)	(revision 13923)
@@ -77,19 +77,6 @@
 }
 </script>
 
-<inp2:m_DefineElement name="inp_edit_box_generate" class="" onblur="" maxlength="" is_last="0">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<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"/>
-			<td class="control-cell">
-				<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
-				<input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <inp2:gc_SaveWarning name="grid_save_warning"/>
 <inp2:gc_ErrorWarning name="form_error_warning"/>
 
@@ -152,7 +139,13 @@
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
-				<inp2:m_RenderElement name="inp_edit_box_generate" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
+
+				<inp2:m_RenderElement design="form_row" prefix="gc" field="Code" title="la_fld_Code" size="35">
+					<td class="control-cell">
+						<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
+						<input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
+					</td>
+				</inp2:m_RenderElement>
 			</inp2:m_if>
 
 			<inp2:m_if check="gc_IsNewItem" inverse="inverse">
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!"/>
Index: branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl	(.../shipping_quote_engine_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/shipping/shipping_quote_engine_edit.tpl	(.../shipping_quote_engine_edit.tpl)	(revision 13923)
@@ -79,15 +79,11 @@
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="sqe" field="Status" title="!la_fld_Enabled!"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="sqe" field="AccountLogin" title="!la_fld_Login!" />
 
-			<inp2:m_if check="sqe_FieldVisible" field="AccountPassword">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="sqe" field="AccountPassword" title="!la_fld_Password!" />
-					<td class="control-cell">
-						<input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value="">
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="sqe" field="AccountPassword"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="sqe" field="AccountPassword" title="la_fld_Password">
+				<td class="control-cell">
+					<input type="password" name="<inp2:sqe_InputName field="AccountPassword" />" id="<inp2:sqe_InputName field="AccountPassword" />" value="">
+				</td>
+			</inp2:m_RenderElement>
 
 	<inp2:m_if check="sqe_Field" field="ClassName" equals_to="Intershipper" db="db">
 		<inp2:m_RenderElement name="subsection" title="!la_Text_Carriers!"/>
Index: branches/5.1.x/admin_templates/shipping/shipping_costs.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/shipping/shipping_costs.tpl	(.../shipping_costs.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/shipping/shipping_costs.tpl	(.../shipping_costs.tpl)	(revision 13923)
@@ -94,28 +94,6 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="precision_field">
-	<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_name="$field" title="$title"/>
-		<td class="control-cell">
-			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
-					<inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_phrase" selected="selected"/>
-				<inp2:m_else/>
-					<inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_item" selected="selected"/>
-				</inp2:m_if>
-			</select>&nbsp;,&nbsp;<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
-					<inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_phrase" selected="selected"/>
-				<inp2:m_else/>
-					<inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_item" selected="selected"/>
-				</inp2:m_if>
-			</select>
-		</td>
-	</tr>
-</inp2:m_DefineElement>
-
-
 <inp2:m_DefineElement name="row_header">
 	<td>
 		<input type="checkbox" name="<inp2:{$prefix}_InputName field="$IdField"/>" id="<inp2:{$prefix}_InputName field="$IdField"/>" value="<inp2:{$prefix}_field field="$IdField"/>" onclick="reflect_toolbar('<inp2:m_param name="prefix"/>', <inp2:{$prefix}_field field="$IdField"/>, '<inp2:m_param name="IdField"/>')">
@@ -174,7 +152,25 @@
 		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="s" field="CostType" title="!la_fld_CostType!"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="s" field="ZeroIfEmpty" title="!la_fld_EmptyCellsAre!" size="20"/>
-			<inp2:m_RenderElement name="precision_field" prefix="s" title="!la_Precision!"/>
+
+			<inp2:m_RenderElement design="form_row" prefix="s" field="PrecisionBeforeSep" title="la_Precision">
+				<td class="control-cell">
+					<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionBeforeSep"/>">
+						<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
+							<inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_phrase" selected="selected"/>
+						<inp2:m_else/>
+							<inp2:{$prefix}_PredefinedOptions field="PrecisionBeforeSep" block="inp_option_item" selected="selected"/>
+						</inp2:m_if>
+					</select>&nbsp;,&nbsp;<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>" id="<inp2:{$prefix}_InputName field="PrecisionAfterSep"/>">
+						<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
+							<inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_phrase" selected="selected"/>
+						<inp2:m_else/>
+							<inp2:{$prefix}_PredefinedOptions field="PrecisionAfterSep" block="inp_option_item" selected="selected"/>
+						</inp2:m_if>
+					</select>
+				</td>
+			</inp2:m_RenderElement>
+
 			<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/discounts/coupon_edit.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/discounts/coupon_edit.tpl	(.../coupon_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/discounts/coupon_edit.tpl	(.../coupon_edit.tpl)	(revision 13923)
@@ -71,32 +71,6 @@
 }
 </script>
 
-<inp2:m_DefineElement name="inp_edit_box_generate" is_last="0">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<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"/>
-			<td class="control-cell">
-				<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
-				<input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_box_comment" is_last="0">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<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"/>
-			<td class="control-cell">
-				<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
-				<inp2:m_Phrase label="la_comment_LeaveBlank" />
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <inp2:coup_SaveWarning name="grid_save_warning"/>
 <inp2:coup_ErrorWarning name="form_error_warning"/>
 
@@ -106,8 +80,14 @@
 			<inp2:m_RenderElement name="inp_label" prefix="coup" field="CouponId" title="!la_fld_Id!"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="coup" field="Status" title="!la_fld_Status!"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="coup" field="Name" title="!la_fld_Name!" size="35"/>
-			<inp2:m_RenderElement name="inp_edit_box_generate" prefix="coup" field="Code" title="!la_fld_CouponCode!" size="35"/>
 
+			<inp2:m_RenderElement design="form_row" prefix="coup" field="Code" title="la_fld_CouponCode" size="35">
+				<td class="control-cell">
+					<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
+					<input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
+				</td>
+			</inp2:m_RenderElement>
+
 			<inp2:m_RenderElement name="inp_edit_date_time" prefix="coup" field="Expiration" title="!la_fld_Expiration!" size="10"/>
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="coup" field="Type" title="!la_fld_Type!"/>
@@ -116,7 +96,13 @@
 			<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedBy" title="!la_fld_LastUsedBy!" size="15"/>
 			<inp2:m_RenderElement name="inp_label" prefix="coup" field="LastUsedOn" title="!la_fld_LastUsedOn!" size="10"/>
 
-			<inp2:m_RenderElement name="inp_edit_box_comment" prefix="coup" field="NumberOfUses" title="!la_fld_NumberOfUses!" size="4"/>
+			<inp2:m_RenderElement design="form_row" prefix="coup" field="NumberOfUses" title="la_fld_NumberOfUses" size="4">
+				<td class="control-cell">
+					<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
+					<inp2:m_Phrase label="la_comment_LeaveBlank" />
+				</td>
+			</inp2:m_RenderElement>
+
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	(.../affiliate_plans_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/affiliate_plans/affiliate_plans_edit.tpl	(.../affiliate_plans_edit.tpl)	(revision 13923)
@@ -64,16 +64,12 @@
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="IsPrimary" title="!la_fld_Primary!" onchange="check_status()" />
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ap" field="Enabled" title="!la_fld_Enabled!" onchange="check_primary()"/>
 
-			<inp2:m_if check="ap_FieldVisible" field="MinPaymentAmount">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ap" field="MinPaymentAmount" title="la_fld_MinimumPaymentAmount" />
-					<td class="control-cell">
-						<input type="text" name="<inp2:ap_InputName field='MinPaymentAmount' />" id="<inp2:ap_InputName field='MinPaymentAmount' />" value="<inp2:ap_Field name='MinPaymentAmount' />" tabindex="<inp2:m_get param='tab_index'/>" size="8">
-						<span class="small">(<inp2:curr_PrimaryCurrencyISO />)</span>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="ap" field="MinPaymentAmount"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="ap" field="MinPaymentAmount" title="la_fld_MinimumPaymentAmount">
+				<td class="control-cell">
+					<input type="text" name="<inp2:ap_InputName field='MinPaymentAmount' />" id="<inp2:ap_InputName field='MinPaymentAmount' />" value="<inp2:ap_Field name='MinPaymentAmount' />" tabindex="<inp2:m_get param='tab_index'/>" size="8">
+					<span class="small">(<inp2:curr_PrimaryCurrencyISO />)</span>
+				</td>
+			</inp2:m_RenderElement>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/orders/orders_edit.tpl
===================================================================
diff -u -N -r13745 -r13923
--- branches/5.1.x/admin_templates/orders/orders_edit.tpl	(.../orders_edit.tpl)	(revision 13745)
+++ branches/5.1.x/admin_templates/orders/orders_edit.tpl	(.../orders_edit.tpl)	(revision 13923)
@@ -65,17 +65,13 @@
 			<inp2:m_RenderElement name="inp_id_label" prefix="ord" field="OrderId" title="!la_fld_OrderId!"/>
 
 			<inp2:m_if check="ord_OrderEditable">
-				<inp2:m_if check="ord_FieldVisible" field="Number">
-					<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="Number" title="!la_fld_OrderNumber!"/>
-						<td class="control-cell">
-							<input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text">
-							-<inp2:m_inc param="tab_index" by="1"/>
-							<input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text">
-						</td>
-						<inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>
-					</tr>
-				</inp2:m_if>
+				<inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
+					<td class="control-cell">
+						<input type="text" name="<inp2:ord_InputName field='Number'/>" id="<inp2:ord_InputName field='Number'/>" value="<inp2:ord_Field field='Number' db='db'/>" tabindex="<inp2:m_get param='tab_index'/>" size="6" maxlength="6" class="text">
+						-<inp2:m_inc param="tab_index" by="1"/>
+						<input type="text" name="<inp2:ord_InputName field='SubNumber'/>" id="<inp2:ord_InputName field='SubNumber' db='db'/>" value="<inp2:ord_Field field='SubNumber'/>" tabindex="<inp2:m_get param='tab_index'/>" size="2" maxlength="3" class="text">
+					</td>
+				</inp2:m_RenderElement>
 
 				<inp2:m_if check="m_IsDebugMode" >
 					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="Status" title="!la_fld_Status!"/>
@@ -101,15 +97,11 @@
 					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="UserComment" title="!la_fld_UserComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
 					<inp2:m_RenderElement name="inp_edit_textarea" prefix="ord" field="AdminComment" title="!la_fld_AdminComment!" control_options="{min_height: 100}" rows="10" cols="40"/>
 			<inp2:m_else/>
-				<inp2:m_if check="ord_FieldVisible" field="Number">
-					<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="Number" title="!la_fld_OrderNumber!"/>
-						<td class="control-cell">
-							<inp2:ord_Field field="OrderNumber"/>
-						</td>
-						<inp2:m_RenderElement name="inp_edit_error" prefix="ord" field="OrderNumber"/>
-					</tr>
-				</inp2:m_if>
+				<inp2:m_RenderElement design="form_row" prefix="ord" field="OrderNumber" title="la_fld_OrderNumber">
+					<td class="control-cell">
+						<inp2:ord_Field field="OrderNumber"/>
+					</td>
+				</inp2:m_RenderElement>
 
 				<inp2:m_RenderElement name="inp_label" prefix="ord" field="Status" title="!la_fld_Status!"/>
 				<inp2:m_RenderElement name="inp_label" prefix="ord" field="OrderDate" title="!la_fld_Date!"/>
Index: branches/5.1.x/admin_templates/currencies/currencies_edit.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/currencies/currencies_edit.tpl	(.../currencies_edit.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/currencies/currencies_edit.tpl	(.../currencies_edit.tpl)	(revision 13923)
@@ -59,29 +59,21 @@
 			<inp2:m_RenderElement name="inp_label" prefix="curr" field="CurrencyId" title="!la_fld_Id!"/>
 			<inp2:m_RenderElement name="inp_label" prefix="curr" field="ISO" title="!la_fld_ISOCode!"/>
 
-			<inp2:m_if check="curr_FieldVisible" field="RateToPrimary">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="RateToPrimary" title="!la_fld_RateToPrimary!" />
-					<td class="control-cell">
-						<input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">
-						<input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">
-						<span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="curr" field="RateToPrimary"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="curr" field="RateToPrimary" title="la_fld_RateToPrimary">
+				<td class="control-cell">
+					<input type="text" name="<inp2:curr_InputName field='RateToPrimary'/>" id="<inp2:curr_InputName field='RateToPrimary'/>" value="<inp2:curr_Field field='RateToPrimary'/>" size="10">
+					<input type="button" class="button" onclick="submit_event('curr', 'OnUpdateRate')" value="<inp2:m_phrase label='la_UpdateRate'/>">
+					<span class="small">1 <inp2:curr_Field field="ISO"/> = ? <inp2:curr_PrimaryCurrencyISO /></span>
+				</td>
+			</inp2:m_RenderElement>
 
-			<inp2:m_if check="curr_FieldVisible" field="Symbol">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="curr" field="Symbol" title="!la_fld_CurrencySymbol!"/>
-					<td class="control-cell">
-						<input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10">
-						<span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>
-						<inp2:curr_Error field="Symbol"/>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="curr" field="Symbol"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="curr" field="Symbol" title="la_fld_CurrencySymbol">
+				<td class="control-cell">
+					<input type="text" name="<inp2:curr_InputName field='Symbol'/>" id="<inp2:curr_InputName field='Symbol'/>" value="<inp2:curr_Field field='Symbol'/>" tabindex="<inp2:m_get param='tab_index'/>" size="10">
+					<span class="small"><inp2:m_phrase label="la_ISOUsedIfBlank" /></span>
+					<inp2:curr_Error field="Symbol"/>
+				</td>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="curr" field="SymbolPosition" title="!la_fld_CurrencySymbolPosition!"/>
 
Index: branches/5.1.x/admin_templates/products/products_inventory.tpl
===================================================================
diff -u -N -r13100 -r13923
--- branches/5.1.x/admin_templates/products/products_inventory.tpl	(.../products_inventory.tpl)	(revision 13100)
+++ branches/5.1.x/admin_templates/products/products_inventory.tpl	(.../products_inventory.tpl)	(revision 13923)
@@ -73,23 +73,6 @@
 </tbody>
 </table>
 
-<!-- block definitions: begin -->
-<inp2:m_DefineElement name="inp_edit_inventory">
-	<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"/>
-		<td class="control-cell">
-			<input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" />&nbsp;
-			<input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')">&nbsp;
-			<input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')">&nbsp;
-			<input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')">&nbsp;
-			<input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')">&nbsp;
-			<input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')">&nbsp;
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
-</inp2:m_DefineElement>
-<!-- block definitions: end -->
-
 <inp2:m_ifnot check="p_Field" name="InventoryStatus" equals_to="2" db="db">
 	<inp2:p_SaveWarning name="grid_save_warning"/>
 </inp2:m_ifnot>
@@ -109,7 +92,17 @@
 				<inp2:m_RenderElement name="inp_label" prefix="p" field="QtyOnOrder" title="!la_fld_QtyOnOrder!"/>
 			</inp2:m_ifnot>
 
-			<inp2:m_RenderElement name="inp_edit_inventory" prefix="p" field="Qty" title="!la_fld_Qty!" size="3"/>
+			<inp2:m_RenderElement design="form_row" prefix="p" field="Qty" title="la_fld_Qty" size="3">
+				<td class="control-cell">
+					<input type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" />&nbsp;
+					<input type="button" class="button" id="Add" value="<inp2:m_phrase label="la_btn_Add"/>" onclick="processButton('p', 'OnQtyAdd')">&nbsp;
+					<input type="button" class="button" id="Remove" value="<inp2:m_phrase label="la_btn_Remove"/>" onclick="processButton('p', 'OnQtyRemove')">&nbsp;
+					<input type="button" class="button" id="Order" value="<inp2:m_phrase label="la_btn_Order"/>" onclick="processButton('p', 'OnQtyOrder')">&nbsp;
+					<input type="button" class="button" id="ReceiveOrder" value="<inp2:m_phrase label="la_btn_ReceiveOrder"/>" onclick="processButton('p', 'OnQtyReceiveOrder')">&nbsp;
+					<input type="button" class="button" id="CancelOrder" value="<inp2:m_phrase label="la_btn_CancelOrder"/>" onclick="processButton('p', 'OnQtyCancelOrder')">&nbsp;
+				</td>
+			</inp2:m_RenderElement>
+
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="p" field="InventoryComment" title="!la_fld_Comment!" cols="40" rows="3"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>