Index: branches/unlabeled/unlabeled-1.4.32/core/admin_templates/users/users_edit.tpl
===================================================================
diff -u -r7860 -r9989
--- branches/unlabeled/unlabeled-1.4.32/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 7860)
+++ branches/unlabeled/unlabeled-1.4.32/core/admin_templates/users/users_edit.tpl	(.../users_edit.tpl)	(revision 9989)
@@ -37,18 +37,18 @@
 
 				a_toolbar.Render();
 
-				<inp2:m_if prefix="u" function="IsSingle"/>
+				<inp2:m_if check="u_IsSingle" >
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if prefix="u" function="IsLast"/>
+					<inp2:m_if check="u_IsLast" >
 						a_toolbar.DisableButton('next');
-					<inp2:m_endif/>
-					<inp2:m_if prefix="u" function="IsFirst"/>
+					</inp2:m_if>
+					<inp2:m_if check="u_IsFirst" >
 						a_toolbar.DisableButton('prev');
-					<inp2:m_endif/>
-				<inp2:m_endif/>
+					</inp2:m_if>
+				</inp2:m_if>
 			</script>
 		</td>
 		<inp2:m_RenderElement name="ml_selector" prefix="u"/>
@@ -60,14 +60,14 @@
 <inp2:u_ErrorWarning name="form_error_warning"/>
 <div id="scroll_container">
 <table class="edit-form">
-		<inp2:m_ParseBlock name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
-		<inp2:m_ParseBlock name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
-		<inp2:m_ParseBlock name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="u" field="PortalUserId" title="!la_fld_Id!"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="la_fld_Username"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="la_fld_Password"/>
+		<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="la_fld_VerifyPassword"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="la_fld_FirstName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="la_fld_LastName"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="la_fld_Email"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="la_fld_Country"/>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 </table>
 </div>
Index: branches/unlabeled/unlabeled-1.2.52/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -r7700 -r9989
--- branches/unlabeled/unlabeled-1.2.52/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 7700)
+++ branches/unlabeled/unlabeled-1.2.52/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 9989)
@@ -45,7 +45,7 @@
 </tbody>
 </table>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes" grid_filters="1"/>
 <script type="text/javascript">
 	Grids['u.regular'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>
Index: branches/unlabeled/unlabeled-1.2.52/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r7700 -r9989
--- branches/unlabeled/unlabeled-1.2.52/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 7700)
+++ branches/unlabeled/unlabeled-1.2.52/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 9989)
@@ -1,5 +1,5 @@
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="1" prefix="u.admins" title_preset=""/>
+<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="1" prefix="u.admins" title_preset="" grid="Admins" />
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -31,7 +31,14 @@
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
+				a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_ResetSettings" escape="1"/>::<inp2:m_phrase label="la_ShortToolTip_ResetSettings" escape="1"/>',
+						function() {
+							set_hidden_field('remove_specials[u.admins]', 1);
+							submit_event('u.admins', 'OnMassResetSettings');
+						} ) );
 
+				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
+				
 				a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
 							show_viewmenu(a_toolbar,'view');
 						}
@@ -45,7 +52,7 @@
 </tbody>
 </table>
 
-<inp2:m_ParseBlock name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
 <script type="text/javascript">
 	Grids['u.admins'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>