diff --git a/website/apps/frontend/modules/manual/actions/actions.class.php b/website/apps/frontend/modules/manual/actions/actions.class.php
index f307b3356..5191ad2ce 100644
--- a/website/apps/frontend/modules/manual/actions/actions.class.php
+++ b/website/apps/frontend/modules/manual/actions/actions.class.php
@@ -272,6 +272,8 @@ class manualActions extends sfActions
 
         case 'Xhtml':
         default:
+            $this->renderer->setOption('template', file_get_contents(dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR.'templates/xhtml.tpl.php'));
+            
             $viewIndex = true;
 
             if (isset($_GET['one-page'])) {
diff --git a/website/apps/frontend/modules/manual/templates/indexSuccess.php b/website/apps/frontend/modules/manual/templates/indexSuccess.php
index ff8d41682..a4d81b153 100644
--- a/website/apps/frontend/modules/manual/templates/indexSuccess.php
+++ b/website/apps/frontend/modules/manual/templates/indexSuccess.php
@@ -1,17 +1,21 @@
-<h1>Doctrine Manual</h1>
+<div class="content">
+  <h1>Doctrine Manual</h1>
+</div>
 
-<p>There are several different versions of this manual available online:
-<ul>
-<li>View as <a href="?one-page">all chapters in one page</a>.</li>
-<li>View as <a href="?chapter=<?php echo $toc->findByIndex('1.')->getPath(); ?>">one chapter per page</a>.</li>
-<li>Download the <a href="?format=pdf">PDF version</a>.</li>
-</ul>
-</p>
 
 <?php if( isset($output) ): ?>
   <?php echo $output; ?>
+<?php else: ?>
+  <p>There are several different versions of this manual available online:
+    <ul>
+      <li>View as <a href="?one-page">all chapters in one page</a>.</li>
+      <li>View as <a href="?chapter=<?php echo $toc->findByIndex('1.')->getPath(); ?>">one chapter per page</a>.</li>
+      <li>Download the <a href="?format=pdf">PDF version</a>.</li>
+    </ul>
+  </p>
 <?php endif; ?>
 
 <?php slot('right'); ?>
+  <h2>Table of Contents</h2>
   <?php echo $renderer->renderToc(); ?>
 <?php end_slot(); ?>
\ No newline at end of file
diff --git a/website/apps/frontend/modules/manual/templates/xhtml.tpl.php b/website/apps/frontend/modules/manual/templates/xhtml.tpl.php
index 5fff596d1..c83d67e45 100644
--- a/website/apps/frontend/modules/manual/templates/xhtml.tpl.php
+++ b/website/apps/frontend/modules/manual/templates/xhtml.tpl.php
@@ -1,62 +1,3 @@
-<!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" xml:lang="en" lang="en">
-
-<head>
-
-<title>%TITLE%</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="description" content="%SUBJECT%" />
-<meta name="keywords" content="%KEYWORDS" />
-
-<link rel="stylesheet" type="text/css" href="styles/basic.css" media="screen"/>
-<link rel="stylesheet" type="text/css" href="styles/print.css" media="print"/>
-
-<!--[if gte IE 5.5]>
-<![if lt IE 7]>
-<link rel="stylesheet" type="text/css" href="styles/iefix.css"/>
-<![endif]>
-<![endif]-->
-
-<script type="text/javascript">
-//<![CDATA[
-var tocHideText = "hide"; var tocShowText = "show";
-var tocStickyText = "sticky"; var tocUnstickyText = 'unstick';
-//]]>
-</script>
-
-<script type="text/javascript" src="scripts/mootools.v1.11.js"></script>
-<script type="text/javascript" src="scripts/tree.js"></script>
-<script type="text/javascript" src="scripts/toc.js"></script>
-
-</head>
-
-<body>
-
-<div id="wrap">
-
-<div id="sidebar">
-
-<div id="table-of-contents">
-
-<h1>Table of Contents</h1>
-
-%TOC%
-
-<p><a href=".">Index</a></p>
-
-</div>
-
-</div>
-
-<div id="content">
-
-%CONTENT%
-
-</div>
-
-</div>
-
-
-</body>
-</html>
+<div id="manual">
+  %CONTENT%
+</div>
\ No newline at end of file
diff --git a/website/apps/frontend/templates/layout.php b/website/apps/frontend/templates/layout.php
index 0737c634d..7745ea948 100644
--- a/website/apps/frontend/templates/layout.php
+++ b/website/apps/frontend/templates/layout.php
@@ -36,7 +36,7 @@
   </div>
   
   <div id="footer">
-    <h1>Copyright Doctrine 2007</h1>
+    <?php echo get_partial('global/footer'); ?>
   </div>
 </div>
 
diff --git a/website/web/css/manual.css b/website/web/css/manual.css
index ae4990e6a..cd8d57efd 100644
--- a/website/web/css/manual.css
+++ b/website/web/css/manual.css
@@ -199,4 +199,9 @@ ul.tree {
 
 #toc-toggles a {
     margin-left: 0.5em;
+}
+
+#right ul li
+{
+  list-style-type: none;
 }
\ No newline at end of file
