Index: /trunk/admin/header.tpl.php
===================================================================
--- /trunk/admin/header.tpl.php	(revision 529)
+++ /trunk/admin/header.tpl.php	(revision 530)
@@ -1,3 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
Index: /trunk/admin/xcache.css
===================================================================
--- /trunk/admin/xcache.css	(revision 529)
+++ /trunk/admin/xcache.css	(revision 530)
@@ -1,5 +1,6 @@
 input, table { font-family: sans-serif; }
 input { font-size: 12px; }
-table { border-collapse: collapse; font-size: 11px; }
+table { border-collapse: collapse; font-size: 11px; margin: 0; margin-bottom: 10px; }
+table caption, h2 { font-size: 16px; font-weight: bold; text-align: left; padding-top: 20px; margin-bottom: 2px; }
 table { white-space: pre; }
 table.cycles { border: 1px solid black; margin-top: 5px; margin-bottom: 5px; }
@@ -32,5 +33,5 @@
 .bitsgraph div div { float: none; width: 100%; }
 
-.switcher, h1, h2 { text-align: center; display: block; }
+.switcher, h1 { text-align: center; display: block; }
 .switcher * { color: blue; }
 .switcher a.active { font-weight: bold; font-size: 130%; color: black; }
Index: /trunk/admin/xcache.tpl.php
===================================================================
--- /trunk/admin/xcache.tpl.php	(revision 529)
+++ /trunk/admin/xcache.tpl.php	(revision 530)
@@ -1,11 +1,13 @@
 <?php include("header.tpl.php"); ?>
-<a href="help.php" target="_blank" id="help"><?php echo _T("Help") ?> &raquo;</a>
-<span class="switcher"><?php echo switcher("type", $types); ?></span>
+<div id="help">
+	<a href="help.php"><?php echo _T("Help") ?> &raquo;</a>
+</div>
+<div class="switcher"><?php echo switcher("type", $types); ?></div>
 <?php
 $a = new Cycle('class="col1"', 'class="col2"');
 $b = new Cycle('class="col1"', 'class="col2"');
 ?>
-<?php echo _T('Caches'); ?>:
 <table cellspacing="0" cellpadding="4" class="cycles">
+	<caption><?php echo _T('Caches'); ?></caption>
 	<col />
 	<col align="right" />
@@ -64,5 +66,4 @@
 
 		$w = $graph_width;
