Index: branches/RC/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -N -r11623 -r11685
--- branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11623)
+++ branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11685)
@@ -57,19 +57,16 @@
 <inp2:c_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
-	<!--<div id="width_status">
-		Status:
-	</div>-->
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_Category!"/>
+		<inp2:m_RenderElement name="subsection" prefix="c" fields="CategoryId,Name,Description,AutomaticFilename,Filename,SymLinkCategoryId" title="!la_section_Category!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Name" title="!la_fld_PageTitle!" size="70"/> <!-- la_fld_Name -->
 			<inp2:m_RenderElement name="inp_edit_textarea_ml" prefix="c" field="Description" title="!la_fld_Description!" control_options="{min_height: 130}" rows="7" cols="70"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="AutomaticFilename" title="la_fld_AutoCreateFileName" onclick="reflectFilename()"/> <!-- la_fld_CategoryAutomaticFilename -->
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="Filename" title="la_fld_Filename" size="70" /> <!-- la_fld_CategoryFilename -->
 			<inp2:m_RenderElement name="inp_edit_category" prefix="c" field="SymLinkCategoryId" title="la_fld_SymLinkCategoryId"/>
 
-		<inp2:m_RenderElement name="subsection" title="la_section_Page"/>
+		<inp2:m_RenderElement name="subsection" prefix="c" fields="Title,MenuTitle,FriendlyURL,ParentId,Template,FormId,FormSubmittedTemplate,IsIndex,IsMenu" title="la_section_Page"/>
 			<inp2:m_RenderElement name="inp_edit_hidden" prefix="c" field="OldPriority"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="Title" title="!la_fld_PageContentTitle!" size="40"/>
 			<inp2:m_RenderElement name="inp_edit_box_ml" prefix="c" field="MenuTitle" title="!la_fld_PageMentTitle!" size="40"/>
@@ -89,14 +86,10 @@
 
 			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="FormId" title="!la_fld_Form!"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="c" field="FormSubmittedTemplate" title="la_fld_FormSubmittedTemplate" size="60"/>
-
-			<inp2:m_if check="m_IsDebugMode">
-				<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="IsIndex" title="la_fld_IsIndex"/>
-			</inp2:m_if>
-
+			<inp2:m_RenderElement name="inp_edit_options" prefix="c" field="IsIndex" title="la_fld_IsIndex"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="IsMenu" title="la_fld_MenuStatus"/>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_Properties!"/>
+		<inp2:m_RenderElement name="subsection" prefix="c" fields="Status,NewItem,EditorsPick,Priority,UseMenuIconUrl,MenuIconUrl,UseExternalUrl,ExternalUrl,CreatedOn,MetaKeywords,MetaDescription,IndexTools" title="!la_section_Properties!"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="Status" title="!la_fld_Status!"/>
 			<inp2:m_RenderElement name="inp_edit_radio" prefix="c" field="NewItem" title="!la_fld_New!"/>
 			<inp2:m_RenderElement name="inp_edit_checkbox" prefix="c" field="EditorsPick" title="!la_fld_EditorsPick!"/>
@@ -132,11 +125,17 @@
 	}
 
 	function reflectMenuIcon() {
-		getControl('MenuIconUrl').parentNode.parentNode.style.display = getControl('UseMenuIconUrl', null, '_cb').checked ? '' : 'none';
+		var $menu_icon_url = getControl('MenuIconUrl');
+		if ($menu_icon_url) {
+			$menu_icon_url.parentNode.parentNode.style.display = getControl('UseMenuIconUrl', null, '_cb').checked ? '' : 'none';
+		}
 	}
 
 	function reflectExternalUrl() {
-		getControl('ExternalUrl').parentNode.parentNode.style.display = getControl('UseExternalUrl', null, '_cb').checked ? '' : 'none';
+		var $external_url = getControl('ExternalUrl');
+		if ($external_url) {
+			$external_url.parentNode.parentNode.style.display = getControl('UseExternalUrl', null, '_cb').checked ? '' : 'none';
+		}
 	}
 
 	function OnSystemClick() {
@@ -163,8 +162,11 @@
 	}
 
 	function reflectFilename() {
-    	var $checked = getControl('AutomaticFilename', null, '_cb').checked;
-    	getControl('Filename').readOnly = $checked;
+		var $filename = getControl('Filename');
+		if ($filename) {
+	    	var $checked = getControl('AutomaticFilename', null, '_cb').checked;
+	    	$filename.readOnly = $checked;
+		}
     }
 
 	$(document).ready(