diff --git a/theme/brick/layout/frontpage.php b/theme/brick/layout/frontpage.php
index 279b82cbcd6..06d4a60fb62 100644
--- a/theme/brick/layout/frontpage.php
+++ b/theme/brick/layout/frontpage.php
@@ -30,7 +30,7 @@ echo $OUTPUT->doctype() ?>
 
 <!-- START OF HEADER -->
 
-<div id="headerwrap">
+<div id="page-header">
 	<div id="header">
 
 		<?php if (!empty($PAGE->theme->settings->logo)) { ?>
diff --git a/theme/brick/layout/general.php b/theme/brick/layout/general.php
index 43ea28dbc02..813a6e9fec6 100644
--- a/theme/brick/layout/general.php
+++ b/theme/brick/layout/general.php
@@ -31,7 +31,7 @@ echo $OUTPUT->doctype() ?>
 
 <!-- START OF HEADER -->
 
-<div id="headerwrap">
+<div id="page-header">
 	<div id="header">
 
 		<?php if (!empty($PAGE->theme->settings->logo)) { ?>
diff --git a/theme/brick/style/colors.css b/theme/brick/style/colors.css
index fab7a30f16d..af0557e979b 100644
--- a/theme/brick/style/colors.css
+++ b/theme/brick/style/colors.css
@@ -10,7 +10,7 @@ html a:hover,body a:hover, ul.dropdown li.hover, ul.dropdown li:hover, ul.dropdo
 	background: url([[setting:logo]]) no-repeat;
 }
 
-#headerwrap {
+#page-header {
 	background: [[setting:maincolor]] url([[pix:theme|header]]) repeat-x;
 	border-bottom: 1px solid [[setting:maincolor]];
 }
diff --git a/theme/brick/style/core.css b/theme/brick/style/core.css
index 67c77a2cca4..34d710957d4 100644
--- a/theme/brick/style/core.css
+++ b/theme/brick/style/core.css
@@ -39,10 +39,11 @@ html, body {
 /* Header
 ----------------------------*/
 
-#headerwrap {
+#page-header {
 	width: 100%;
 	top: 0px;
 	height: 140px;
+	float: none;
 }
 
 #header {
diff --git a/theme/magazine/layout/frontpage.php b/theme/magazine/layout/frontpage.php
index 46e56b8c68b..bb8879d9d1f 100644
--- a/theme/magazine/layout/frontpage.php
+++ b/theme/magazine/layout/frontpage.php
@@ -35,7 +35,7 @@ echo $OUTPUT->doctype() ?>
 <div id="page">
 
 <!-- start of header -->
-	<div id="header-wrap">
+	<div id="page-header">
 		<div id="header-container">
 			<div id="headerinner">
 
@@ -158,7 +158,7 @@ echo $OUTPUT->doctype() ?>
 	</div>
 
 <!-- START OF FOOTER -->
-	<div id="footer-wrap">
+	<div id="page-footer">
 		<div id="footer-container">
 			<div id="footer">
 
diff --git a/theme/magazine/layout/general.php b/theme/magazine/layout/general.php
index dfad02ada3e..462d56637b6 100644
--- a/theme/magazine/layout/general.php
+++ b/theme/magazine/layout/general.php
@@ -35,7 +35,7 @@ echo $OUTPUT->doctype() ?>
 <div id="page">
 
 <!-- start of header -->
-	<div id="header-wrap">
+	<div id="page-header">
 		<div id="header-container">
 			<div id="headerinner">
 
@@ -159,7 +159,7 @@ echo $OUTPUT->doctype() ?>
 	</div>
 
 <!-- START OF FOOTER -->
-	<div id="footer-wrap">
+	<div id="page-footer">
 		<div id="footer-container">
 			<div id="footer">
 
diff --git a/theme/magazine/style/colors.css b/theme/magazine/style/colors.css
index 7597e117109..ee1f866729b 100644
--- a/theme/magazine/style/colors.css
+++ b/theme/magazine/style/colors.css
@@ -14,7 +14,7 @@ html a:hover,body a:hover {
 
 /** header and dock, default #002f2f and #092323 **/
 
-#header-wrap, #dock {
+#page-header, #dock {
     background: [[setting:maincolor]];
     border-bottom: 1px solid [[setting:maincoloraccent]];
 }
diff --git a/theme/magazine/style/core.css b/theme/magazine/style/core.css
index dcb10913ef2..80b0b278db8 100644
--- a/theme/magazine/style/core.css
+++ b/theme/magazine/style/core.css
@@ -30,7 +30,7 @@ a:focus {
 
 /**header divs **/
 
-#header-wrap {
+#page-header {
     top: 0;
     left: 0;
     width: 100%;
@@ -216,7 +216,7 @@ div.jcontrolsright div.singlebutton, div.jcontrolsright div.forumsearch {
     margin: 0 auto;
 }
 
-#footer-wrap {
+#page-footer {
     position: relative;
     bottom: 0;
     left: 0;