cgit

diff --git a/cgit.css b/cgit.css
index d2c0d0b7b2990c5265c765bfc22b305c55cd595c..63acd78e69ca4eb2762ea4cefe395342cc4507c8 100644
--- a/cgit.css
+++ b/cgit.css
@@ -3,7 +3,7 @@ 	font-family: arial;
 	font-size: normal;
 	background: white;
 	padding: 0em;
-	margin: 0.5em 1em;
+	margin: 0em;
 }
 
 
@@ -48,30 +48,33 @@ }
 img {
 	border: none;
 }
-
-div#header {
+table#layout {
+	width: 100%;
+	border-collapse: collapse;
+	margin: 0px;
+}
+td#header {
 	background-color: #ddd;
 	padding: 0.25em 0.25em 0.25em 0.5em;
 	font-size: 150%;
 	font-weight: bold;
-	border: solid 1px #aaa;
+	border-bottom: solid 1px #aaa;
 	vertical-align: middle;
-	margin-bottom: 2em;
 }
-div#header img#logo {
+td#header img#logo {
 	float: right;
 }
 
-div#header input {
+td#header input {
 	float: right;
 	margin: 0.25em 1em;
 }
-div#header a {
+td#header a {
 	color: black;
 }
 
-div#content {
-	margin: 0.5em 0.5em;
+td#content {
+	padding: 1em 0.5em;
 }
 
 div#blob {




diff --git a/ui-shared.c b/ui-shared.c
index bebd3e01b9ad7af2748788cf3a0f919bc4c5e73b..630051653dc47060da9af56214295a3011638492 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -107,12 +107,13 @@ }
 
 void cgit_print_docend()
 {
+	html("</td></tr></table>");
 	html("</body>\n</html>\n");
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
-	html("<div id='header'>");
+	html("<table id='layout'><tr><td id='header'>");
 	htmlf("<a href='%s'>", cgit_logo_link);
 	htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
 	htmlf("</a>");
@@ -135,5 +136,5 @@ 		htmlf("", cgit_repourl(cgit_query_repo));
 	html_txt(title);
 	if (cgit_query_repo)
 		html("</a>");
-	html("</div>");
+	html("</td></tr><tr><td id='content'>");
 }