Index: branches/1.3.x/platform/designs/default_design.des.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 15478)
+++ branches/1.3.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 15665)
@@ -26,6 +26,13 @@
 		<script type="text/javascript" src="<inp2:m_Compress from='all_js'/>"></script>
 
 		<script type="text/javascript">
+			FormManager.init(
+				{
+					url: '<inp2:m_Link template="#TEMPLATE#" js_escape="1" __NO_REWRITE__="1" no_amp="1"/>',
+					noErrorsHTML: ''
+				}
+			);
+
 			var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
 
 			<inp2:m_Cache key="prefix:lang;skip_var:t,page,per_page,sort_by">
Index: branches/1.3.x/in-commerce/checkout/shop_cart.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-commerce/checkout/shop_cart.tpl	(.../shop_cart.tpl)	(revision 15478)
+++ branches/1.3.x/in-commerce/checkout/shop_cart.tpl	(.../shop_cart.tpl)	(revision 15665)
@@ -100,11 +100,11 @@
 										</td>
 										<td>
 											<inp2:m_if check="FieldEquals" field="Virtual" value="0">
-												<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a>
+												<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="ProductName" /></a>
 												<inp2:m_if check="FreePromoShippingAvailable">&nbsp;<sup><inp2:m_phrase label="lu_cart_FreeShippingAvailable" /></sup>
 												</inp2:m_if>
 											<inp2:m_else/>
-												<inp2:Field name="Name" />
+												<inp2:Field name="ProductName" />
 											</inp2:m_if>
 
 											<inp2:m_if check="ord_BackorderFlag"> <span class="error"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if>
Index: branches/1.3.x/in-link/links/modify_link.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-link/links/modify_link.tpl	(.../modify_link.tpl)	(revision 15478)
+++ branches/1.3.x/in-link/links/modify_link.tpl	(.../modify_link.tpl)	(revision 15665)
@@ -86,20 +86,17 @@
 							<inp2:m_if check="m_ConfigEquals" option="Link_EnhancedLinks" value="1">
 								<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
 
-								<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-									<inp2:m_RenderElement name="inp_edit_field_caption" prefix="l" field="ListingTypeId" title="lu_fld_ListingType"/>
-									<td class="field-value">
-										<inp2:m_if check="l_LinkIsEnhanced">
-											<strong><inp2:l_ListingTypeField name="Name" /></strong>
-											<inp2:m_if check="l_EnhancementIsPending">
-												(<inp2:m_Phrase label="lu_PendingEnhancement" />)
-											</inp2:m_if>
-											<a href="<inp2:l_LinkLink template="in-link/links/enhancements/extend_enhancement"/>"><inp2:m_Phrase label="lu_btn_ExtendCancelEnhancement" /></a>
-										<inp2:m_else />
-											<a href="<inp2:l_LinkLink template="in-link/links/enhancements/enhance_link"/>"><inp2:m_Phrase label="lu_btn_EnhanceLink" /></a>
+								<inp2:m_RenderElement design="form_row" prefix="l" field="ListingTypeId" title="lu_fld_ListingType" is_last="1">
+									<inp2:m_if check="l_LinkIsEnhanced">
+										<strong><inp2:l_ListingTypeField name="Name" /></strong>
+										<inp2:m_if check="l_EnhancementIsPending">
+											(<inp2:m_Phrase label="lu_PendingEnhancement" />)
 										</inp2:m_if>
-									</td>
-								</tr>
+										<a href="<inp2:l_LinkLink template="in-link/links/enhancements/extend_enhancement"/>"><inp2:m_Phrase label="lu_btn_ExtendCancelEnhancement" /></a>
+									<inp2:m_else />
+										<a href="<inp2:l_LinkLink template="in-link/links/enhancements/enhance_link"/>"><inp2:m_Phrase label="lu_btn_EnhanceLink" /></a>
+									</inp2:m_if>
+								</inp2:m_RenderElement>
 							</inp2:m_if>
 
 							<inp2:m_RenderElement design="inp_edit_buttons">
Index: branches/1.3.x/platform/my_account/my_profile.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 15478)
+++ branches/1.3.x/platform/my_account/my_profile.tpl	(.../my_profile.tpl)	(revision 15665)
@@ -46,7 +46,7 @@
 
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
-				<form method="post" enctype="multipart/form-data" action="<inp2:m_FormAction/>">
+				<form method="post" enctype="multipart/form-data" id="profile_form" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
 						<inp2:m_if check="u_Field" name="OldStyleLogin" db="db">
 							<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Username" title="lu_fld_Username" style="width:155px"/>
@@ -80,6 +80,24 @@
 						</inp2:m_RenderElement>
 					</table>
 				</form>
+
+				<script type="text/javascript">
+					$(document).ready(
+						function () {
+							FormManager.registerForm(
+								{
+									prefix: 'u',
+									id: '<inp2:u_Field name="PortalUserId"/>',
+									form_id: 'profile_form'
+								}
+							);
+
+							$('#profile_form').submit(function ($e) {
+								FormManager.cancelXHRRequests();
+							});
+						}
+					);
+				</script>
 			</inp2:m_RenderElement>
 			<!-- // my profile -->
 		</div>
Index: branches/1.3.x/in-bulletin/elements/forms.elm.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-bulletin/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15478)
+++ branches/1.3.x/in-bulletin/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15665)
@@ -1,32 +1,28 @@
-<inp2:m_DefineElement name="inp_edit_textarea_bb" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<a href="<inp2:m_Link/>" onclick="insertTags('[B]', '[/B]', 'bold text', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
-				<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/bold_icon.png" border="0"/>
-			</a>
-			<a href="<inp2:m_Link/>" onclick="insertTags('[I]', '[/I]', 'italic text', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
-				<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/italic_icon.png" border="0"/>
-			</a>
-			<a href="<inp2:m_Link/>" onclick="insertTags('[U]', '[/U]', 'underlined text', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
-				<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/underline_icon.png" border="0"/>
-			</a>
-			<a href="<inp2:m_Link/>" onclick="insertTags('[URL HREF=', ']link name[/URL]', 'link url', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
-				<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/link_icon.png" border="0"/>
-			</a>
-			<a href="<inp2:m_Link/>" onclick="insertTags('[IMG BORDER=1 SRC=', '][/IMG]', 'image url', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
-				<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/image_icon.png" border="0"/>
-			</a>
-			<a href="<inp2:m_Link/>" onclick="insertTags('[CODE]', '[/CODE]', 'code text', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
-				<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/code_icon.png" border="0"/>
-			</a>
+<inp2:m_DefineElement name="inp_edit_textarea_bb" style="" error_position="none" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<a href="<inp2:m_Link/>" onclick="insertTags('[B]', '[/B]', 'bold text', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
+			<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/bold_icon.png" border="0"/>
+		</a>
+		<a href="<inp2:m_Link/>" onclick="insertTags('[I]', '[/I]', 'italic text', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
+			<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/italic_icon.png" border="0"/>
+		</a>
+		<a href="<inp2:m_Link/>" onclick="insertTags('[U]', '[/U]', 'underlined text', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
+			<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/underline_icon.png" border="0"/>
+		</a>
+		<a href="<inp2:m_Link/>" onclick="insertTags('[URL HREF=', ']link name[/URL]', 'link url', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
+			<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/link_icon.png" border="0"/>
+		</a>
+		<a href="<inp2:m_Link/>" onclick="insertTags('[IMG BORDER=1 SRC=', '][/IMG]', 'image url', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
+			<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/image_icon.png" border="0"/>
+		</a>
+		<a href="<inp2:m_Link/>" onclick="insertTags('[CODE]', '[/CODE]', 'code text', '<inp2:{$prefix}_InputName field="$field"/>'); return false;">
+			<img src="<inp2:m_TemplatesBase module="in-bulletin"/>img/toolbar/code_icon.png" border="0"/>
+		</a>
 
-			<br />
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:{$prefix}_Field field="$field"/></textarea>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+		<br />
+
+		<inp2:m_RenderElement name="error_msg_container" pass_params="1"/>
+
+		<textarea class="input-textarea" tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" cols="<inp2:m_param name='cols'/>" rows="<inp2:m_param name='rows'/>" style="<inp2:m_param name='style'/>"><inp2:{$prefix}_Field field="$field"/></textarea>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/1.3.x/platform/inc/styles.css
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/platform/inc/styles.css	(.../styles.css)	(revision 15478)
+++ branches/1.3.x/platform/inc/styles.css	(.../styles.css)	(revision 15665)
@@ -203,7 +203,7 @@
 	font-size: 11px;
 }
 
-.field-required {
+.field-required, .error .field-name {
 	color: #FF0000;
 }
 
Index: branches/1.3.x/platform/login/forgot_password.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 15478)
+++ branches/1.3.x/platform/login/forgot_password.tpl	(.../forgot_password.tpl)	(revision 15665)
@@ -51,22 +51,12 @@
 					<inp2:m_RenderElement name="error_message"/>
 				</inp2:m_if>
 
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
+				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
 
 				<form method="post" action="<inp2:m_FormAction/>">
 					<table class="form-data fullwidth">
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_Username" style="width: 155px;"/>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotLogin" title="lu_fld_EmailOrUsername" style="width: 155px;" is_last="1"/>
 
-						<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-							<td class="field-name"></td>
-							<td class="field-value">
-								<inp2:m_Phrase label="lu_Or"/>
-							</td>
-						</tr>
-						<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-
-						<inp2:m_RenderElement name="inp_edit_box" prefix="u.forgot" field="ForgotEmail" title="lu_fld_Email" style="width: 155px;" is_last="1"/>
-
 						<inp2:m_RenderElement design="inp_edit_buttons">
 							<input type="hidden" name="template_success" value="platform/login/forgot_password_reset_notice"/>
 							<input type="hidden" name="reset_confirm_template" value="platform/login/forgot_password_reset"/>
