diff --git a/website/apps/frontend/modules/manual/actions/actions.class.php b/website/apps/frontend/modules/manual/actions/actions.class.php
index 5191ad2ce..956f29816 100644
--- a/website/apps/frontend/modules/manual/actions/actions.class.php
+++ b/website/apps/frontend/modules/manual/actions/actions.class.php
@@ -305,6 +305,8 @@ class manualActions extends sfActions
 
         $title = $this->renderer->getOption('title');
         $this->title = $title;
+        
+        $this->renderer->setOption('url_prefix', '?one-page');
     } else {
         $this->output = $cache->fetch($cacheId);
 
diff --git a/website/apps/frontend/modules/manual/templates/indexSuccess.php b/website/apps/frontend/modules/manual/templates/indexSuccess.php
index a4d81b153..bfe5ee112 100644
--- a/website/apps/frontend/modules/manual/templates/indexSuccess.php
+++ b/website/apps/frontend/modules/manual/templates/indexSuccess.php
@@ -1,19 +1,20 @@
 <div class="content">
-  <h1>Doctrine Manual</h1>
+  <h1><?php echo link_to('Doctrine Manual', '@manual'); ?></h1>
 </div>
 
-
-<?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; ?>
+<div class="content" id="manual">
+  <?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; ?>
+</div>
 
 <?php slot('right'); ?>
   <h2>Table of Contents</h2>
diff --git a/website/apps/frontend/modules/manual/templates/xhtml.tpl.php b/website/apps/frontend/modules/manual/templates/xhtml.tpl.php
index c83d67e45..f14259805 100644
--- a/website/apps/frontend/modules/manual/templates/xhtml.tpl.php
+++ b/website/apps/frontend/modules/manual/templates/xhtml.tpl.php
@@ -1,3 +1 @@
-<div id="manual">
-  %CONTENT%
-</div>
\ No newline at end of file
+%CONTENT%
\ No newline at end of file