Index: branches/5.1.x/admin_templates/export.tpl
===================================================================
diff -u -N -r13095 -r13924
--- branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/export.tpl	(.../export.tpl)	(revision 13924)
@@ -43,8 +43,7 @@
 
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.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="l.export" field="ExportColumns" title="la_fld_ExportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="l.export" field="ExportColumns" title="la_fld_ExportColumns">
 				<td class="control-cell">
 					<table cellpadding="0" cellspacing="0" border="0">
 						<tr>
@@ -76,11 +75,9 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="l.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="l.export" field="CategoryFormat" title="la_fld_CategoryFormat"/>
+			<inp2:m_RenderElement design="form_row" prefix="l.export" field="CategoryFormat" title="la_fld_CategoryFormat">
 				<td class="control-cell">
 					<table cellspacing="0" cellpadding="0">
 						<tr>
@@ -111,8 +108,7 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="l.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="l.export" field="IsBaseCategory" title="la_fld_IsBaseCategory" />
Index: branches/5.1.x/admin_templates/import.tpl
===================================================================
diff -u -N -r13787 -r13924
--- branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13787)
+++ branches/5.1.x/admin_templates/import.tpl	(.../import.tpl)	(revision 13924)
@@ -90,8 +90,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="l.import" field="ImportSource" title="la_fld_ImportFilename"/>
+			<inp2:m_RenderElement design="form_row" prefix="l.import" field="ImportSource" title="la_fld_ImportFilename">
 				<td class="control-cell">
 					<table border="0">
 						<tr>
@@ -122,17 +121,15 @@
 
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="ImportSource"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="FieldsSeparatedBy" title="la_fld_FieldsSeparatedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="FieldsEnclosedBy" title="la_fld_FieldsEnclosedBy" size="2" maxlength="1"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="l.import" field="LineEndings" title="la_fld_LineEndings" use_phrases="0"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.import" field="SkipFirstRow" title="la_fld_SkipFirstRow"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="l.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="l.import" field="ExportColumns" title="la_fld_ImportColumns"/>
+			<inp2:m_RenderElement design="form_row" prefix="l.import" field="ExportColumns" title="la_fld_ImportColumns">
 				<td class="control-cell">
 					<table cellpadding="0" cellspacing="0" border="0">
 						<tr>
@@ -164,8 +161,7 @@
 						</tr>
 					</table>
 				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="ExportColumns"/>
-			</tr>
+			</inp2:m_RenderElement>
 
 	<!-- CATEGORY SELECTOR: BEGIN -->
 		<inp2:m_DefineElement name="root_cat_caption">
@@ -176,22 +172,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="l.import" field="CategoryId" title="la_fld_ImportCategory"/>
+		<inp2:m_RenderElement design="form_row" prefix="l.import" field="CategoryId" title="la_fld_ImportCategory">
 			<td class="control-cell">
 				<b><inp2:l.import_CategoryPath separator=" &gt; " root_cat_render_as="root_cat_caption" render_as="category_caption" session_var="ImportCategory"/></b>
 				<input type="hidden" name="<inp2:l.import_InputName field='CategoryId'/>" value="<inp2:l.import_Field field='CategoryId' db='db'/>" />
 				<a href="javascript:openSelector('l.import', '<inp2:adm_SelectorLink prefix="l.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="l.import" field="CategoryId"/>
-		</tr>
+		</inp2:m_RenderElement>
 	<!-- CATEGORY SELECTOR: END -->
 
 		<inp2:m_RenderElement name="inp_edit_box" prefix="l.import" field="CategorySeparator" title="la_fld_CategorySeparator" size="2" maxlength="1"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="l.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="l.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod"/>
+		<inp2:m_RenderElement design="form_row" prefix="l.import" field="CheckDuplicatesMethod" title="la_fld_CheckDuplicatesMethod">
 			<td class="control-cell">
 				<table cellspacing="0" cellpadding="0">
 					<tr>
@@ -216,8 +209,8 @@
 					</tr>
 				</table>
 			</td>
-			<inp2:m_RenderElement name="inp_edit_error" prefix="l.import" field="CheckDuplicatesMethod"/>
-		</tr>
+		</inp2:m_RenderElement>
+
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>
Index: branches/5.1.x/admin_templates/links/links_edit.tpl
===================================================================
diff -u -N -r13459 -r13924
--- branches/5.1.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 13459)
+++ branches/5.1.x/admin_templates/links/links_edit.tpl	(.../links_edit.tpl)	(revision 13924)
@@ -74,17 +74,11 @@
 
 		<inp2:m_RenderElement name="subsection" prefix="l" fields="Status,NewItem,HotItem,PopItem,EditorPick,PriorityCreatedOn,Expire,MetaKeywords,MetaDescription" title="la_section_Properties" original_title="la_section_OriginalValues" display_original="1"/>
 			<inp2:m_if check="l_DisplayOriginal" display_original="1">
