Index: branches/5.1.x/core/admin_templates/skins/skin_edit.tpl
===================================================================
diff -u -N -r13664 -r13926
--- branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 13664)
+++ branches/5.1.x/core/admin_templates/skins/skin_edit.tpl	(.../skin_edit.tpl)	(revision 13926)
@@ -59,25 +59,17 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="replacement_item" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
-	<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" subfield="$subfield" title="$Description" is_last="$is_last"/>
-			<td class="control-cell">
-				<input style="<inp2:m_Param name='style'/>" type="text"
-					name="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>][Value]" id="<inp2:{$prefix}_InputName field='$field' subfield='$subfield'/>[<inp2:m_Param name='key'/>]" value="<inp2:m_Param name='Value'/>">
-			</td>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="inp_edit_serialized" subfield="" class="" is_last="" maxlength="" onblur="" size="" onkeyup="" style="width: 100%">
 	<inp2:PrintSerializedFields pass_params="1" field="$field" render_as="$item_render_as"/>
 </inp2:m_DefineElement>
 
 <inp2:skin_SaveWarning name="grid_save_warning"/>
 <inp2:skin_ErrorWarning name="form_error_warning"/>
 
+<style type="text/css">
+	.skin-table td {width: 90px};
+</style>
+
 <div id="scroll_container">
 	<table class="edit-form">
 		<inp2:m_RenderElement name="inp_id_label" prefix="skin" field="SkinId" title="!la_fld_Id!"/>
@@ -88,12 +80,7 @@
 		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoBottom" title="la_fld_LogoBottom"/>
 		<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="skin" field="LogoLogin" title="la_fld_LogoLogin"/>
 
-		<style type="text/css">
-			.skin-table td {width: 90px};
-		</style>
-
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="skin" field="Options" title="la_HeadFrame"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_HeadFrame">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -126,10 +113,9 @@
 					</tr>
 				</table>
 			</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="skin" field="Options" title="la_GeneralSections"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_GeneralSections">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -162,10 +148,9 @@
 					</tr>
 				</table>
 			</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="skin" field="Options" title="la_DataGrid1"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_DataGrid1">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -198,10 +183,9 @@
 					</tr>
 				</table>
 			</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="skin" field="Options" title="la_DataGrid2"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_DataGrid2">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -234,10 +218,9 @@
 					</tr>
 				</table>
 			</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="skin" field="Options" title="la_Trees"/>
+		<inp2:m_RenderElement design="form_row" prefix="skin" field="Options" title="la_Trees">
 			<td class="control-cell">
 				<table class="skin-table">
 					<tr>
@@ -282,9 +265,8 @@
 					</tr>
 				</table>
 			</td>
-		</tr>
+		</inp2:m_RenderElement>
 
-	<!--	<inp2:m_RenderElement name="inp_edit_serialized" prefix="skin" field="Options" title="!la_fld_Options!" style="width: 100px" item_render_as="replacement_item"/>-->
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="skin" field="CSS" title="!la_fld_CSS!" control_options="{min_height: 300}"/>
 
 	</table>
Index: branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -N -r13086 -r13926
--- branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 13086)
+++ branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 13926)
@@ -53,18 +53,14 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_relation">
-	<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"/>
-			<td class="control-cell">
-				<inp2:m_if check="{$prefix}_Field" field="$field">
-					<img src="<inp2:{$prefix}_ModulePath />img/itemicons/<inp2:{$prefix}_ItemIcon grid="Default"/>" align="absmiddle"/>
-					<inp2:{$prefix}_Field field="ItemName" no_special="1"/> (<inp2:{$prefix}_Field field="ItemType"/>)
-				</inp2:m_if>
-			</td>
-	    	<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<td class="control-cell">
+			<inp2:m_if check="{$prefix}_Field" field="$field">
+				<img src="<inp2:{$prefix}_ModulePath />img/itemicons/<inp2:{$prefix}_ItemIcon grid="Default"/>" align="absmiddle"/>
+				<inp2:{$prefix}_Field field="ItemName" no_special="1"/> (<inp2:{$prefix}_Field field="ItemType"/>)
+			</inp2:m_if>
+		</td>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="structure_reload_element">
Index: branches/5.1.x/core/admin_templates/site_domains/site_domain_edit.tpl
===================================================================
diff -u -N -r13559 -r13926
--- branches/5.1.x/core/admin_templates/site_domains/site_domain_edit.tpl	(.../site_domain_edit.tpl)	(revision 13559)
+++ branches/5.1.x/core/admin_templates/site_domains/site_domain_edit.tpl	(.../site_domain_edit.tpl)	(revision 13926)
@@ -59,18 +59,14 @@
 <inp2:site-domain_ErrorWarning name="form_error_warning"/>
 
 <inp2:m_DefineElement name="inp_edit_regexp_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" hint_label="" style="width: 400px">