Index: branches/1.3.x/in-link/links/suggest_link.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-link/links/suggest_link.tpl	(.../suggest_link.tpl)	(revision 15478)
+++ branches/1.3.x/in-link/links/suggest_link.tpl	(.../suggest_link.tpl)	(revision 15665)
@@ -74,20 +74,13 @@
 							<inp2:m_if check="m_ConfigEquals" name="Link_EnhancedLinks" value="1">
 								<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
 
-								<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-									<inp2:m_RenderElement name="inp_edit_field_caption" prefix="l" field="ListingTypeId" title="lu_fld_ListingType"/>
-									<td class="field-value">
-										<inp2:m_if check="l_HasError" field="ListingTypeId">
-											<span class="field-error"><inp2:l_Error field="ListingTypeId"/></span><br />
-										</inp2:m_if>
+								<inp2:m_RenderElement design="form_row" prefix="l" field="ListingTypeId" title="lu_fld_ListingType" is_last="1">
+									<inp2:m_include template="in-link/elements/enhancements.elm"/>
 
-										<inp2:m_include template="in-link/elements/enhancements.elm"/>
-
-										<table>
-											<inp2:l_PredefinedOptions prefix="l" field="ListingTypeId" render_as="suggest_listing_type_element" selected="checked"/>
-										</table>
-									</td>
-								</tr>
+									<table>
+										<inp2:l_PredefinedOptions prefix="l" field="ListingTypeId" render_as="suggest_listing_type_element" selected="checked"/>
+									</table>
+								</inp2:m_RenderElement>
 							</inp2:m_if>
 
 							<inp2:m_RenderElement design="inp_edit_buttons">
Index: branches/1.3.x/in-commerce/elements/forms.elm.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-commerce/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15478)
+++ branches/1.3.x/in-commerce/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15665)
@@ -16,20 +16,11 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_affiliate_payment_types" is_last="0" required="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-
-			<table>
-				<inp2:apt_PrintList render_as="affiliate_payment_type_element" prefix="$prefix" field="$field"/>
-			</table>
-		</td>
-	</tr>
-	
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<table>
+			<inp2:apt_PrintList render_as="affiliate_payment_type_element" prefix="$prefix" field="$field"/>
+		</table>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_affiliate_terms_checkbox" title="" is_last="0">
Index: branches/1.3.x/platform/inc/script.js
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/platform/inc/script.js	(.../script.js)	(revision 15478)
+++ branches/1.3.x/platform/inc/script.js	(.../script.js)	(revision 15665)
@@ -41,6 +41,13 @@
 	}
 };
 
+function get_control($mask, $field, $append, $prepend) {
+	$append = $append !== undefined ? '_' + $append : '';
+	$prepend = $prepend !== undefined ? $prepend + '_' : '';
+
+	return document.getElementById($prepend + $mask.replace('#FIELD_NAME#', $field) + $append);
+}
+
 // ItemCategories class
 function ItemCategories($table_id, $field_id, $primary_category, $phrases) {
 	this.CategoryTable = document.getElementById($table_id);
Index: branches/1.3.x/platform/elements/forms.elm.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15478)
+++ branches/1.3.x/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 15665)
@@ -1,8 +1,10 @@
+<inp2:m_Set tab_index="1"/>
+
 <inp2:m_DefineElement name="error_message">
 	<table class="warning-message fullwidth">
 		<tr>
 			<td width="30">
-				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
+				<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/warning_icon.gif" width="21" height="18" alt=""/>
 			</td>
 			<td>
 				<inp2:m_phrase name="lu_Warning"/>
@@ -14,9 +16,9 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="subsection" break="1">
-	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module='In-Portal'/>img/s.gif" width="3" height="1" alt=""/><br /></div>
 	<div class="sub-section-header"><inp2:m_Phrase label="$title"/></div>
-	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+	<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module='In-Portal'/>img/s.gif" width="3" height="1" alt=""/><br /></div>
 	<inp2:m_if check="m_Param" name="break">
 		<br/>
 	</inp2:m_if>
@@ -25,11 +27,11 @@
 <inp2:m_DefineElement name="inp_edit_buttons" width="default">
 	<tr>
 		<td colspan="2">
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
+			<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" />
 		</td>
 	</tr>
 	<tr>
-		<td style="width: <inp2:m_if check="m_ParamEquals" name="width" value="default">140<inp2:m_else/><inp2:m_Param name="width"/></inp2:m_if>px">&nbsp;
+		<td style="width: <inp2:m_if check='m_Param' name='width' equals_to='default'>140<inp2:m_else/><inp2:m_Param name='width'/></inp2:m_if>px">&nbsp;
 		</td>
 		<td>
 			<br />
@@ -43,68 +45,84 @@
 	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">
 	<tr>
 		<td colspan="2">
-			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+			<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module='In-Portal'/>img/s.gif" width="3" height="1" alt=""/><br /></div>
 		</td>
 	</tr>
 	</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_field_caption" no_editing="1" additional_render_as="" title="">
+<inp2:m_DefineElement name="form_row" prefix="" field="" error_field_suffix="" title="lu_fld_{$field}" hint_label="" is_last="0" field_type="" error_position="top">
 	<inp2:m_inc param="tab_index" by="1"/>
-	<td class="field-name" nowrap>
-		<inp2:m_if check="m_Param" name="title">
-			<label for="<inp2:{$prefix}_InputName field='$field'/>">
-				<span <inp2:m_if check="{$prefix}_HasError" field="$field">class="field-required"</inp2:m_if>>
-				<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
-			</label>
-			<inp2:m_if check="m_Param" name="additional_render_as">
-				<inp2:m_RenderElement name="$additional_render_as" pass_params="1"/>
+
+	<tr class="<inp2:m_odd_even odd='table_color1' even='table_color2'/><inp2:m_if check='{$prefix}_HasError' field='{$field}{$error_field_suffix}'> error</inp2:m_if>" id="<inp2:$prefix_InputName name='$field'/>_row">
+		<td class="field-name" nowrap>
+			<inp2:m_if check="m_Param" name="title">
+				<label for="<inp2:{$prefix}_InputName field='{$field}{$error_field_suffix}'/>">
+					<inp2:m_phrase label="$title"/><inp2:m_if check="{$prefix}_IsRequired" field="{$field}{$error_field_suffix}"><span class="field-required"> *</span></inp2:m_if>:
+				</label>
+				<inp2:m_if check="m_Param" name="additional_render_as">
+					<inp2:m_RenderElement name="$additional_render_as" pass_params="1"/>
+				</inp2:m_if>
+			<inp2:m_else/>
+				&nbsp;
 			</inp2:m_if>
-		<inp2:m_else/>
-			&nbsp;
-		</inp2:m_if>
-	</td>
-</inp2:m_DefineElement>
+		</td>
 
-<inp2:m_DefineElement name="inp_label" as_label="" currency="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
+		<td class="field-value" id="<inp2:{$prefix}_InputName field='$field'/>_field_cell">
+			<inp2:m_if check="m_Param" name="error_position" equals_to="top">
+				<inp2:m_RenderElement name="error_msg_container" pass_params="1"/>
+			</inp2:m_if>
+
+			<inp2:m_Param name="content" pass_params="1"/>
+
+			<inp2:m_if check="{$prefix}_FieldHintLabel" title_label="$title" direct_label="$hint_label">
+				<span class="small"><inp2:$prefix_FieldHintLabel title_label="$title" direct_label="$hint_label"/></span>
+			</inp2:m_if>
+
+			<inp2:m_if check="m_Param" name="error_position" equals_to="right">
+				<inp2:m_RenderElement name="error_msg_container" html_element="span" pass_params="1"/>
+			</inp2:m_if>
+
+			<script type="text/javascript">
+				FormManager.registerField('<inp2:m_Param name="prefix"/>', '<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="formatter" equals_to="kMultiLanguage">l<inp2:m_Get name="m_lang"/>_</inp2:m_if><inp2:m_Param name="field"/>', undefined, '<inp2:m_Param name="field_type"/>');
+			</script>
 		</td>
 	</tr>
+
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_label" as_label="" currency="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-			<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="error_msg_container" html_element="div" error_field_suffix="">
+	<<inp2:m_param name="html_element"/> <inp2:m_if check="{$prefix}_HasError" field="{$field}{$error_field_suffix}">class="field-error"</inp2:m_if> id="<inp2:{$prefix}_InputName field='$field'/>_status_cell">
+		<inp2:m_if check="{$prefix}_HasError" field="{$field}{$error_field_suffix}">
+			<inp2:{$prefix}_Error field="{$field}{$error_field_suffix}"/>
+		</inp2:m_if>
+	</<inp2:m_param name="html_element"/>>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="" no_editing="1" is_last="0" title="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" maxlength="<inp2:m_param name="maxlength"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_label" as_label="" currency="" field_type="label" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_label" as_label="" currency="" field_type="label" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:{$prefix}_Field field="$field" as_label="$as_label" currency="$currency"/>
+		<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='db'/>" />
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="inp_edit_box" style="" maxlength="" field_type="text" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<input type="text" class="input-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'/>" maxlength="<inp2:m_param name='maxlength'/>" style="<inp2:m_param name='style'/>"/>
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="ml_input_element">
 	<inp2:Field name="LanguageId" result_to_var="language_id"/>
 
