2 files changed, 36 insertions, 22 deletions
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index dd6e9d764..c7ac30a36 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -13,10 +13,17 @@
 	 * 
 	 */
 ?>
-<div style="clear:both"></div>
-</div><!-- close container div -->
-<div id="footer">
+
+<div class="clearfloat"></div>
+
+<div id="layout_footer">
 <p><a href="http://elgg.com/">Elgg</a></p>
-</div><!-- close footer div -->
+</div><!-- /#layout_footer -->
+
+<div class="clearfloat"></div>
+
+</div><!-- /#page_wrapper -->
+</div><!-- /#page_container -->
+
 </body>
 </html>
 \ No newline at end of file
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index 32e2883f9..75daa5b0d 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -29,21 +29,28 @@
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-		<title><?php echo $title; ?></title>
-		<!-- include links to jQuery here? -->
-		<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.2.6.pack.js"></script>
-		<!-- include the default css file -->
-		<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css" type="text/css" />
-		<?php echo elgg_view('metatags',$vars); ?>
-	</head>
-	<body>
-	<div id="container">
-	<div id="header">
-	    <!-- display the page title -->
-        <h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
-        <h2><?php echo $vars['title']; ?></h2>
-        <!-- display top level navigation -->
-        <?php echo elgg_view('navigation/topmenu'); ?>
-    </div><!-- close the header div -->
-\ No newline at end of file
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title><?php echo $title; ?></title>
+	<!-- include links to jQuery here? -->
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.2.6.pack.js"></script>
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>javascript/initialise_elgg.js"></script>
+	<!-- include the default css file -->
+	<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css" type="text/css" />
+	<?php echo elgg_view('metatags',$vars); ?>
+</head>
+
+<body>
+	
+<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>
+	<h2><?php echo $vars['title']; ?></h2>
+	<!-- display top level navigation -->
+	<?php echo elgg_view('navigation/topmenu'); ?>
+</div><!-- /#wrapper_header -->
+</div><!-- /#layout_header -->