Index: trunk/core/admin_templates/themes/themes_list.tpl
===================================================================
diff -u -N -r8069 -r8070
--- trunk/core/admin_templates/themes/themes_list.tpl	(.../themes_list.tpl)	(revision 8069)
+++ trunk/core/admin_templates/themes/themes_list.tpl	(.../themes_list.tpl)	(revision 8070)
@@ -1,14 +1,6 @@
-<inp2:m_RequireLogin permissions="in-portal:configure_themes.view" system="1"/>
 <inp2:m_include t="incs/header"/>
 
-<!-- variant 1: begin -->
-<inp2:m_ParseBlock name="section_header" prefix="theme" module="core" icon="icon46_conf_themes" title="la_title_Themes"/>
-<inp2:m_ParseBlock name="blue_bar" prefix="theme" title_preset="themes_list" module="core" icon="icon46_conf_themes"/>
-<!-- variant 1: end -->
-
-<!-- variant 2: begin -->
 <inp2:m_RenderElement name="combined_header" section="in-portal:configure_themes" prefix="theme" title_preset="themes_list" pagination="1"/>
-<!-- variant 2: end -->
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
Index: trunk/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r7855 -r8070
--- trunk/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 7855)
+++ trunk/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 8070)
@@ -48,6 +48,10 @@
 </table>
 <inp2:m_blockend/>
 
+<inp2:m_DefineElement name="grid_pagination_elem" ajax="0">
+	
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_search" ajax="0">
 				<td align="right" class="search-cell">
 					<table cellspacing="0" cellpadding="0">
Index: trunk/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r8015 -r8070
--- trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 8015)
+++ trunk/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 8070)
@@ -11,36 +11,42 @@
 		</table>
 	</inp2:m_if>
 
-
 	<inp2:m_if check="m_Param" name="tabs">
 		<inp2:m_include t="$tabs"/>
 	</inp2:m_if>
 
-	<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
+	<table cellpadding="0" cellspacing="0" width="100%">
 		<tr>
-			<td class="header_left_bg" nowrap valign="middle">
-				<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
-				<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="$default_title" cut_first="100" pass_params="true"/></span>
+			<td class="tablenav">
+				<table border="0" cellpadding="2" cellspacing="0" class="tableborder_full" width="100%" height="30">
+					<tr>
+						<td class="header_left_bg" nowrap valign="middle">
+							<inp2:adm_SectionInfo section="$section" info="label" result_to_var="default_title"/>
+							<span class="tablenav_link" id="blue_bar"><inp2:$prefix_SectionTitle title_preset="$title_preset" title="$default_title" cut_first="100" pass_params="true"/></span>
+						</td>
+						<td align="right" valign="middle">
+							<script type="text/javascript">
+								set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
+							</script>
+							<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
+								<script>
+									var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
+									$help_url = $help_url.replace(/#/g, '%23');
+								</script>
+								<a href="javascript: OpenHelp($help_url);">
+									<img src="img/blue_bar_help.gif" border="0">
+								</a>
+							</inp2:m_if>
+							<inp2:m_if check="m_Param" name="pagination">
+								<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$prefix" pass_params="1"/>
+							</inp2:m_if>
+						</td>
+					</tr>
+				</table>
 			</td>
-			<td align="right" class="tablenav" valign="middle">
-				<script type="text/javascript">
-					set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') + ' - <inp2:m_Phrase label="la_AdministrativeConsole"/>');
-				</script>
-				<inp2:m_if check="m_ModuleEnabled" module="In-Portal">
-					<script>
-						var $help_url='<inp2:m_t t="help" h_prefix="$prefix" h_icon="$icon" h_module="$module" h_title_preset="$title_preset" pass="all,m,h" m_opener="p" escape="escape"/>';
-						$help_url = $help_url.replace(/#/g, '%23');
-					</script>
-					<a href="javascript: OpenHelp($help_url);">
-						<img src="img/blue_bar_help.gif" border="0">
-					</a>
-				</inp2:m_if>
-				<inp2:m_if check="m_Param" name="pagination">
-					<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="$prefix" pass_params="1"/>
-				</inp2:m_if>
-			</td>
 		</tr>
 	</table>
+	
 </inp2:m_DefineElement>
 
 <inp2:m_block name="section_header"/>