5 files changed, 49 insertions, 32 deletions
diff --git a/install/css/install.css b/install/css/install.css
index 016437c14..f891dff6c 100644
--- a/install/css/install.css
+++ b/install/css/install.css
@@ -69,30 +69,44 @@ ul {
 	line-height: 0px;
 }
 
-#elgg-wrapper {
-	background: white;
-	width: 800px;
+.elgg-page {
+	width: 880px;
 	margin: auto;
-	padding: 5px 40px;
 	margin-top: 20px;
+}
+.elgg-page-header {
 	border-right: 1px solid #666666;
+	padding: 15px 50px 10px;
+	background: white;
+}
+.elgg-page-body {
 	border-bottom: 1px solid #666666;
+	border-right: 1px solid #666666;
+	padding: 0 40px 5px;
+	background: white;
 }
-#elgg-header {
-	margin: 10px 10px;
+
+.elgg-page-body:after,
+.elgg-page-header:after {
+	display:block;
+	content:'.';
+	line-height:0;
+	height:0;
+	visibility: hidden;
+	clear:both;
 }
-#elgg-sidebar {
+
+.elgg-sidebar {
 	float: left;
 	width: 250px;
 }
-#elgg-content {
-	float: left;
-	width: 550px;
+.elgg-body {
+	overflow:hidden;
 	min-height: 320px;
 	padding-bottom: 60px;
 	position: relative;
 }
-#elgg-footer {
+.elgg-page-footer {
 	width: 800px;
 	height: 20px;
 	clear: both;
@@ -108,21 +122,21 @@ ul {
 	bottom: 0px;
 }
 
-#elgg-footer a {
+.elgg-page-footer a {
 	color: white;
 }
 
-#elgg-footer li {
+.elgg-page-footer li {
 	float: left;
 	list-style: none;
 	margin-right: 20px;
 }
 
-#elgg-sidebar ol {
+.elgg-sidebar ol {
 	padding-left: 30px;
 }
 
-#elgg-sidebar li {
+.elgg-sidebar li {
 	font-size: 1.2em;
 	margin-bottom: 5px;
 }
@@ -244,7 +258,7 @@ select {
 	background: #F7DAD8;
 }
 
-#elgg-content li {
+.elgg-body li {
 	margin-top: 5px;
 	padding: 5px;
 }
diff --git a/views/installation/page/default.php b/views/installation/page/default.php
index abee13dba..7618e7255 100644
--- a/views/installation/page/default.php
+++ b/views/installation/page/default.php
@@ -31,22 +31,25 @@ header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', TRUE);
 		<link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>install/css/install.css" type="text/css" />
 	</head>
 	<body>
-	<div id="elgg-wrapper">
-		<div id="elgg-header">
-			<?php echo elgg_view('install/header', $vars); ?>
+		<div class="elgg-page">
+			<div class="elgg-page-header">
+				<?php echo elgg_view('page/elements/header', $vars); ?>
+			</div>
+			<div class="elgg-page-body">
+				<div class="elgg-layout">
+					<div class="elgg-sidebar">
+						<?php echo elgg_view('page/elements/sidebar', $vars); ?>
+					</div>
+					<div class="elgg-body">
+						<h2><?php echo $vars['title']; ?></h2>
+						<?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
+						<?php echo $vars['body']; ?>
+					</div>
+				</div>
+			</div>
+			<div class="elgg-page-footer">
+				<?php echo elgg_view('page/elements/footer'); ?>
+			</div>
 		</div>
-		<div id="elgg-sidebar">
-			<?php echo elgg_view('install/sidebar', $vars); ?>
-		</div>
-		<div id="elgg-content">
-			<h2><?php echo $vars['title']; ?></h2>
-			<?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
-			<?php echo $vars['body']; ?>
-		</div>
-		<div class="clearfloat"></div>
-	</div>
-	<div id="elgg-footer">
-		<?php echo elgg_view('install/footer'); ?>
-	</div>
 	</body>
 </html>
diff --git a/views/installation/install/footer.php b/views/installation/page/elements/footer.php
index 69cd27f66..69cd27f66 100644
--- a/views/installation/install/footer.php
+++ b/views/installation/page/elements/footer.php
diff --git a/views/installation/install/header.php b/views/installation/page/elements/header.php
index 8c18dbffd..8c18dbffd 100644
--- a/views/installation/install/header.php
+++ b/views/installation/page/elements/header.php
diff --git a/views/installation/install/sidebar.php b/views/installation/page/elements/sidebar.php
index 8136cd898..8136cd898 100644
--- a/views/installation/install/sidebar.php
+++ b/views/installation/page/elements/sidebar.php