Index: branches/RC/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r11520 -r11538
--- branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11520)
+++ branches/RC/core/admin_templates/categories/categories_edit.tpl	(.../categories_edit.tpl)	(revision 11538)
@@ -1,12 +1,8 @@
 <inp2:adm_SetPopupSize width="880" height="680"/>
-<inp2:m_RequireLogin permissions="CATEGORY.VIEW"/>
 <inp2:m_include t="incs/header"/>
-
-<inp2:m_RenderElement name="section_header" prefix="c" icon="icon46_catalog" module="in-portal" title="!la_title_Categories!"/>
-
 <inp2:m_include t="categories/categories_tabs"/>
 
-<inp2:m_RenderElement name="blue_bar" prefix="c" title_preset="categories_edit" module="in-portal" icon="icon46_catalog"/>
+<inp2:m_RenderElement name="combined_header" prefix="c" section="in-portal:browse" perm_section="CATEGORY" permission_type="VIEW" system_permission="0" title_preset="categories_edit" tab_preset="Default"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -60,15 +56,10 @@
 <inp2:c_SaveWarning name="grid_save_warning"/>
 <inp2:c_ErrorWarning name="form_error_warning"/>
 
-<inp2:m_DefineElement name="filename_edit">
-
-
-</inp2:m_DefineElement>
-
 <div id="scroll_container">
-	<div id="width_status">
+	<!--<div id="width_status">
 		Status:
-	</div>
+	</div>-->
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="!la_section_Category!"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="c" field="CategoryId" title="!la_fld_CategoryId!"/>
@@ -126,7 +117,7 @@
 		<inp2:cf.general_PrintList render_as="cv_row_block" SourcePrefix="c" value_field="Value" per_page="-1" grid="Default" />
 		<!-- custom fields: end -->
 
-		<inp2:m_RenderElement name="inp_edit_filler" />
+		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>