-				<inp2:m_if check="l_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="l" field="Status" title="!la_fld_Status!"/>
-						<td class="control-cell">
-							<inp2:m_Phrase label="la_UseGridToApproveDecline" />
-						</td>
-						<td>
-							&nbsp;
-						</td>
-					</tr>
-				</inp2:m_if>
+				<inp2:m_RenderElement design="form_row" prefix="l" 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="l" field="Status" title="!la_fld_Status!" display_original="1"/>
 			</inp2:m_if>
Index: branches/5.1.x/admin_templates/paid_listings/paid_listing_type_edit.tpl
===================================================================
diff -u -N -r13095 -r13924
--- branches/5.1.x/admin_templates/paid_listings/paid_listing_type_edit.tpl	(.../paid_listing_type_edit.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/paid_listings/paid_listing_type_edit.tpl	(.../paid_listing_type_edit.tpl)	(revision 13924)
@@ -62,29 +62,21 @@
 
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="lst" field="Description" title="la_fld_ListingTypeDescription" rows="10" cols="40"/>
 
-			<inp2:m_if check="lst_FieldVisible" field="Duration">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="lst" field="Duration" title="la_fld_Duration" />
-					<td class="control-cell">
-						<input type="text" name="<inp2:lst_InputName field="Duration" />" id="<inp2:lst_InputName field="Duration" />" value="<inp2:lst_Field name="Duration" />" tabindex="<inp2:m_get param="tab_index"/>" size="5">
-						<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lst_InputName field="DurationType"/>" id="<inp2:lst_InputName field="DurationType"/>">
-							<inp2:lst_PredefinedOptions field="DurationType" block="inp_option_phrase" selected="selected" prefix="lst" />
-						</select>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="lst" field="Duration"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="lst" field="Duration" title="la_fld_Duration">
+				<td class="control-cell">
+					<input type="text" name="<inp2:lst_InputName field="Duration" />" id="<inp2:lst_InputName field="Duration" />" value="<inp2:lst_Field name="Duration" />" tabindex="<inp2:m_get param="tab_index"/>" size="5">
+					<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:lst_InputName field="DurationType"/>" id="<inp2:lst_InputName field="DurationType"/>">
+						<inp2:lst_PredefinedOptions field="DurationType" block="inp_option_phrase" selected="selected" prefix="lst" />
+					</select>
+				</td>
+			</inp2:m_RenderElement>
 
-			<inp2:m_if check="lst_FieldVisible" field="RenewalReminder">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="lst" field="RenewalReminder" title="la_fld_RenewalReminder" />
-					<td class="control-cell">
-						<input type="text" name="<inp2:lst_InputName field="RenewalReminder"/>" id="<inp2:lst_InputName field="RenewalReminder" />" value="<inp2:lst_Field field="RenewalReminder" />" tabindex="<inp2:m_get param="tab_index"/>" size="5">
-						<inp2:m_Phrase label="la_days" />
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="lst" field="RenewalReminder"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="lst" field="RenewalReminder" title="la_fld_RenewalReminder">
+				<td class="control-cell">
+					<input type="text" name="<inp2:lst_InputName field="RenewalReminder"/>" id="<inp2:lst_InputName field="RenewalReminder" />" value="<inp2:lst_Field field="RenewalReminder" />" tabindex="<inp2:m_get param="tab_index"/>" size="5">
+					<inp2:m_Phrase label="la_days" />
+				</td>
+			</inp2:m_RenderElement>
 
 			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
 				<inp2:m_inc param="tab_index" by="1"/>
Index: branches/5.1.x/admin_templates/paid_listings/paid_listing_edit.tpl
===================================================================
diff -u -N -r13095 -r13924
--- branches/5.1.x/admin_templates/paid_listings/paid_listing_edit.tpl	(.../paid_listing_edit.tpl)	(revision 13095)
+++ branches/5.1.x/admin_templates/paid_listings/paid_listing_edit.tpl	(.../paid_listing_edit.tpl)	(revision 13924)
@@ -61,16 +61,12 @@
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="ls" field="ListingTypeId" title="la_fld_ListingType" onchange="set_exp_date()" />
 
-			<inp2:m_if check="ls_FieldVisible" field="LinkName">
-				<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-					<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ls" field="LinkName" title="la_fld_LinkName"/>
-					<td class="control-cell">
-						<inp2:ls_Field name="LinkName" />
-						<a href="javascript:select_link();"><img src="<inp2:m_TemplatesBase module='in-link'/>/img/link_arrow.gif" border="0"></a>
-					</td>
-					<inp2:m_RenderElement name="inp_edit_error" prefix="ls" field="LinkNam"/>
-				</tr>
-			</inp2:m_if>
+			<inp2:m_RenderElement design="form_row" prefix="ls" field="LinkName" title="la_fld_LinkName">
+				<td class="control-cell">
+					<inp2:ls_Field name="LinkName" />
+					<a href="javascript:select_link();"><img src="<inp2:m_TemplatesBase module='in-link'/>/img/link_arrow.gif" border="0"></a>
+				</td>
+			</inp2:m_RenderElement>
 
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="ls" field="Status" title="la_fld_Status"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="ls" field="PendingRenewal" title="la_fld_PendingRenewal"/>