-		$tdwidth = $w + 2;
 		if (empty($ci['istotal'])) {
 			$graph = freeblock_to_graph($ci['free_blocks'], $ci['size']);
@@ -96,5 +97,5 @@
 		<td title="{$ci['size']}">{$ci_size}</td>
 		<td title="{$ci['avail']}">{$ci_avail}</td>
-		<td title="{$pvalue} %" width="{$tdwidth}"
+		<td title="{$pvalue} %"
 			><div class="percent" style="width: {$w}px"
 				><div style="width: {$pvalue}%" class="pvalue"></div
@@ -103,5 +104,5 @@
 		>{$blocksgraph}</td>
 		<td
-			><form method="post"
+			><form method="post" action=""
 				><div
 					><input type="hidden" name="type" value="{$ci['type']}"
@@ -149,10 +150,9 @@
 	foreach (array('Cached' => $cachelist['cache_list'], 'Deleted' => $cachelist['deleted_list']) as $listname => $entries) {
 		$a->reset();
-		echo "
-		<caption>", _T("{$cachelist['type_name']} $listname"), "</caption>";
 		?>
 
 	<form action="" method="post">
 	<table cellspacing="0" cellpadding="4" class="cycles entries" width="100%">
+		<caption><?php echo _T("{$cachelist['type_name']} $listname"); ?></caption>
 		<col />
 		<col />
Index: /trunk/coverager/coverager.css
===================================================================
--- /trunk/coverager/coverager.css	(revision 529)
+++ /trunk/coverager/coverager.css	(revision 530)
@@ -3,4 +3,6 @@
 th { font-size: 12px; }
 table { border-collapse: collapse; }
+table.center { margin-left: auto; margin-right: auto; }
+table\-center { text-align: center; }
 table.cycles { border: 1px solid black; margin-top: 5px; margin-bottom: 5px; }
 table.cycles .col1 { background-color: #f5f5f5; }
@@ -55,9 +57,13 @@
 .lineCov   { background-color: #F0F0F0; }
 .lineNoCov { background-color: #ffe0e0; }
+div.code {
+	border: 1px solid gray;
+	font-size: 12px;
+}
 pre.code {
 	font-family: monospace;
 	font-size: 12px;
 	white-space: pre;
-	border: 1px solid gray;
+	padding: 0; margin: 0;
 }
 
Index: /trunk/coverager/coverager.php
===================================================================
--- /trunk/coverager/coverager.php	(revision 529)
+++ /trunk/coverager/coverager.php	(revision 530)
@@ -114,6 +114,6 @@
 				$lines = explode('<br />', $lines);
 				$last = array_pop($lines);
+				$lines[count($lines) - 1] = $last;
 				$filecov = sprint_cov($fileinfo['cov'], $lines, false);
-				$filecov .= $last;
 				unset($source);
 			}
@@ -325,5 +325,5 @@
 		}
 		if (isset($cov[$offs])) {
-			$lines[$l] = sprintf("<li class=\"line%sCov\"> %s\t%s\n</li>"
+			$lines[$l] = sprintf("<li class=\"line%sCov\"><pre class=\"code\"> %s\t%s\n</pre></li>"
 					, $cov[$offs] ? '' : 'No'
 					, $cov[$offs]
@@ -331,5 +331,5 @@
 		}
 		else {
-			$lines[$l] = "<li>\t$line\n</li>";
+			$lines[$l] = "<li><pre class=\"code\">\t$line\n</pre></li>";
 		}
 	}
Index: /trunk/coverager/coverager.tpl.php
===================================================================
--- /trunk/coverager/coverager.tpl.php	(revision 529)
+++ /trunk/coverager/coverager.tpl.php	(revision 530)
@@ -1,3 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -56,5 +56,6 @@
 	$l_tds = _T("TODO");
 	return <<<EOS
-	<table align="center" cellpadding="2" cellspacing="0" border="0" class="cycles">
+<div class="table-center">
+	<table cellpadding="2" cellspacing="0" border="0" class="cycles center">
 	<tr>
 		<th>{$l_dir}</th><th>{$l_per}</th><th>{$l_hit}</th><th>{$l_lns}</th><th>{$l_tds}</th>
@@ -105,4 +106,5 @@
 	return <<<EOS
 	</table>
+</div>
 EOS;
 }
@@ -117,6 +119,6 @@
 	$l_lns = _T("Lines");
 	return <<<EOS
-	<br>
-	<table align="center" cellpadding="2" cellspacing="0" border="0" class="cycles">
+<div class="center-table">
+	<table cellpadding="2" cellspacing="0" border="0" class="cycles center">
 	<tr>
 		<th>{$l_fil}</th><th>{$l_per}</th><th>{$l_hit}</th><th>{$l_lns}</th>
@@ -162,4 +164,5 @@
 	return <<<EOS
     </table>
+</div>
 EOS;
 }
@@ -172,5 +175,7 @@
 	$path_html = htmlspecialchars($path);
 	echo <<<EOS
-	<a href="?">$l_root</a> $path<br />
+	<div>
+		<a href="?">$l_root</a> $path<br />
+	</div>
 EOS;
 	echo dir_head($dirinfo);
@@ -199,5 +204,7 @@
 	$dir_html = htmlspecialchars($dir);
 	echo <<<EOS
-	<a href="?">$l_root</a> <a href="?path={$dir_url}">{$dir_html}</a>/<strong>{$filename}</strong><br />
+	<div>
+		<a href="?">$l_root</a> <a href="?path={$dir_url}">{$dir_html}</a>/<strong>{$filename}</strong><br />
+	</div>
 EOS;
 
@@ -209,5 +216,7 @@
 		$tplfile_html = htmlspecialchars($tplfile);
 		echo <<<EOS
-		<a href="#tpl">{$tplfile_html}</a><br />
+		<div>
+			<a href="#tpl">{$tplfile_html}</a><br />
+		</div>
 EOS;
 	}
@@ -216,10 +225,14 @@
 	}
 	echo <<<EOS
-	<pre class="code"><ol>{$filecov}</ol></pre>
+	<div class="code">
+		<ol>{$filecov}</ol>
+	</div>
 EOS;
 	if ($tplfile) {
 		echo <<<EOS
 	<a name="tpl">{$tplfile}</a>
-	<pre class="code"><ol>{$tplcov}</ol></pre>
+	<div class="code">
+		<ol>{$tplcov}</ol>
+	</div>
 EOS;
 	}
