Index: branches/RC/core/admin_templates/tools/server_info.tpl
===================================================================
diff -u -r10746 -r11538
--- branches/RC/core/admin_templates/tools/server_info.tpl	(.../server_info.tpl)	(revision 10746)
+++ branches/RC/core/admin_templates/tools/server_info.tpl	(.../server_info.tpl)	(revision 11538)
@@ -1,9 +1,6 @@
-<inp2:m_RequireLogin permissions="in-portal:service.view" system="1"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_RenderElement name="section_header" icon="icon46_server_info" title="!la_tab_ServerInfo!"/>
+<inp2:m_RenderElement name="combined_header" prefix="adm" section="in-portal:service" title_preset="server_info"/>
 
-<inp2:m_RenderElement name="blue_bar" prefix="adm" title_preset="server_info" module="in-portal" icon="icon46_modules"/>
-
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -12,9 +9,10 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-					location.href = '<inp2:m_Link t="sections_list" pass="m" section="in-portal:tools" module="In-Portal" no_amp="1"/>';						
+					location.href = '<inp2:m_Link t="sections_list" pass="m" section="in-portal:tools" module="In-Portal" no_amp="1"/>';
 						}
 					) );
+
 				a_toolbar.Render();
 			</script>
 		</td>