Index: branches/unlabeled/unlabeled-1.1.2.1.4/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -r7418 -r7493
--- branches/unlabeled/unlabeled-1.1.2.1.4/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7418)
+++ branches/unlabeled/unlabeled-1.1.2.1.4/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7493)
@@ -1,10 +1,6 @@
 <inp2:adm_SetPopupSize width="564" height="352"/>
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_ParseBlock name="section_header" prefix="u" icon="icon46_users" module="proj-base" title="la_title_UsersManagement"/>
-
-<inp2:m_ParseBlock name="blue_bar" prefix="u" title_preset="admins_edit" module="proj-base" icon="icon46_users"/>
-
+<inp2:m_RenderElement name="combined_header" section="proj-base:users" pagination="0" prefix="u" title_preset="admins_edit"/>
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -55,6 +51,7 @@
 				<inp2:m_endif/>
 			</script>
 		</td>
+		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
 	</tr>
 </tbody>
 </table>
Index: branches/unlabeled/unlabeled-1.1.2.1.4/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -r7418 -r7493
--- branches/unlabeled/unlabeled-1.1.2.1.4/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 7418)
+++ branches/unlabeled/unlabeled-1.1.2.1.4/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 7493)
@@ -1,9 +1,6 @@
-<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_ParseBlock name="section_header" prefix="u" icon="icon46_users" module="proj-base" title="la_title_UsersManagement"/>
+<inp2:m_RenderElement name="combined_header" section="proj-base:users" pagination="1" prefix="u" title_preset=""/>
 
-<inp2:m_ParseBlock name="blue_bar" prefix="u" u.regular[grid]="RegularUsers" title_preset="regular_users_list" icon="icon46_users" module="proj-base"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>