-	<div id="<inp2:{$prefix}_InputName field="l{$language_id}_{$field}"/>_input"<inp2:m_ifnot check="{$prefix}_LanguageVisible" field="l{$language_id}_{$field}"> style="display: none;"</inp2:m_ifnot>>
+	<div id="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>_input"<inp2:m_ifnot check="{$prefix}_LanguageVisible" field="l{$language_id}_{$field}"> style="display: none;"</inp2:m_ifnot>>
 		<inp2:m_if check="{$prefix}_HasError" field="l{$language_id}_{$field}">
 			<span class="field-error"><inp2:{$prefix}_Error field="l{$language_id}_{$field}"/></span><br/>
 		</inp2:m_if>
@@ -147,188 +165,128 @@
 	</inp2:m_ifnot>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_box_ml" style="" maxlength="" no_editing="1" is_last="0" title="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" additional_render_as="field_languages_element" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:lang.enabled_PrintList render_as="ml_input_element" pass_params="1"/>
+<inp2:m_DefineElement name="inp_edit_box_ml" style="" maxlength="" field_type="text" no_editing="1" is_last="0" error_position="none" additional_render_as="field_languages_element">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:lang.enabled_PrintList render_as="ml_input_element" pass_params="1"/>
 
-			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<script type="text/javascript">
-		<inp2:m_Get name="m_lang" result_to_var="current_language"/>
-		aMultiLanguageSelector.registerControl('<inp2:{$prefix}_InputName field="l{$current_language}_{$field}"/>');
-	</script>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+		<script type="text/javascript">
+			<inp2:m_Get name="m_lang" result_to_var="current_language"/>
+			aMultiLanguageSelector.registerControl('<inp2:{$prefix}_InputName field="l{$current_language}_{$field}"/>');
+		</script>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_password" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="password" class="input-text" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field name='{$field}_plain'/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
-			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_password" style="" field_type="text" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<input type="password" class="input-text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field name='{$field}_plain'/>" tabindex="<inp2:m_get param='tab_index'/>" style="<inp2:m_param name='style'/>" />
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_upload" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
-				(<inp2:{$prefix}_Field field="$field"/>)
-			</inp2:m_if>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_upload" style="" field_type="upload" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<input type="file" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" style="<inp2:m_param name='style'/>"/>
+		<inp2:m_if check="{$prefix}_Field" name="$field" db="db">
+			(<inp2:{$prefix}_Field field="$field"/>)
+		</inp2:m_if>
+		<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field'/>" />
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_image_upload" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="{$prefix}_Field" name="$field">
-				<a href="<inp2:{$prefix}_ImageSrc field="$field" MaxWidth="fullsize"/>" target="_blank">
-					<inp2:{$prefix}_Image field="$field" render_as="image_element" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" align="absmiddle"/>
-				</a>
-				<br />
-				<table cellpadding="0" cellspacing="0" style="margin-top: 3px; margin-bottom: 3px;">
-					<tr>
-						<td>
-							<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
-							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
-						</td>
-						<td style="padding-left: 3px;">
-							<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="lu_btn_DeleteImage"/></label>
-						</td>
-					</tr>
-				</table>
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" /><br />
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}Alt"/>" value="<inp2:{$prefix}_Field field='{$field}Alt'/>" style="<inp2:m_param name="style"/>">
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_image_upload" style="" field_type="upload" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:m_if check="{$prefix}_Field" name="$field">
+			<a href="<inp2:{$prefix}_ImageSrc field='$field' MaxWidth='fullsize'/>" target="_blank">
+				<inp2:{$prefix}_Image field="$field" render_as="image_element" DefaultImage="platform/img/no_picture.gif" MaxWidth="thumbnail" align="absmiddle"/>
+			</a>
+			<br />
+			<table cellpadding="0" cellspacing="0" style="margin-top: 3px; margin-bottom: 3px;">
+				<tr>
+					<td>
+						<input type="hidden" id="<inp2:{$prefix}_InputName field='Delete{$field}'/>" name="<inp2:{$prefix}_InputName field='Delete{$field}'/>" value="0" />
+						<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Delete{$field}'/>'));">
+					</td>
+					<td style="padding-left: 3px;">
+						<label for="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>"><inp2:m_phrase name="lu_btn_DeleteImage"/></label>
+					</td>
+				</tr>
+			</table>
+		</inp2:m_if>
+
+		<input type="file" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" style="<inp2:m_param name='style'/>"/>
+		<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field'/>" /><br />
+		<input type="text" name="<inp2:{$prefix}_InputName field='{$field}Alt'/>" value="<inp2:{$prefix}_Field field='{$field}Alt'/>" style="<inp2:m_param name='style'/>">
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_file_upload" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="{$prefix}_Field" name="$field">
-				<a href="<inp2:{$prefix}_DownloadFileLink field="$field"/>">
-					<inp2:{$prefix}_Field name="$field"/>
-				</a>
-				<br />
-				<table cellpadding="0" cellspacing="0">
-					<tr>
-						<td>
-							<input type="hidden" id="<inp2:{$prefix}_InputName field="Delete{$field}"/>" name="<inp2:{$prefix}_InputName field="Delete{$field}"/>" value="0" />
-							<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="Delete{$field}"/>'));">
-						</td>
-						<td>
-							<label for="_cb_<inp2:{$prefix}_InputName field="Delete{$field}"/>"><inp2:m_phrase name="lu_btn_DeleteFile"/></label>
-						</td>
-					</tr>
-				</table>
-			</inp2:m_if>
-			<input type="file" name="<inp2:{$prefix}_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>[upload]" value="<inp2:{$prefix}_Field field="$field"/>" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_file_upload" style="" field_type="upload" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:m_if check="{$prefix}_Field" name="$field">
+			<a href="<inp2:{$prefix}_DownloadFileLink field='$field'/>">
+				<inp2:{$prefix}_Field name="$field"/>
+			</a>
+			<br />
+			<table cellpadding="0" cellspacing="0">
+				<tr>
+					<td>
+						<input type="hidden" id="<inp2:{$prefix}_InputName field='Delete{$field}'/>" name="<inp2:{$prefix}_InputName field='Delete{$field}'/>" value="0" />
+						<input type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='Delete{$field}'/>'));">
+					</td>
+					<td>
+						<label for="_cb_<inp2:{$prefix}_InputName field='Delete{$field}'/>"><inp2:m_phrase name="lu_btn_DeleteFile"/></label>
+					</td>
+				</tr>
+			</table>
+		</inp2:m_if>
+		<input type="file" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" style="<inp2:m_param name='style'/>"/>
+		<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>[upload]" value="<inp2:{$prefix}_Field field='$field'/>" />
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_hidden" db="">
-	<input type="hidden" name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="$db"/>" />
+	<input type="hidden" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='$db'/>" />
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_date" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="{$field}_date"/></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-			initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
-			</script>
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time" input_format="1"/>" value="" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_date" style="" field_type="date" no_editing="1" is_last="0" error_field_suffix="_date">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date'/>" value="<inp2:{$prefix}_Field field='{$field}_date' format='_input_'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_date' input_format='1' edit_size='edit_size'/>" style="<inp2:m_param name='style'/>" datepickerIcon="<inp2:m_TemplatesBase module='In-Portal'/>img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+		<script type="text/javascript">
+			initCalendar("<inp2:{$prefix}_InputName field='{$field}_date'/>", "<inp2:{$prefix}_Format field='{$field}_date' input_format='1'/>");
+		</script>
+
+		<input type="hidden" name="<inp2:{$prefix}_InputName field='{$field}_time'/>" id="<inp2:{$prefix}_InputName field='{$field}_time' input_format='1'/>" value="" />
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_time" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>">&nbsp;
-			<span class="small">(<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
+<inp2:m_DefineElement name="inp_edit_time" style="" field_type="time" no_editing="1" is_last="0" error_field_suffix="_time">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_time'/>" id="<inp2:{$prefix}_InputName field='{$field}_time'/>" value="<inp2:{$prefix}_Field field='{$field}_time' format='_input_'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_time' input_format='1' edit_size='edit_size'/>" style="<inp2:m_param name='style'/>"/>&nbsp;
+		<span class="small">(<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
 
-			<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date" input_format="1"/>" value="" />
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+		<input type="hidden" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date' input_format='1'/>" value="" />
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_date_time" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
-				<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
-			<script type="text/javascript">
-			initCalendar("<inp2:{$prefix}_InputName field="{$field}_date"/>", "<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>");
-			</script>
-			&nbsp;<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time"/>" value="<inp2:{$prefix}_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>"><span class="small"> (<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_date_time" style="" field_type="date_time" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_date'/>" id="<inp2:{$prefix}_InputName field='{$field}_date'/>" value="<inp2:{$prefix}_Field field='{$field}_date' format='_input_'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_date' input_format='1' edit_size='edit_size'/>" style="<inp2:m_param name='style'/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif"/>
+			<span class="small">(<inp2:{$prefix}_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+		<script type="text/javascript">
+			initCalendar("<inp2:{$prefix}_InputName field='{$field}_date'/>", "<inp2:{$prefix}_Format field='{$field}_date' input_format='1'/>");
+		</script>
+		&nbsp;<input type="text" name="<inp2:{$prefix}_InputName field='{$field}_time'/>" id="<inp2:{$prefix}_InputName field='{$field}_time'/>" value="<inp2:{$prefix}_Field field='{$field}_time' format='_input_'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:{$prefix}_Format field='{$field}_time' input_format='1' edit_size='edit_size'/>" style="<inp2:m_param name='style'/>"><span class="small"> (<inp2:{$prefix}_Format field="{$field}_time" input_format="1" human="true"/>)</span>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea" style="" no_editing="1" format="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:{$prefix}_Field field="$field" format="$format"/></textarea>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_textarea" style="" field_type="textarea" no_editing="1" format="" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<textarea class="input-textarea" tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" cols="<inp2:m_param name='cols'/>" rows="<inp2:m_param name='rows'/>" style="<inp2:m_param name='style'/>"><inp2:{$prefix}_Field field="$field" format="$format"/></textarea>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="ml_textarea_element">
 	<inp2:Field name="LanguageId" result_to_var="language_id"/>
 
-	<div id="<inp2:{$prefix}_InputName field="l{$language_id}_{$field}"/>_input"<inp2:m_ifnot check="{$prefix}_LanguageVisible" field="l{$language_id}_{$field}"> style="display: none;"</inp2:m_ifnot>>
+	<div id="<inp2:{$prefix}_InputName field='l{$language_id}_{$field}'/>_input"<inp2:m_ifnot check="{$prefix}_LanguageVisible" field="l{$language_id}_{$field}"> style="display: none;"</inp2:m_ifnot>>
 		<inp2:m_if check="{$prefix}_HasError" field="l{$language_id}_{$field}">
 			<span class="field-error"><inp2:{$prefix}_Error field="l{$language_id}_{$field}"/></span><br/>
 		</inp2:m_if>
@@ -348,236 +306,185 @@
 	<div style="clear: both;"></div>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea_ml" style="" maxlength="" no_editing="1" is_last="0" title="">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" additional_render_as="field_languages_element" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:lang.enabled_PrintList render_as="ml_textarea_element" pass_params="1"/>
+<inp2:m_DefineElement name="inp_edit_textarea_ml" style="" maxlength="" field_type="textarea" no_editing="1" is_last="0" additional_render_as="field_languages_element">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:lang.enabled_PrintList render_as="ml_textarea_element" pass_params="1"/>
 
-			<inp2:m_if check="m_Param" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
-		</td>
-	</tr>
-	<script type="text/javascript">
-		<inp2:m_Get name="m_lang" result_to_var="current_language"/>
-		aMultiLanguageSelector.registerControl('<inp2:{$prefix}_InputName field="l{$current_language}_{$field}"/>');
-	</script>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+		<script type="text/javascript">
+			<inp2:m_Get name="m_lang" result_to_var="current_language"/>
+			aMultiLanguageSelector.registerControl('<inp2:{$prefix}_InputName field="l{$current_language}_{$field}"/>');
+		</script>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_option_item">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
+	<option value="<inp2:m_param name='key'/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_option_phrase">
-	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
+	<option value="<inp2:m_param name='key'/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="" field_type="select" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<select class="input-select" tabindex="<inp2:m_get param='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" style="<inp2:m_param name='style'/>">
+			<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
+				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
+			<inp2:m_else/>
+				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
 			</inp2:m_if>
-			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:{$prefix}_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
-				<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1" >
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				<inp2:m_else/>
-					<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
-				</inp2:m_if>
-			</select>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+		</select>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_timezone" style="" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<script type="text/javascript">
+			var $timezones = {
+				'Africa': ['Africa/Abidjan', 'Africa/Accra', 'Africa/Addis_Ababa', 'Africa/Algiers', 'Africa/Asmara', 'Africa/Asmera', 'Africa/Bamako', 'Africa/Bangui', 'Africa/Banjul', 'Africa/Bissau', 'Africa/Blantyre', 'Africa/Brazzaville', 'Africa/Bujumbura', 'Africa/Cairo', 'Africa/Casablanca', 'Africa/Ceuta', 'Africa/Conakry', 'Africa/Dakar', 'Africa/Dar_es_Salaam', 'Africa/Djibouti', 'Africa/Douala', 'Africa/El_Aaiun', 'Africa/Freetown', 'Africa/Gaborone', 'Africa/Harare', 'Africa/Johannesburg', 'Africa/Kampala', 'Africa/Khartoum', 'Africa/Kigali', 'Africa/Kinshasa', 'Africa/Lagos', 'Africa/Libreville', 'Africa/Lome', 'Africa/Luanda', 'Africa/Lubumbashi', 'Africa/Lusaka', 'Africa/Malabo', 'Africa/Maputo', 'Africa/Maseru', 'Africa/Mbabane', 'Africa/Mogadishu', 'Africa/Monrovia', 'Africa/Nairobi', 'Africa/Ndjamena', 'Africa/Niamey', 'Africa/Nouakchott', 'Africa/Ouagadougou', 'Africa/Porto-Novo', 'Africa/Sao_Tome', 'Africa/Timbuktu', 'Africa/Tripoli', 'Africa/Tunis', 'Africa/Windhoek'],
+				'America': ['America/Adak', 'America/Anchorage', 'America/Anguilla', 'America/Antigua', 'America/Araguaina', 'America/Argentina/Buenos_Aires', 'America/Argentina/Catamarca', 'America/Argentina/ComodRivadavia', 'America/Argentina/Cordoba', 'America/Argentina/Jujuy', 'America/Argentina/La_Rioja', 'America/Argentina/Mendoza', 'America/Argentina/Rio_Gallegos', 'America/Argentina/Salta', 'America/Argentina/San_Juan', 'America/Argentina/San_Luis', 'America/Argentina/Tucuman', 'America/Argentina/Ushuaia', 'America/Aruba', 'America/Asuncion', 'America/Atikokan', 'America/Atka', 'America/Bahia', 'America/Barbados', 'America/Belem', 'America/Belize', 'America/Blanc-Sablon', 'America/Boa_Vista', 'America/Bogota', 'America/Boise', 'America/Buenos_Aires', 'America/Cambridge_Bay', 'America/Campo_Grande', 'America/Cancun', 'America/Caracas', 'America/Catamarca', 'America/Cayenne', 'America/Cayman', 'America/Chicago', 'America/Chihuahua', 'America/Coral_Harbour', 'America/Cordoba', 'America/Costa_Rica', 'America/Cuiaba', 'America/Curacao', 'America/Danmarkshavn', 'America/Dawson', 'America/Dawson_Creek', 'America/Denver', 'America/Detroit', 'America/Dominica', 'America/Edmonton', 'America/Eirunepe', 'America/El_Salvador', 'America/Ensenada', 'America/Fort_Wayne', 'America/Fortaleza', 'America/Glace_Bay', 'America/Godthab', 'America/Goose_Bay', 'America/Grand_Turk', 'America/Grenada', 'America/Guadeloupe', 'America/Guatemala', 'America/Guayaquil', 'America/Guyana', 'America/Halifax', 'America/Havana', 'America/Hermosillo', 'America/Indiana/Indianapolis', 'America/Indiana/Knox', 'America/Indiana/Marengo', 'America/Indiana/Petersburg', 'America/Indiana/Tell_City', 'America/Indiana/Vevay', 'America/Indiana/Vincennes', 'America/Indiana/Winamac', 'America/Indianapolis', 'America/Inuvik', 'America/Iqaluit', 'America/Jamaica', 'America/Jujuy', 'America/Juneau', 'America/Kentucky/Louisville', 'America/Kentucky/Monticello', 'America/Knox_IN', 'America/La_Paz', 'America/Lima', 'America/Los_Angeles', 'America/Louisville', 'America/Maceio', 'America/Managua', 'America/Manaus', 'America/Marigot', 'America/Martinique', 'America/Matamoros', 'America/Mazatlan', 'America/Mendoza', 'America/Menominee', 'America/Merida', 'America/Mexico_City', 'America/Miquelon', 'America/Moncton', 'America/Monterrey', 'America/Montevideo', 'America/Montreal', 'America/Montserrat', 'America/Nassau', 'America/New_York', 'America/Nipigon', 'America/Nome', 'America/Noronha', 'America/North_Dakota/Center', 'America/North_Dakota/New_Salem', 'America/Ojinaga', 'America/Panama', 'America/Pangnirtung', 'America/Paramaribo', 'America/Phoenix', 'America/Port-au-Prince', 'America/Port_of_Spain', 'America/Porto_Acre', 'America/Porto_Velho', 'America/Puerto_Rico', 'America/Rainy_River', 'America/Rankin_Inlet', 'America/Recife', 'America/Regina', 'America/Resolute', 'America/Rio_Branco', 'America/Rosario', 'America/Santa_Isabel', 'America/Santarem', 'America/Santiago', 'America/Santo_Domingo', 'America/Sao_Paulo', 'America/Scoresbysund', 'America/Shiprock', 'America/St_Barthelemy', 'America/St_Johns', 'America/St_Kitts', 'America/St_Lucia', 'America/St_Thomas', 'America/St_Vincent', 'America/Swift_Current', 'America/Tegucigalpa', 'America/Thule', 'America/Thunder_Bay', 'America/Tijuana', 'America/Toronto', 'America/Tortola', 'America/Vancouver', 'America/Virgin', 'America/Whitehorse', 'America/Winnipeg', 'America/Yakutat', 'America/Yellowknife'],
+				'Antarctica': ['Antarctica/Casey', 'Antarctica/Davis', 'Antarctica/DumontDUrville', 'Antarctica/Macquarie', 'Antarctica/Mawson', 'Antarctica/McMurdo', 'Antarctica/Palmer', 'Antarctica/Rothera', 'Antarctica/South_Pole', 'Antarctica/Syowa', 'Antarctica/Vostok'],
+				'Arctic': ['Arctic/Longyearbyen'],
+				'Asia': ['Asia/Aden', 'Asia/Almaty', 'Asia/Amman', 'Asia/Anadyr', 'Asia/Aqtau', 'Asia/Aqtobe', 'Asia/Ashgabat', 'Asia/Ashkhabad', 'Asia/Baghdad', 'Asia/Bahrain', 'Asia/Baku', 'Asia/Bangkok', 'Asia/Beirut', 'Asia/Bishkek', 'Asia/Brunei', 'Asia/Calcutta', 'Asia/Choibalsan', 'Asia/Chongqing', 'Asia/Chungking', 'Asia/Colombo', 'Asia/Dacca', 'Asia/Damascus', 'Asia/Dhaka', 'Asia/Dili', 'Asia/Dubai', 'Asia/Dushanbe', 'Asia/Gaza', 'Asia/Harbin', 'Asia/Ho_Chi_Minh', 'Asia/Hong_Kong', 'Asia/Hovd', 'Asia/Irkutsk', 'Asia/Istanbul', 'Asia/Jakarta', 'Asia/Jayapura', 'Asia/Jerusalem', 'Asia/Kabul', 'Asia/Kamchatka', 'Asia/Karachi', 'Asia/Kashgar', 'Asia/Kathmandu', 'Asia/Katmandu', 'Asia/Kolkata', 'Asia/Krasnoyarsk', 'Asia/Kuala_Lumpur', 'Asia/Kuching', 'Asia/Kuwait', 'Asia/Macao', 'Asia/Macau', 'Asia/Magadan', 'Asia/Makassar', 'Asia/Manila', 'Asia/Muscat', 'Asia/Nicosia', 'Asia/Novokuznetsk', 'Asia/Novosibirsk', 'Asia/Omsk', 'Asia/Oral', 'Asia/Phnom_Penh', 'Asia/Pontianak', 'Asia/Pyongyang', 'Asia/Qatar', 'Asia/Qyzylorda', 'Asia/Rangoon', 'Asia/Riyadh', 'Asia/Saigon', 'Asia/Sakhalin', 'Asia/Samarkand', 'Asia/Seoul', 'Asia/Shanghai', 'Asia/Singapore', 'Asia/Taipei', 'Asia/Tashkent', 'Asia/Tbilisi', 'Asia/Tehran', 'Asia/Tel_Aviv', 'Asia/Thimbu', 'Asia/Thimphu', 'Asia/Tokyo', 'Asia/Ujung_Pandang', 'Asia/Ulaanbaatar', 'Asia/Ulan_Bator', 'Asia/Urumqi', 'Asia/Vientiane', 'Asia/Vladivostok', 'Asia/Yakutsk', 'Asia/Yekaterinburg', 'Asia/Yerevan'],
+				'Atlantic': ['Atlantic/Azores', 'Atlantic/Bermuda', 'Atlantic/Canary', 'Atlantic/Cape_Verde', 'Atlantic/Faeroe', 'Atlantic/Faroe', 'Atlantic/Jan_Mayen', 'Atlantic/Madeira', 'Atlantic/Reykjavik', 'Atlantic/South_Georgia', 'Atlantic/St_Helena', 'Atlantic/Stanley'],
+				'Australia': ['Australia/ACT', 'Australia/Adelaide', 'Australia/Brisbane', 'Australia/Broken_Hill', 'Australia/Canberra', 'Australia/Currie', 'Australia/Darwin', 'Australia/Eucla', 'Australia/Hobart', 'Australia/LHI', 'Australia/Lindeman', 'Australia/Lord_Howe', 'Australia/Melbourne', 'Australia/North', 'Australia/NSW', 'Australia/Perth', 'Australia/Queensland', 'Australia/South', 'Australia/Sydney', 'Australia/Tasmania', 'Australia/Victoria', 'Australia/West', 'Australia/Yancowinna'],
+				'Europe': ['Europe/Amsterdam', 'Europe/Andorra', 'Europe/Athens', 'Europe/Belfast', 'Europe/Belgrade', 'Europe/Berlin', 'Europe/Bratislava', 'Europe/Brussels', 'Europe/Bucharest', 'Europe/Budapest', 'Europe/Chisinau', 'Europe/Copenhagen', 'Europe/Dublin', 'Europe/Gibraltar', 'Europe/Guernsey', 'Europe/Helsinki', 'Europe/Isle_of_Man', 'Europe/Istanbul', 'Europe/Jersey', 'Europe/Kaliningrad', 'Europe/Kiev', 'Europe/Lisbon', 'Europe/Ljubljana', 'Europe/London', 'Europe/Luxembourg', 'Europe/Madrid', 'Europe/Malta', 'Europe/Mariehamn', 'Europe/Minsk', 'Europe/Monaco', 'Europe/Moscow', 'Europe/Nicosia', 'Europe/Oslo', 'Europe/Paris', 'Europe/Podgorica', 'Europe/Prague', 'Europe/Riga', 'Europe/Rome', 'Europe/Samara', 'Europe/San_Marino', 'Europe/Sarajevo', 'Europe/Simferopol', 'Europe/Skopje', 'Europe/Sofia', 'Europe/Stockholm', 'Europe/Tallinn', 'Europe/Tirane', 'Europe/Tiraspol', 'Europe/Uzhgorod', 'Europe/Vaduz', 'Europe/Vatican', 'Europe/Vienna', 'Europe/Vilnius', 'Europe/Volgograd', 'Europe/Warsaw', 'Europe/Zagreb', 'Europe/Zaporozhye', 'Europe/Zurich'],
+				'Indian': ['Indian/Antananarivo', 'Indian/Chagos', 'Indian/Christmas', 'Indian/Cocos', 'Indian/Comoro', 'Indian/Kerguelen', 'Indian/Mahe', 'Indian/Maldives', 'Indian/Mauritius', 'Indian/Mayotte', 'Indian/Reunion'],
+				'Pacific': ['Pacific/Apia', 'Pacific/Auckland', 'Pacific/Chatham', 'Pacific/Easter', 'Pacific/Efate', 'Pacific/Enderbury', 'Pacific/Fakaofo', 'Pacific/Fiji', 'Pacific/Funafuti', 'Pacific/Galapagos', 'Pacific/Gambier', 'Pacific/Guadalcanal', 'Pacific/Guam', 'Pacific/Honolulu', 'Pacific/Johnston', 'Pacific/Kiritimati', 'Pacific/Kosrae', 'Pacific/Kwajalein', 'Pacific/Majuro', 'Pacific/Marquesas', 'Pacific/Midway', 'Pacific/Nauru', 'Pacific/Niue', 'Pacific/Norfolk', 'Pacific/Noumea', 'Pacific/Pago_Pago', 'Pacific/Palau', 'Pacific/Pitcairn', 'Pacific/Ponape', 'Pacific/Port_Moresby', 'Pacific/Rarotonga', 'Pacific/Saipan', 'Pacific/Samoa', 'Pacific/Tahiti', 'Pacific/Tarawa', 'Pacific/Tongatapu', 'Pacific/Truk', 'Pacific/Wake', 'Pacific/Wallis', 'Pacific/Yap'],
+				'Others': ['UTC']
+			};
 
-			<script type="text/javascript">
-				var $timezones = {
-					'Africa': ['Africa/Abidjan', 'Africa/Accra', 'Africa/Addis_Ababa', 'Africa/Algiers', 'Africa/Asmara', 'Africa/Asmera', 'Africa/Bamako', 'Africa/Bangui', 'Africa/Banjul', 'Africa/Bissau', 'Africa/Blantyre', 'Africa/Brazzaville', 'Africa/Bujumbura', 'Africa/Cairo', 'Africa/Casablanca', 'Africa/Ceuta', 'Africa/Conakry', 'Africa/Dakar', 'Africa/Dar_es_Salaam', 'Africa/Djibouti', 'Africa/Douala', 'Africa/El_Aaiun', 'Africa/Freetown', 'Africa/Gaborone', 'Africa/Harare', 'Africa/Johannesburg', 'Africa/Kampala', 'Africa/Khartoum', 'Africa/Kigali', 'Africa/Kinshasa', 'Africa/Lagos', 'Africa/Libreville', 'Africa/Lome', 'Africa/Luanda', 'Africa/Lubumbashi', 'Africa/Lusaka', 'Africa/Malabo', 'Africa/Maputo', 'Africa/Maseru', 'Africa/Mbabane', 'Africa/Mogadishu', 'Africa/Monrovia', 'Africa/Nairobi', 'Africa/Ndjamena', 'Africa/Niamey', 'Africa/Nouakchott', 'Africa/Ouagadougou', 'Africa/Porto-Novo', 'Africa/Sao_Tome', 'Africa/Timbuktu', 'Africa/Tripoli', 'Africa/Tunis', 'Africa/Windhoek'],
-					'America': ['America/Adak', 'America/Anchorage', 'America/Anguilla', 'America/Antigua', 'America/Araguaina', 'America/Argentina/Buenos_Aires', 'America/Argentina/Catamarca', 'America/Argentina/ComodRivadavia', 'America/Argentina/Cordoba', 'America/Argentina/Jujuy', 'America/Argentina/La_Rioja', 'America/Argentina/Mendoza', 'America/Argentina/Rio_Gallegos', 'America/Argentina/Salta', 'America/Argentina/San_Juan', 'America/Argentina/San_Luis', 'America/Argentina/Tucuman', 'America/Argentina/Ushuaia', 'America/Aruba', 'America/Asuncion', 'America/Atikokan', 'America/Atka', 'America/Bahia', 'America/Barbados', 'America/Belem', 'America/Belize', 'America/Blanc-Sablon', 'America/Boa_Vista', 'America/Bogota', 'America/Boise', 'America/Buenos_Aires', 'America/Cambridge_Bay', 'America/Campo_Grande', 'America/Cancun', 'America/Caracas', 'America/Catamarca', 'America/Cayenne', 'America/Cayman', 'America/Chicago', 'America/Chihuahua', 'America/Coral_Harbour', 'America/Cordoba', 'America/Costa_Rica', 'America/Cuiaba', 'America/Curacao', 'America/Danmarkshavn', 'America/Dawson', 'America/Dawson_Creek', 'America/Denver', 'America/Detroit', 'America/Dominica', 'America/Edmonton', 'America/Eirunepe', 'America/El_Salvador', 'America/Ensenada', 'America/Fort_Wayne', 'America/Fortaleza', 'America/Glace_Bay', 'America/Godthab', 'America/Goose_Bay', 'America/Grand_Turk', 'America/Grenada', 'America/Guadeloupe', 'America/Guatemala', 'America/Guayaquil', 'America/Guyana', 'America/Halifax', 'America/Havana', 'America/Hermosillo', 'America/Indiana/Indianapolis', 'America/Indiana/Knox', 'America/Indiana/Marengo', 'America/Indiana/Petersburg', 'America/Indiana/Tell_City', 'America/Indiana/Vevay', 'America/Indiana/Vincennes', 'America/Indiana/Winamac', 'America/Indianapolis', 'America/Inuvik', 'America/Iqaluit', 'America/Jamaica', 'America/Jujuy', 'America/Juneau', 'America/Kentucky/Louisville', 'America/Kentucky/Monticello', 'America/Knox_IN', 'America/La_Paz', 'America/Lima', 'America/Los_Angeles', 'America/Louisville', 'America/Maceio', 'America/Managua', 'America/Manaus', 'America/Marigot', 'America/Martinique', 'America/Matamoros', 'America/Mazatlan', 'America/Mendoza', 'America/Menominee', 'America/Merida', 'America/Mexico_City', 'America/Miquelon', 'America/Moncton', 'America/Monterrey', 'America/Montevideo', 'America/Montreal', 'America/Montserrat', 'America/Nassau', 'America/New_York', 'America/Nipigon', 'America/Nome', 'America/Noronha', 'America/North_Dakota/Center', 'America/North_Dakota/New_Salem', 'America/Ojinaga', 'America/Panama', 'America/Pangnirtung', 'America/Paramaribo', 'America/Phoenix', 'America/Port-au-Prince', 'America/Port_of_Spain', 'America/Porto_Acre', 'America/Porto_Velho', 'America/Puerto_Rico', 'America/Rainy_River', 'America/Rankin_Inlet', 'America/Recife', 'America/Regina', 'America/Resolute', 'America/Rio_Branco', 'America/Rosario', 'America/Santa_Isabel', 'America/Santarem', 'America/Santiago', 'America/Santo_Domingo', 'America/Sao_Paulo', 'America/Scoresbysund', 'America/Shiprock', 'America/St_Barthelemy', 'America/St_Johns', 'America/St_Kitts', 'America/St_Lucia', 'America/St_Thomas', 'America/St_Vincent', 'America/Swift_Current', 'America/Tegucigalpa', 'America/Thule', 'America/Thunder_Bay', 'America/Tijuana', 'America/Toronto', 'America/Tortola', 'America/Vancouver', 'America/Virgin', 'America/Whitehorse', 'America/Winnipeg', 'America/Yakutat', 'America/Yellowknife'],
-					'Antarctica': ['Antarctica/Casey', 'Antarctica/Davis', 'Antarctica/DumontDUrville', 'Antarctica/Macquarie', 'Antarctica/Mawson', 'Antarctica/McMurdo', 'Antarctica/Palmer', 'Antarctica/Rothera', 'Antarctica/South_Pole', 'Antarctica/Syowa', 'Antarctica/Vostok'],
-					'Arctic': ['Arctic/Longyearbyen'],
-					'Asia': ['Asia/Aden', 'Asia/Almaty', 'Asia/Amman', 'Asia/Anadyr', 'Asia/Aqtau', 'Asia/Aqtobe', 'Asia/Ashgabat', 'Asia/Ashkhabad', 'Asia/Baghdad', 'Asia/Bahrain', 'Asia/Baku', 'Asia/Bangkok', 'Asia/Beirut', 'Asia/Bishkek', 'Asia/Brunei', 'Asia/Calcutta', 'Asia/Choibalsan', 'Asia/Chongqing', 'Asia/Chungking', 'Asia/Colombo', 'Asia/Dacca', 'Asia/Damascus', 'Asia/Dhaka', 'Asia/Dili', 'Asia/Dubai', 'Asia/Dushanbe', 'Asia/Gaza', 'Asia/Harbin', 'Asia/Ho_Chi_Minh', 'Asia/Hong_Kong', 'Asia/Hovd', 'Asia/Irkutsk', 'Asia/Istanbul', 'Asia/Jakarta', 'Asia/Jayapura', 'Asia/Jerusalem', 'Asia/Kabul', 'Asia/Kamchatka', 'Asia/Karachi', 'Asia/Kashgar', 'Asia/Kathmandu', 'Asia/Katmandu', 'Asia/Kolkata', 'Asia/Krasnoyarsk', 'Asia/Kuala_Lumpur', 'Asia/Kuching', 'Asia/Kuwait', 'Asia/Macao', 'Asia/Macau', 'Asia/Magadan', 'Asia/Makassar', 'Asia/Manila', 'Asia/Muscat', 'Asia/Nicosia', 'Asia/Novokuznetsk', 'Asia/Novosibirsk', 'Asia/Omsk', 'Asia/Oral', 'Asia/Phnom_Penh', 'Asia/Pontianak', 'Asia/Pyongyang', 'Asia/Qatar', 'Asia/Qyzylorda', 'Asia/Rangoon', 'Asia/Riyadh', 'Asia/Saigon', 'Asia/Sakhalin', 'Asia/Samarkand', 'Asia/Seoul', 'Asia/Shanghai', 'Asia/Singapore', 'Asia/Taipei', 'Asia/Tashkent', 'Asia/Tbilisi', 'Asia/Tehran', 'Asia/Tel_Aviv', 'Asia/Thimbu', 'Asia/Thimphu', 'Asia/Tokyo', 'Asia/Ujung_Pandang', 'Asia/Ulaanbaatar', 'Asia/Ulan_Bator', 'Asia/Urumqi', 'Asia/Vientiane', 'Asia/Vladivostok', 'Asia/Yakutsk', 'Asia/Yekaterinburg', 'Asia/Yerevan'],
-					'Atlantic': ['Atlantic/Azores', 'Atlantic/Bermuda', 'Atlantic/Canary', 'Atlantic/Cape_Verde', 'Atlantic/Faeroe', 'Atlantic/Faroe', 'Atlantic/Jan_Mayen', 'Atlantic/Madeira', 'Atlantic/Reykjavik', 'Atlantic/South_Georgia', 'Atlantic/St_Helena', 'Atlantic/Stanley'],
-					'Australia': ['Australia/ACT', 'Australia/Adelaide', 'Australia/Brisbane', 'Australia/Broken_Hill', 'Australia/Canberra', 'Australia/Currie', 'Australia/Darwin', 'Australia/Eucla', 'Australia/Hobart', 'Australia/LHI', 'Australia/Lindeman', 'Australia/Lord_Howe', 'Australia/Melbourne', 'Australia/North', 'Australia/NSW', 'Australia/Perth', 'Australia/Queensland', 'Australia/South', 'Australia/Sydney', 'Australia/Tasmania', 'Australia/Victoria', 'Australia/West', 'Australia/Yancowinna'],
-					'Europe': ['Europe/Amsterdam', 'Europe/Andorra', 'Europe/Athens', 'Europe/Belfast', 'Europe/Belgrade', 'Europe/Berlin', 'Europe/Bratislava', 'Europe/Brussels', 'Europe/Bucharest', 'Europe/Budapest', 'Europe/Chisinau', 'Europe/Copenhagen', 'Europe/Dublin', 'Europe/Gibraltar', 'Europe/Guernsey', 'Europe/Helsinki', 'Europe/Isle_of_Man', 'Europe/Istanbul', 'Europe/Jersey', 'Europe/Kaliningrad', 'Europe/Kiev', 'Europe/Lisbon', 'Europe/Ljubljana', 'Europe/London', 'Europe/Luxembourg', 'Europe/Madrid', 'Europe/Malta', 'Europe/Mariehamn', 'Europe/Minsk', 'Europe/Monaco', 'Europe/Moscow', 'Europe/Nicosia', 'Europe/Oslo', 'Europe/Paris', 'Europe/Podgorica', 'Europe/Prague', 'Europe/Riga', 'Europe/Rome', 'Europe/Samara', 'Europe/San_Marino', 'Europe/Sarajevo', 'Europe/Simferopol', 'Europe/Skopje', 'Europe/Sofia', 'Europe/Stockholm', 'Europe/Tallinn', 'Europe/Tirane', 'Europe/Tiraspol', 'Europe/Uzhgorod', 'Europe/Vaduz', 'Europe/Vatican', 'Europe/Vienna', 'Europe/Vilnius', 'Europe/Volgograd', 'Europe/Warsaw', 'Europe/Zagreb', 'Europe/Zaporozhye', 'Europe/Zurich'],
-					'Indian': ['Indian/Antananarivo', 'Indian/Chagos', 'Indian/Christmas', 'Indian/Cocos', 'Indian/Comoro', 'Indian/Kerguelen', 'Indian/Mahe', 'Indian/Maldives', 'Indian/Mauritius', 'Indian/Mayotte', 'Indian/Reunion'],
-					'Pacific': ['Pacific/Apia', 'Pacific/Auckland', 'Pacific/Chatham', 'Pacific/Easter', 'Pacific/Efate', 'Pacific/Enderbury', 'Pacific/Fakaofo', 'Pacific/Fiji', 'Pacific/Funafuti', 'Pacific/Galapagos', 'Pacific/Gambier', 'Pacific/Guadalcanal', 'Pacific/Guam', 'Pacific/Honolulu', 'Pacific/Johnston', 'Pacific/Kiritimati', 'Pacific/Kosrae', 'Pacific/Kwajalein', 'Pacific/Majuro', 'Pacific/Marquesas', 'Pacific/Midway', 'Pacific/Nauru', 'Pacific/Niue', 'Pacific/Norfolk', 'Pacific/Noumea', 'Pacific/Pago_Pago', 'Pacific/Palau', 'Pacific/Pitcairn', 'Pacific/Ponape', 'Pacific/Port_Moresby', 'Pacific/Rarotonga', 'Pacific/Saipan', 'Pacific/Samoa', 'Pacific/Tahiti', 'Pacific/Tarawa', 'Pacific/Tongatapu', 'Pacific/Truk', 'Pacific/Wake', 'Pacific/Wallis', 'Pacific/Yap'],
-					'Others': ['UTC']
-				}
+			function change_timezone_group($timezone_group) {
+				var $target = $( jq('#<inp2:InputName name="$field"/>') );
 
-				function change_timezone_group($timezone_group) {
-					var $target = $( jq('#<inp2:InputName name="$field"/>') );
+				$target.hide().empty();
+				$target.append('<option value=""></option>');
 
-					$target.hide().empty();
-					$target.append('<option value=""></option>');
+				if ($timezone_group == '') {
+					return ;
+				}
 
-					if ($timezone_group == '') {
-						return ;
-					}
+				for (var $i = 0; $i < $timezones[$timezone_group].length; $i++) {
+					var $timezone = $timezones[$timezone_group][$i];
+					var $selected = $timezone == $current_timezone ? ' selected="selected"' : '';
 
-					for (var $i = 0; $i < $timezones[$timezone_group].length; $i++) {
-						var $timezone = $timezones[$timezone_group][$i];
-						var $selected = $timezone == $current_timezone ? ' selected="selected"' : '';
-
-						$target.append('<option value="' + $timezone + '" ' + $selected + '>' + $timezone + '</option>');
-					}
-
-					$target.show();
+					$target.append('<option value="' + $timezone + '" ' + $selected + '>' + $timezone + '</option>');
 				}
 
-				var $current_timezone = '<inp2:Field name="$field"/>';
+				$target.show();
+			}
 
-				$(document).ready(
-					function () {
-						$('#timezone_group').change(
-							function ($e) {
-								change_timezone_group( $(this).val() );
-							}
-						);
+			var $current_timezone = '<inp2:Field name="$field"/>';
 
-						var $current_timezone_group = '';
-
-						for (var $timezone_group in $timezones) {
-							if (in_array($current_timezone, $timezones[$timezone_group])) {
-								$current_timezone_group = $timezone_group;
-								break;
-							}
+			$(document).ready(
+				function () {
+					$('#timezone_group').change(
+						function ($e) {
+							change_timezone_group( $(this).val() );
 						}
+					);
 
-						$('#timezone_group').val($current_timezone_group).change();
+					var $current_timezone_group = '';
+
+					for (var $timezone_group in $timezones) {
+						if (in_array($current_timezone, $timezones[$timezone_group])) {
+							$current_timezone_group = $timezone_group;
+							break;
+						}
 					}
-				);
-			</script>
 
-			<select class="input-select" id="timezone_group" tabindex="<inp2:m_Get name='tab_index'/>">
-				<option value=""></option>
-				<option value="Africa">Africa</option>
-				<option value="America">America</option>
-				<option value="Antarctica">Antarctica</option>
-				<option value="Arctic">Arctic</option>
-				<option value="Asia">Asia</option>
-				<option value="Atlantic">Atlantic</option>
-				<option value="Australia">Australia</option>
-				<option value="Europe">Europe</option>
-				<option value="Indian">Indian</option>
-				<option value="Pacific">Pacific</option>
-				<option value="Others">Others</option>
-			</select>
-			&nbsp;&nbsp;
+					$('#timezone_group').val($current_timezone_group).change();
+				}
+			);
+		</script>
 
-			<select class="input-select" tabindex="<inp2:m_Get name='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" style="<inp2:m_Param name='style'/>"></select>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+		<select class="input-select" id="timezone_group" tabindex="<inp2:m_Get name='tab_index'/>">
+			<option value=""></option>
+			<option value="Africa">Africa</option>
+			<option value="America">America</option>
+			<option value="Antarctica">Antarctica</option>
+			<option value="Arctic">Arctic</option>
+			<option value="Asia">Asia</option>
+			<option value="Atlantic">Atlantic</option>
+			<option value="Australia">Australia</option>
+			<option value="Europe">Europe</option>
+			<option value="Indian">Indian</option>
+			<option value="Pacific">Pacific</option>
+			<option value="Others">Others</option>
+		</select>
+		&nbsp;&nbsp;
+
+		<select class="input-select" tabindex="<inp2:m_Get name='tab_index'/>" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" style="<inp2:m_Param name='style'/>"></select>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_radio_item" onclick="">
-	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
+	<input type="radio" tabindex="<inp2:m_get param='tab_index'/>" style="<inp2:m_param name='style'/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>"><label for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><inp2:m_param name="option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_radio_phrase" onclick="">
-	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field="$field"/>" id="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:{$prefix}_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
+	<input type="radio" tabindex="<inp2:m_get param='tab_index'/>" style="<inp2:m_param name='style'/>" <inp2:m_param name="checked"/> name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>" value="<inp2:m_param name='key'/>"><label for="<inp2:{$prefix}_InputName field='$field'/>_<inp2:m_param name='key'/>"><inp2:m_phrase label="$option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
-				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked"/>
-			<inp2:m_else />
-				<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_item" selected="checked"/>
-			</inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" field_type="radio" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="use_phrases">
+			<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked"/>
+		<inp2:m_else />
+			<inp2:{$prefix}_PredefinedOptions field="$field" block="inp_radio_item" selected="checked"/>
+		</inp2:m_if>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_captcha" style="" title="lu_fld_Captcha" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="Captcha" title="$title"/>
-		<td class="field-value">
-			<inp2:m_if check="{$prefix}_HasError" field="Captcha">
-				<span class="field-error"><inp2:{$prefix}_Error field="Captcha"/></span><br />
-			</inp2:m_if>
-			<img src="<inp2:m_Link template="platform/inc/captcha_image.elm" var="{$prefix}_captcha_code" w="150" h="30"/>" alt="<inp2:m_Phrase name="$title" no_editing="1"/>"/><br />
-			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt=""/><br />
-			<input type="text" class="input-text" name="<inp2:{$prefix}_InputName field="Captcha"/>" value="<inp2:{$prefix}_Field field="Captcha"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_Param name="style"/>">
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_captcha" style="" field='Captcha' title="lu_fld_Captcha" field_type="captcha" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<img src="<inp2:m_Link template='platform/inc/captcha_image.elm' var='{$prefix}_captcha_code' w='150' h='30'/>" alt="<inp2:m_Phrase name='$title' no_editing='1'/>"/><br />
+		<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/s.gif" width="1" height="5" alt=""/><br />
+		<input type="text" class="input-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="<inp2:m_Param name='style'/>"/>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_checkbox" style="" no_editing="1" is_last="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td>
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
-			<input type="hidden" id="<inp2:{$prefix}_InputName field="$field"/>" name="<inp2:{$prefix}_InputName field="$field"/>" value="<inp2:{$prefix}_Field field="$field" db="db"/>" />
-			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field="$field"/>" name="_cb_<inp2:{$prefix}_InputName field="$field"/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field="$field"/>'));">
-			<inp2:m_if check="m_Param" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_edit_checkbox" style="" field_type="checkbox" no_editing="1" is_last="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<input type="hidden" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field' db='db'/>" />
+		<input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="_cb_<inp2:{$prefix}_InputName field='$field'/>" name="_cb_<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name='style'/>" onchange="update_checkbox(this, document.getElementById('<inp2:{$prefix}_InputName field='$field'/>'));">
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_categories" style="" no_editing="1" is_last="0">
 	<inp2:m_include template="platform/elements/categories.elm"/>
 
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td class="field-value">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<select class="input-select" tabindex="<inp2:m_get param='tab_index'/>" id="<inp2:{$prefix}_InputName field='$field'/>_select" style="<inp2:m_param name='style'/>">
+			<option value="0"><inp2:m_Phrase name="lu_opt_SelectCategory"/></option>
+			<inp2:{$prefix}_CategorySelector render_as="selector_category_element" separator="&raquo;&nbsp;"/>
+		</select>
 
-			<inp2:m_if check="{$prefix}_HasError" field="$field">
-				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
-			</inp2:m_if>
+		<input type="button" class="button" value="<inp2:m_Phrase label='lu_Add' no_editing='1'/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name='{$prefix}_MaxCategories'/>);"/><br />
 
-			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:{$prefix}_InputName field="$field"/>_select" style="<inp2:m_param name="style"/>">
-				<option value="0"><inp2:m_Phrase name="lu_opt_SelectCategory"/></option>
-				<inp2:{$prefix}_CategorySelector render_as="selector_category_element" separator="&raquo;&nbsp;"/>
-			</select>
+		<br />
+		<table class="item-categories" id="item_categories">
+			<tbody>
 
-			<input type="button" class="button" value="<inp2:m_Phrase label="lu_Add" no_editing="1"/>" onclick="$ItemCategories.AddCategory('&raquo;&amp;nbsp;', $delete_button, <inp2:m_GetConfig name="{$prefix}_MaxCategories"/>);"/><br />
+				<tr>
+					<td colspan="2">
+						<strong><inp2:m_Phrase name="lu_subsection_Categories"/>:</strong>
+					</td>
+				</tr>
 
-			<br />
-			<table class="item-categories" id="item_categories">
-				<tbody>
+				<inp2:{$prefix}_PrintMoreCategories render_as="more_category_element" field="$field"/>
+			</tbody>
+		</table>
+		<br/>
 
-					<tr>
-						<td colspan="2">
-							<strong><inp2:m_Phrase name="lu_subsection_Categories"/>:</strong>
-						</td>
-					</tr>
+		<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
 
-					<inp2:{$prefix}_PrintMoreCategories render_as="more_category_element" field="$field"/>
-				</tbody>
-			</table>
-			<br/>
-
-			<inp2:m_RenderElement name="inp_edit_hidden" prefix="$prefix" field="$field"/>
-
-			<script type="text/javascript">
-				var $delete_button = '&nbsp;&nbsp;<input type="button" class="delete-button" value="<inp2:m_Phrase label="lu_btn_Delete" no_editing="1"/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
-				var $phrases = ['<inp2:m_Phrase name="lu_error_CategoryLimitReached" escape="1"/>', '<inp2:m_Phrase name="lu_error_AlreadyAdded"/>'];
-				var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>, $phrases);
-			</script>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+		<script type="text/javascript">
+			var $delete_button = '&nbsp;&nbsp;<input type="button" class="delete-button" value="<inp2:m_Phrase label='lu_btn_Delete' no_editing='1'/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
+			var $phrases = ['<inp2:m_Phrase name="lu_error_CategoryLimitReached" escape="1"/>', '<inp2:m_Phrase name="lu_error_AlreadyAdded"/>'];
+			var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>, $phrases);
+		</script>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="ci_category_element">
@@ -588,16 +495,12 @@
 	<inp2:m_param name="title"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_pr_category_label" no_editing="1" is_last="0" editing="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
-		<td valign="top" class="field-value">
-			<inp2:m_if check="m_Param" name="editing">
-				<inp2:{$prefix}_CategoryName />
-			<inp2:m_else />
-				<inp2:c_CategoryPath separator="&gt;" render_as="ci_category_element"/>
-			</inp2:m_if>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+<inp2:m_DefineElement name="inp_pr_category_label" field_type="label" no_editing="1" is_last="0" editing="0">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<inp2:m_if check="m_Param" name="editing">
+			<inp2:{$prefix}_CategoryName />
+		<inp2:m_else />
+			<inp2:c_CategoryPath separator="&gt;" render_as="ci_category_element"/>
+		</inp2:m_if>
+	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/1.3.x/in-link/links/enhancements/extend_enhancement.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-link/links/enhancements/extend_enhancement.tpl	(.../extend_enhancement.tpl)	(revision 15478)
+++ branches/1.3.x/in-link/links/enhancements/extend_enhancement.tpl	(.../extend_enhancement.tpl)	(revision 15665)
@@ -43,7 +43,7 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyLinks,__item__,lu_title_ExtendCancelEnhancement" templates="platform/my_account/my_account,in-link/my_account/my_links,__default__,inlinks/links/enhancements/extend_enhancement"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyLinks,__item__,lu_title_ExtendCancelEnhancement" templates="platform/my_account/my_account,in-link/my_account/my_links,__default__,in-link/links/enhancements/extend_enhancement"/>
 		</div>
 		<div class="movable-element">
 			<!-- extend/cancel enhancment -->
Index: branches/1.3.x/in-link/links/enhancements/cancel_enhancement_confirm.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-link/links/enhancements/cancel_enhancement_confirm.tpl	(.../cancel_enhancement_confirm.tpl)	(revision 15478)
+++ branches/1.3.x/in-link/links/enhancements/cancel_enhancement_confirm.tpl	(.../cancel_enhancement_confirm.tpl)	(revision 15665)
@@ -43,7 +43,7 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyLinks,__item__,lu_title_ConfirmCancelEnhancement" templates="platform/my_account/my_account,in-link/my_account/my_links,__default__,inlinks/links/enhancements/cancel_enhancement_confirm"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyLinks,__item__,lu_title_ConfirmCancelEnhancement" templates="platform/my_account/my_account,in-link/my_account/my_links,__default__,in-link/links/enhancements/cancel_enhancement_confirm"/>
 		</div>
 		<div class="movable-element">
 			<!-- enhancement extension confirmation -->
Index: branches/1.3.x/in-link/links/enhancements/extend_enhancement_confirm.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-link/links/enhancements/extend_enhancement_confirm.tpl	(.../extend_enhancement_confirm.tpl)	(revision 15478)
+++ branches/1.3.x/in-link/links/enhancements/extend_enhancement_confirm.tpl	(.../extend_enhancement_confirm.tpl)	(revision 15665)
@@ -43,7 +43,7 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyLinks,__item__,lu_title_ConfirmExtendEnhancement" templates="platform/my_account/my_account,in-link/my_account/my_links,__default__,inlinks/links/enhancements/extend_enhancement_confirm"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyLinks,__item__,lu_title_ConfirmExtendEnhancement" templates="platform/my_account/my_account,in-link/my_account/my_links,__default__,in-link/links/enhancements/extend_enhancement_confirm"/>
 		</div>
 		<div class="movable-element">
 			<!-- enhancement extension confirmation -->
Index: branches/1.3.x/platform/elements/html_head.elm.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 15478)
+++ branches/1.3.x/platform/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 15665)
@@ -1,4 +1,3 @@
-
 <!--## Meta Info (Keywords and Description) ##-->
 <meta http-equiv="Content-Type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>" />
 
@@ -15,8 +14,13 @@
 
 <inp2:m_Compress files="platform/inc/styles.css" to="all_css"/>
 
-<inp2:m_Compress files="platform/inc/script.js|platform/inc/ajax.js|platform/inc/calendar.js" to="all_js"/>
+<inp2:m_Compress files="platform/inc/script.js|platform/inc/ajax.js|platform/inc/calendar.js|platform/inc/form_manager.js" to="all_js"/>
 
+<inp2:m_if check="m_GetConfig" name="TypeKitId">
+	<script type="text/javascript" src="//use.typekit.com/<inp2:m_GetConfig name='TypeKitId'/>.js"></script>
+	<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+</inp2:m_if>
+
 <script type="text/javascript">var inportalBase = '<inp2:m_TemplatesBase module="In-Portal"/>';</script>
 <script type="text/javascript" src="<inp2:m_TemplatesBase module='In-Portal'/>inc/jquery/jquery.pack.js"></script>
 
Index: branches/1.3.x/in-link/links/enhancements/enhance_link.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-link/links/enhancements/enhance_link.tpl	(.../enhance_link.tpl)	(revision 15478)
+++ branches/1.3.x/in-link/links/enhancements/enhance_link.tpl	(.../enhance_link.tpl)	(revision 15665)
@@ -43,7 +43,7 @@
 <inp2:m_DefineElement name="content">
 	<div class="movable-area">
 		<div class="movable-element">
-			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyLinks,__item__,lu_title_EnhanceLink" templates="platform/my_account/my_account,in-link/my_account/my_links,__default__,inlinks/links/enhancements/enhance_link"/>
+			<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyLinks,__item__,lu_title_EnhanceLink" templates="platform/my_account/my_account,in-link/my_account/my_links,__default__,in-link/links/enhancements/enhance_link"/>
 		</div>
 		<div class="movable-element">
 			<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_enhancements">
Index: branches/1.3.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
===================================================================
diff -u -r15478 -r15665
--- branches/1.3.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 15478)
+++ branches/1.3.x/in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(.../billing_options.elm.tpl)	(revision 15665)
@@ -31,36 +31,23 @@
 		<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="lu_billing_NameOnCard" style="width: 260px;"/>
 
 		<!-- credit card expiration -->
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="lu_billing_CardExpiration"/>
-			<td class="field-value">
-				<inp2:m_if check="ord_HasError" field="PaymentCCExpDate">
-					<span class="field-error"><inp2:ord_Error field="PaymentCCExpDate"/></span><br />
-				</inp2:m_if>
-				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>">
-					<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
-				</select>
-				/
-				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpYear"/>">
-					<option value=''></option>
-					<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
-				</select>
-			</td>
-		</tr>
-		<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
+		<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="lu_billing_CardExpiration" field_type="cc_expiration">
+			<select class="input-select" name="<inp2:ord_InputName field='PaymentCCExpMonth'/>">
+				<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
+			</select>
+			/
+			<select class="input-select" name="<inp2:ord_InputName field='PaymentCCExpYear'/>">
+				<option value=''></option>
+				<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
+			</select>
+		</inp2:m_RenderElement>
 		<!-- // credit card expiration -->
 
 		<!-- credit card CVV2 -->
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCVV2" title="lu_billing_CVV2"/>
-			<td class="field-value">
-				<inp2:m_if check="ord_HasError" field="PaymentCVV2">
-					<span class="field-error"><inp2:ord_Error field="PaymentCVV2"/></span><br />
-				</inp2:m_if>
-				<input type="text" class="input-text" name="<inp2:ord_InputName field="PaymentCVV2"/>" value="<inp2:ord_Field field="PaymentCVV2"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 50px;">
-				&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
-			</td>
-		</tr>
+		<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCVV2" title="lu_billing_CVV2">
+			<input type="text" class="input-text" name="<inp2:ord_InputName field='PaymentCVV2'/>" value="<inp2:ord_Field field='PaymentCVV2'/>" tabindex="<inp2:m_get param='tab_index'/>" style="width: 50px;">
+			&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
+		</inp2:m_RenderElement>
 		<!-- // credit card CVV2 -->
 
 		<inp2:m_RenderElement design="inp_edit_buttons">