-	<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="hidden" id="<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" name="<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" value="<inp2:{$prefix}_Field field='{$field}UsesRegExp' db='db'/>">
-				<input tabindex="<inp2:m_get param='tab_index'/>" title="<inp2:m_Phrase name='la_hint_UsingRegularExpression' html_escape='1'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" <inp2:{$prefix}_Field field="{$field}UsesRegExp" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>'));"/>
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<td class="control-cell">
+			<input type="hidden" id="<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" name="<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" value="<inp2:{$prefix}_Field field='{$field}UsesRegExp' db='db'/>">
+			<input tabindex="<inp2:m_get param='tab_index'/>" title="<inp2:m_Phrase name='la_hint_UsingRegularExpression' html_escape='1'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>" <inp2:{$prefix}_Field field="{$field}UsesRegExp" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='{$field}UsesRegExp'/>'));"/>
 
-				<input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" 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'/>" onkeyup="<inp2:m_Param name='onkeyup'/>" onchange="<inp2:m_Param name='onchange'/>">
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
+			<input style="<inp2:m_Param name='style'/>" type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' format='$format'/>" 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'/>" onkeyup="<inp2:m_Param name='onkeyup'/>" onchange="<inp2:m_Param name='onchange'/>">
+		</td>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <div id="scroll_container">
Index: branches/5.1.x/core/admin_templates/regional/languages_export.tpl
===================================================================
diff -u -N -r13453 -r13926
--- branches/5.1.x/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 13453)
+++ branches/5.1.x/core/admin_templates/regional/languages_export.tpl	(.../languages_export.tpl)	(revision 13926)
@@ -33,15 +33,11 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
 
-		<inp2:m_if check="phrases.export_FieldVisible" field="LangFile">
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName"/>
-				<td class="control-cell">
-					<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field='LangFile'/>" id="<inp2:phrases.export_InputName field='LangFile'/>" value="<inp2:phrases.export_Field field='LangFile'/>" />
-				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="phrases.export" field="LangFile"/>
-			</tr>
-		</inp2:m_if>
+		<inp2:m_RenderElement design="form_row" prefix="phrases.export" field="LangFile" title="la_fld_ExportFileName">
+			<td class="control-cell">
+				<inp2:lang_ExportPath/> <input type="text" name="<inp2:phrases.export_InputName field='LangFile'/>" id="<inp2:phrases.export_InputName field='LangFile'/>" value="<inp2:phrases.export_Field field='LangFile'/>" />
+			</td>
+		</inp2:m_RenderElement>
 
 		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="phrases.export" field="PhraseType" title="!la_fld_ExportPhraseTypes!"/>
 
@@ -64,55 +60,51 @@
 			</tr>
 		</inp2:m_DefineElement>
 
-		<inp2:m_if check="phrases.export_FieldVisible" field="PhraseType">
-			<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-				<inp2:m_RenderElement name="inp_edit_field_caption" prefix="phrases.export" field="Module" title="la_fld_ExportModules"/>
-				<td class="control-cell">
-					<input type="button" class="button" id="btn-select-all" value="<inp2:m_Phrase name='la_btn_SelectAll' no_editing='1'/>"/>
-					<input type="button" class="button" id="btn-unselect" value="<inp2:m_Phrase name='la_btn_Unselect' no_editing='1'/>"/>
-					<br/><br/>
+		<inp2:m_RenderElement design="form_row" prefix="phrases.export" field="Module" title="la_fld_ExportModules">
+			<td class="control-cell">
+				<input type="button" class="button" id="btn-select-all" value="<inp2:m_Phrase name='la_btn_SelectAll' no_editing='1'/>"/>
+				<input type="button" class="button" id="btn-unselect" value="<inp2:m_Phrase name='la_btn_Unselect' no_editing='1'/>"/>
+				<br/><br/>
 
-					<style type="text/css">
-						table#modules {
-							border-collapse: collapse;
-						}
+				<style type="text/css">
+					table#modules {
+						border-collapse: collapse;
+					}
 
