3 files changed, 27 insertions, 11 deletions
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index 985db2760..7c7e6391f 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -82,14 +82,3 @@ END;
 </head>
 
 <body>
-<?php echo elgg_view('page_elements/elgg_topbar', $vars); ?>
-	
-<div id="page_container">
-<div id="page_wrapper">
-
-<div id="layout_header">
-<div id="wrapper_header">
-	<!-- display the page title -->
-	<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
-</div><!-- /#wrapper_header -->
-</div><!-- /#layout_header -->
diff --git a/views/default/page_elements/header_contents.php b/views/default/page_elements/header_contents.php
new file mode 100644
index 000000000..796f0d6f2
--- /dev/null
+++ b/views/default/page_elements/header_contents.php
@@ -0,0 +1,25 @@
+<?php
+
+	/**
+	 * Elgg header contents
+	 * This file holds the header output that a user will see
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2009
+	 * @link http://elgg.org/
+	 **/
+	 
+?>
+
+<div id="page_container">
+<div id="page_wrapper">
+
+<div id="layout_header">
+<div id="wrapper_header">
+	<!-- display the page title -->
+	<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
+</div><!-- /#wrapper_header -->
+</div><!-- /#layout_header -->
+\ No newline at end of file
diff --git a/views/default/pageshells/pageshell.php b/views/default/pageshells/pageshell.php
index fa4268b6f..99fe38f6c 100644
--- a/views/default/pageshells/pageshell.php
+++ b/views/default/pageshells/pageshell.php
@@ -32,6 +32,8 @@
 ?>
 
 <?php echo elgg_view('page_elements/header', $vars); ?>
+<?php echo elgg_view('page_elements/elgg_topbar', $vars); ?>
+<?php echo elgg_view('page_elements/header_contents', $vars); ?>
 
 <!-- main contents -->