Index: branches/5.1.x/admin_templates/articles/articles_edit.tpl
===================================================================
diff -u -N -r13460 -r13925
--- branches/5.1.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 13460)
+++ branches/5.1.x/admin_templates/articles/articles_edit.tpl	(.../articles_edit.tpl)	(revision 13925)
@@ -68,38 +68,24 @@
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="n" field="Body" title="!la_fld_Body!" control_options="{min_height: 100}" cols="70" rows="8" display_original="1"/>
 
 			<!-- excerpt: begin -->
-			<inp2:m_if check="n_FieldVisible" field="Excerpt">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Excerpt" title="la_fld_Excerpt"/>
-					<td class="control-cell">
-						<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br />
-						<script type="text/javascript">
-							Form.addControl('<inp2:n_InputName field="Excerpt"/>', {min_height: 100});
-						</script>
-						<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="n" field="Excerpt"/>
-
-					<inp2:m_if check="n_DisplayOriginal" pass_params="1">
-						<inp2:m_RenderElement prefix="n" field="Excerpt" name="inp_original_label"/>
-					</inp2:m_if>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="n" field="Excerpt" title="la_fld_Excerpt">
+				<td class="control-cell">
+					<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:n_InputName field="Excerpt"/>" name="<inp2:n_InputName field="Excerpt"/>" style="width: 100%; height: 45px" cols="70" rows="3"><inp2:n_Field field="Excerpt"/></textarea><br />
+					<input type="checkbox" name="generate_excerpt" id="generate_excerpt" value="1" /><label for="generate_excerpt"><inp2:m_phrase name="la_prompt_AutoGen_Excerpt"/></label>
+				</td>
+			</inp2:m_RenderElement>
 			<!-- excerpt: end -->
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n" field="AutomaticFilename" title="la_fld_AutomaticFilename" onchange="reflect_filename()" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="n" field="Filename" title="la_fld_Filename" size="70" display_original="1"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="n" field="CategoryId" title="la_fld_ParentSection" display_original="1"/>
 		<inp2:m_RenderElement name="subsection" prefix="n" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/>
 			<inp2:m_if check="n_DisplayOriginal" display_original="1">
-				<inp2:m_if check="n_FieldVisible" field="Status">
-					<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-						<inp2:m_RenderElement name="inp_edit_field_caption" prefix="n" field="Status" title="!la_fld_Status!"/>
-						<td class="control-cell">
-							<inp2:m_Phrase label="la_UseGridToApproveDecline" />
-						</td>
-					</tr>
-				</inp2:m_if>
+				<inp2:m_RenderElement design="form_row" prefix="n" field="Status" title="la_fld_Status">
+					<td class="control-cell">
+						<inp2:m_Phrase label="la_UseGridToApproveDecline" />
+					</td>
+				</inp2:m_RenderElement>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_radio" prefix="n" field="Status" title="!la_fld_Status!" display_original="1"/>
 			</inp2:m_if>
Index: branches/5.1.x/admin_templates/export.tpl
===================================================================
diff -u -N -r13096 -r13925
--- branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13096)
+++ branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13925)
@@ -44,8 +44,7 @@
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.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="n.export" field="ExportColumns" title="la_fld_ExportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="n.export" field="ExportColumns" title="la_fld_ExportColumns">
 				<td class="control-cell">
 					<table cellpadding="0" cellspacing="0" border="0">
 						<tr>
@@ -77,11 +76,9 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="n.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="n.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>
+			<inp2:m_RenderElement design="form_row" prefix="n.export" field="CategoryFormat" title="la_fld_CategoryFormat">
 				<td class="control-cell">
 					<table cellspacing="0" cellpadding="0">
 						<tr>
@@ -112,8 +109,7 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="n.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="n.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" />
Index: branches/5.1.x/admin_templates/import.tpl
===================================================================
diff -u -N -r13788 -r13925
--- branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13788)
+++ branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13925)
@@ -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="n.import" field="ImportSource" title="la_fld_ImportFilename"/>
+			<inp2:m_RenderElement design="form_row" prefix="n.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="n.import" field="ImportSource"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="n.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="n.import" field="ExportColumns" title="la_fld_ImportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="n.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="n.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="n.import" field="CategoryId" title="la_fld_ImportCategory"/>
+		<inp2:m_RenderElement design="form_row" prefix="n.import" field="CategoryId" title="la_fld_ImportCategory">
 			<td class="control-cell">
 				<b><inp2:n.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
 				<input type="hidden" name="<inp2:n.import_InputName field='CategoryId'/>" value="<inp2:n.import_Field field='CategoryId' db='db'/>" />
 				<a href="javascript:openSelector('n.import', '<inp2:adm_SelectorLink prefix="n.import" selection_mode="single" tab_prefixes="none"/>', 'ImportCategory', null, 'OnSaveSettings');"><img src="img/icons/icon24_cat.gif" border="0" align="absmiddle" /></a>
 			</td>
-			<inp2:m_RenderElement name="inp_edit_error" prefix="n.import" field="CategoryId"/>
-		</tr>
+		</inp2:m_RenderElement>
 	<!-- CATEGORY SELECTOR: END -->
 
 		<inp2:m_RenderElement name="inp_edit_box" prefix="n.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="n.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="n.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>
+		<inp2:m_RenderElement design="form_row" prefix="n.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="n.import" field="CheckDuplicatesMethod"/>
-		</tr>
+		</inp2:m_RenderElement>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
Index: branches/5.1.x/admin_templates/category_properties.tpl
===================================================================
diff -u -N -r13810 -r13925
--- branches/5.1.x/admin_templates/category_properties.tpl	(.../category_properties.tpl)	(revision 13810)
+++ branches/5.1.x/admin_templates/category_properties.tpl	(.../category_properties.tpl)	(revision 13925)
@@ -1,23 +1,19 @@
 <inp2:m_RenderElement name="subsection" title="la_In-news"/>
 
 <inp2:m_DefineElement name="inp_edit_type" class="" is_last="" maxlength="" onblur="" size="" is_last="" has_empty="0" empty_value="" onchange="" hint_label="" type_field="">
-	<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" hint_label="$hint_label" 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"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<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"/>" maxlength="<inp2:m_param name="maxlength"/>" class="<inp2:m_param name="class"/>" onblur="<inp2:m_Param name="onblur"/>">
 
-				<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>">
-					<inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases">
-						<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-					<inp2:m_else/>
-						<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-					</inp2:m_if>
-				</select>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
+			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$type_field"/>" id="<inp2:{$prefix}_InputName field="$type_field"/>" onchange="<inp2:m_Param name="onchange"/>">
+				<inp2:m_if check="{$prefix}_FieldOption" field="$type_field" option="use_phrases">
+					<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				<inp2:m_else/>
+					<inp2:{$prefix}_PredefinedOptions field="$type_field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+				</inp2:m_if>
+			</select>
+		</td>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_RenderElement name="inp_edit_box" prefix="c" field="cust_n_ItemTemplate" type_field="cust_n_ItemTemplate" title="!la_fld_cust_n_ItemTemplate!" size="50"/>