-						table#modules td, table#modules th {
-							border: 1px solid black;
-							padding: 3px;
-						}
-					</style>
+					table#modules td, table#modules th {
+						border: 1px solid black;
+						padding: 3px;
+					}
+				</style>
 
-					<table id="modules" border="1">
-						<tr>
-							<th align="center" colspan="2"><inp2:m_Phrase name="la_col_Module"/></th>
-							<th align="center"><inp2:m_Phrase name="la_col_Phrases"/></th>
-							<th align="center"><inp2:m_Phrase name="la_col_EmailEvents"/></th>
-						</tr>
-						<inp2:phrases.export_PredefinedOptions prefix="phrases.export" field="Module" block="export_module_element" no_empty="1" selected="checked"/>
-					</table>
+				<table id="modules" border="1">
+					<tr>
+						<th align="center" colspan="2"><inp2:m_Phrase name="la_col_Module"/></th>
+						<th align="center"><inp2:m_Phrase name="la_col_Phrases"/></th>
+						<th align="center"><inp2:m_Phrase name="la_col_EmailEvents"/></th>
+					</tr>
+					<inp2:phrases.export_PredefinedOptions prefix="phrases.export" field="Module" block="export_module_element" no_empty="1" selected="checked"/>
+				</table>
 
-					<script type="text/javascript">
-						$(document).ready(
-							function () {
-								$('#btn-select-all, #btn-unselect').click(
-									function ($e) {
-										var $checked = $(this).attr('id') == 'btn-select-all' ? 'checked' : '';
-										var $reg_exp = /^<inp2:phrases.export_InputName field='Module' as_preg='1'/>_([0-9A-Za-z-]+)/;
+				<script type="text/javascript">
+					$(document).ready(
+						function () {
+							$('#btn-select-all, #btn-unselect').click(
+								function ($e) {
+									var $checked = $(this).attr('id') == 'btn-select-all' ? 'checked' : '';
+									var $reg_exp = /^<inp2:phrases.export_InputName field='Module' as_preg='1'/>_([0-9A-Za-z-]+)/;
 
-										$("input[type='checkbox']", '#modules').attr('checked', $checked);
-										update_checkbox_options($reg_exp, '<inp2:phrases.export_InputName field='Module'/>');
-									}
-								);
-							}
-						);
-					</script>
+									$("input[type='checkbox']", '#modules').attr('checked', $checked);
+									update_checkbox_options($reg_exp, '<inp2:phrases.export_InputName field='Module'/>');
+								}
+							);
+						}
+					);
+				</script>
 
-					<inp2:m_RenderElement prefix="phrases.export" name="inp_edit_hidden" field="Module" db="db"/>
-				</td>
-				<inp2:m_RenderElement name="inp_edit_error" prefix="phrases.export" field="Module"/>
-			</tr>
-		</inp2:m_if>
+				<inp2:m_RenderElement prefix="phrases.export" name="inp_edit_hidden" field="Module" db="db"/>
+			</td>
+		</inp2:m_RenderElement>
 
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportPhrases" title="!la_fld_ExportPhrases!" allow_html="0" hint_label="la_hint_ExportPhrases"/>
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases.export" field="ExportEmailEvents" title="!la_fld_ExportEmailEvents!" allow_html="0" hint_label="la_hint_ExportEmailEvents"/>
Index: branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl
===================================================================
diff -u -N -r13664 -r13926
--- branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 13664)
+++ branches/5.1.x/core/admin_templates/mailing_lists/mailing_list_edit.tpl	(.../mailing_list_edit.tpl)	(revision 13926)
@@ -86,30 +86,23 @@
 	<inp2:m_if check="m_Param" name="not_last">; </inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_recipient_box" class="" format="" is_last="" maxlength="" onblur="" onchange="" size="" onkeyup="" hint_label="" style="width: 100%">
-	<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">
-				<inp2:m_if check="{$prefix}_IsManualRecipient">
-					<input style="<inp2:m_Param name="style"/>" type="text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" format="$format"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:m_param name="size"/>" maxlength="<inp2:m_param name="maxlength"/>">
-				<inp2:m_else/>
-					<inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
-					<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
-				</inp2:m_if>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <div id="scroll_container">
 	<table class="edit-form">
 
 		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="mailing-list" field="MailingId" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_recipient_box" prefix="mailing-list" field="To" title="la_fld_To" size="60"/>
 
+			<inp2:m_RenderElement design="form_row" prefix="mailing-list" field="To" title="la_fld_To" size="60">
+				<td class="control-cell">
+					<inp2:m_if check="{$prefix}_IsManualRecipient">
+						<input style="width: 100%;" 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_else/>
+						<inp2:$prefix_PrintRecipients render_as="recipient_element" strip_nl="2"/>
+						<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
+					</inp2:m_if>
+				</td>
+			</inp2:m_RenderElement>
+
 			<inp2:m_if check="mailing-list_IsNewItem">
 				<inp2:m_RenderElement name="inp_edit_box" prefix="mailing-list" field="Subject" title="la_fld_Subject" size="60"/>
 				<inp2:m_RenderElement name="inp_edit_swf_upload" prefix="mailing-list" field="Attachments" title="la_fld_Attachment"/>
Index: branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl
===================================================================
diff -u -N -r13635 -r13926
--- branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl	(.../email_message_settings.tpl)	(revision 13635)
+++ branches/5.1.x/core/admin_templates/languages/email_message_settings.tpl	(.../email_message_settings.tpl)	(revision 13926)
@@ -54,60 +54,56 @@
 <inp2:emailevents_ErrorWarning name="form_error_warning"/>
 
 <inp2:m_DefineElement name="inp_edit_combo_target" caption_render_as="default_field_caption_element" read_only="0" has_empty="" hint_label="">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" id="<inp2:$prefix_InputName field='$field'/>_row">
-			<inp2:m_RenderElement name="inp_edit_field_caption" caption_render_as="$caption_render_as" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label"/>
-			<td class="control-cell">
-				<inp2:m_if check="m_Param" name="read_only">
-					<inp2:$prefix_Field name="{$field}Type"/>: "<inp2:$prefix_Field name="$field"/>"
-				<inp2:m_else/>
-					<select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='{$field}Type'/>" id="<inp2:{$prefix}_InputName field='{$field}Type'/>">
-						<inp2:{$prefix}_PredefinedOptions field="{$field}Type" block="inp_option_phrase" selected="selected" has_empty="$has_empty"/>
-					</select>
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<td class="control-cell">
+			<inp2:m_if check="m_Param" name="read_only">
+				<inp2:$prefix_Field name="{$field}Type"/>: "<inp2:$prefix_Field name="$field"/>"
+			<inp2:m_else/>
+				<select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='{$field}Type'/>" id="<inp2:{$prefix}_InputName field='{$field}Type'/>">
+					<inp2:{$prefix}_PredefinedOptions field="{$field}Type" block="inp_option_phrase" selected="selected" has_empty="$has_empty"/>
+				</select>
 
-					<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'/>" style="width: 250px;"/>
-				</inp2:m_if>
+				<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'/>" style="width: 250px;"/>
+			</inp2:m_if>
 
-				<script type="text/javascript">
-					fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>Type'] = '<inp2:m_phrase label="{$title}Type" js_escape="1"/>'
+			<script type="text/javascript">
+				fields['<inp2:m_Param name="prefix" js_escape="1"/>']['<inp2:m_Param name="field" js_escape="1"/>Type'] = '<inp2:m_phrase label="{$title}Type" js_escape="1"/>'
 
-					new AJAXDropDown(
-						'<inp2:$prefix_InputName name="$field" js_escape="1"/>',
-						function(cur_value) {
-							var $type = $( jq('#<inp2:$prefix_InputName name="{$field}Type" js_escape="1"/>') ).val();
+				new AJAXDropDown(
+					'<inp2:$prefix_InputName name="$field" js_escape="1"/>',
+					function(cur_value) {
+						var $type = $( jq('#<inp2:$prefix_InputName name="{$field}Type" js_escape="1"/>') ).val();
 
-							if ( !isNaN( parseInt($type) ) ) {
-								var $url = '<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnSuggestAddress" value="#VALUE#" type="#TYPE#" no_amp="1"/>';
+						if ( !isNaN( parseInt($type) ) ) {
+							var $url = '<inp2:m_Link template="dummy" pass="m,$prefix" {$prefix}_event="OnSuggestAddress" value="#VALUE#" type="#TYPE#" no_amp="1"/>';
 
-								return $url.replace('#VALUE#', encodeURIComponent(cur_value)).replace('#TYPE#', encodeURIComponent($type));
-							}
-
-							return false;
+							return $url.replace('#VALUE#', encodeURIComponent(cur_value)).replace('#TYPE#', encodeURIComponent($type));
 						}
-					);
 
-					$(document).ready(
-						function () {
-							$( jq('#<inp2:$prefix_InputName name="{$field}Type"/>') ).change(
-								function ($e) {
-									var $me = $(this);
+						return false;
+					}
+				);
 
-									if ($me.attr('disabled')) {
-										return ;
-									}
+				$(document).ready(
+					function () {
+						$( jq('#<inp2:$prefix_InputName name="{$field}Type"/>') ).change(
+							function ($e) {
+								var $me = $(this);
 
-									var $type_selected = !isNaN( parseInt( $me.val() ) );
-									$( jq('#<inp2:$prefix_InputName name="$field"/>') ).attr('disabled', $type_selected ? '' : 'disabled');
+								if ($me.attr('disabled')) {
+									return ;
 								}
-							)
-							.change();
-						}
-					);
-				</script>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
+
+								var $type_selected = !isNaN( parseInt( $me.val() ) );
+								$( jq('#<inp2:$prefix_InputName name="$field"/>') ).attr('disabled', $type_selected ? '' : 'disabled');
+							}
+						)
+						.change();
+					}
+				);
+			</script>
+		</td>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <div id="scroll_container">
Index: branches/5.1.x/core/admin_templates/stylesheets/style_editor.tpl
===================================================================
diff -u -N -r12127 -r13926
--- branches/5.1.x/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/stylesheets/style_editor.tpl	(.../style_editor.tpl)	(revision 13926)
@@ -47,8 +47,7 @@
 </table>
 
 <inp2:m_DefineElement name="inp_edit_color">
-	<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_phrase="$title_phrase" title="$title" is_last="$is_last"/>
+	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell">
 			<input	type="text"
 					name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>"
@@ -65,20 +64,17 @@
 				updateColor(null,'<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>');
 			</script>
 		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_options_style">
-	<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_phrase="$title_phrase" title="$title" is_last="$is_last"/>
+	<inp2:m_RenderElement design="form_row" pass_params="1">
 		<td class="control-cell">
 			<select tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" id="<inp2:{$prefix}_InputName field="$field" subfield="$subfield"/>" onchange="<inp2:m_Param name="onchange"/>">
 				<inp2:{$prefix}_PredefinedOptions field="$field" value_field="$value_field" subfield="$subfield" block="inp_option_item" selected="selected"/>
 			</select>
 		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 
Index: branches/5.1.x/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -N -r13824 -r13926
--- branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 13824)
+++ branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 13926)
@@ -109,23 +109,6 @@
 	<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_merge_to" caption_render_as="default_field_caption_element" is_last="" field_class="" onchange="" hint_label="" onclick="">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>" id="<inp2:$prefix_InputName field='$field'/>_row">
-			<inp2:m_RenderElement name="inp_edit_field_caption" caption_render_as="$caption_render_as" prefix="$prefix" field="$field" title="$title" hint_label="$hint_label" is_last="$is_last" NamePrefix="_cb_"/>
-			<td class="control-cell">
-				<input type="hidden" id="<inp2:{$prefix}_InputName field='Is{$field}'/>" name="<inp2:{$prefix}_InputName field='Is{$field}'/>" value="<inp2:{$prefix}_Field field='Is{$field}' db='db'/>">
-				<input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" name="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" <inp2:{$prefix}_Field field="Is{$field}" checked="checked" db="db"/> class="<inp2:m_param name='field_class'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Is{$field}'/>'));<inp2:m_param name='onchange'/>" onclick="<inp2:m_param name='onclick'/>">
-
-				<select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" onchange="<inp2:m_Param name='onchange'/>" style="width: 400px;">
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="1"/>
-				</select>
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <inp2:formsubs_SaveWarning name="grid_save_warning"/>
 <inp2:formsubs_ErrorWarning name="form_error_warning"/>
 
@@ -149,7 +132,16 @@
 
 			<inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db">
 				<inp2:m_ifnot check="submission-log_TotalRecords">
-					<inp2:m_RenderElement name="inp_edit_merge_to" prefix="formsubs" field="MergeToSubmission" title="la_fld_MergeToSubmission"/>
+					<inp2:m_RenderElement design="form_row" prefix="formsubs" field="MergeToSubmission" title="la_fld_MergeToSubmission">
+						<td class="control-cell">
+							<input type="hidden" id="<inp2:{$prefix}_InputName field='Is{$field}'/>" name="<inp2:{$prefix}_InputName field='Is{$field}'/>" value="<inp2:{$prefix}_Field field='Is{$field}' db='db'/>">
+							<input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" name="_cb_<inp2:{$prefix}_InputName field='Is{$field}'/>" <inp2:{$prefix}_Field field="Is{$field}" checked="checked" db="db"/> class="<inp2:m_param name='field_class'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Is{$field}'/>'));<inp2:m_param name='onchange'/>" onclick="<inp2:m_param name='onclick'/>">
+
+							<select tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" onchange="<inp2:m_Param name='onchange'/>" style="width: 400px;">
+								<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="1"/>
+							</select>
+						</td>
+					</inp2:m_RenderElement>
 				</inp2:m_ifnot>
 			</inp2:m_if>
 		<inp2:m_RenderElement name="subsection" title="la_section_Data"/>
Index: branches/5.1.x/core/admin_templates/submissions/submission_log_edit.tpl
===================================================================
diff -u -N -r13816 -r13926
--- branches/5.1.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 13816)
+++ branches/5.1.x/core/admin_templates/submissions/submission_log_edit.tpl	(.../submission_log_edit.tpl)	(revision 13926)
@@ -71,28 +71,6 @@
 	<a href="<inp2:Field field='$field' format='full_url'/>" target="_blank"><inp2:Field field="$field"/></a><br/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_upload_label" 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"/>
-		<td class="control-cell">
-			<inp2:$prefix_IterateFiles render_as="file_element" field="$field"/>
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_edit_draft" 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="la_DraftAvailableFrom" is_last="$is_last"/>
-		<td class="control-cell">
-			<inp2:draft.related_Field name="CreatedOn"/>
-			[<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnUseDraft'); return false;"><inp2:m_Phrase name="la_btn_UseDraft"/></a>]
-			&nbsp;[<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnDeleteDraft'); return false;"><inp2:m_Phrase name="la_btn_DeleteDraft"/></a>]
-		</td>
-		<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-	</tr>
-</inp2:m_DefineElement>
-
 <input type="hidden" name="client_mode" value="<inp2:m_Get name='client_mode'/>"/>
 
 <inp2:submission-log_SaveWarning name="grid_save_warning"/>
@@ -112,7 +90,13 @@
 			<inp2:m_RenderElement name="inp_edit_box" prefix="submission-log" field="Subject" size="80" title="la_fld_Subject"/>
 
 			<inp2:m_if check="submission-log_HasDraft">
-				<inp2:m_RenderElement name="inp_edit_draft" prefix="submission-log" field="DraftId"/>
+				<inp2:m_RenderElement design="form_row" prefix="submission-log" field="DraftId" title="la_DraftAvailableFrom">
+					<td class="control-cell">
+						<inp2:draft.related_Field name="CreatedOn"/>
+						[<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnUseDraft'); return false;"><inp2:m_Phrase name="la_btn_UseDraft"/></a>]
+						&nbsp;[<a href="#" onclick="submit_event('<inp2:m_Param name='prefix'/>', 'OnDeleteDraft'); return false;"><inp2:m_Phrase name="la_btn_DeleteDraft"/></a>]
+					</td>
+				</inp2:m_RenderElement>
 			</inp2:m_if>
 
 			<inp2:m_RenderElement name="inp_edit_textarea" prefix="submission-log" field="Message" rows="30" cols="100" title="la_fld_Message" allow_html="0"/>
@@ -124,8 +108,13 @@
 			<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="RepliedOn" title="la_fld_RepliedOn"/>
 			<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="SentStatus" title="la_fld_SentStatus"/>
 			<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="SentOn" title="la_fld_SentOn"/>
-			<inp2:m_RenderElement name="inp_edit_upload_label" prefix="submission-log" field="Attachment" title="la_fld_Attachment"/>
 
+			<inp2:m_RenderElement design="form_row" prefix="submission-log" field="Attachment" title="la_fld_Attachment">
+				<td class="control-cell">
+					<inp2:$prefix_IterateFiles render_as="file_element" field="$field"/>
+				</td>
+			</inp2:m_DefineElement>
+
 			<inp2:m_if check="submission-log_Field" name="BounceInfo">
 				<inp2:m_RenderElement name="inp_label" prefix="submission-log" field="BounceInfo" title="la_fld_BounceInfo" nl2br="1"/>
 			</inp2:m_if>