diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 3fb9ec52..b64c988c 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -28,7 +28,7 @@
             <a href="{{ site.url }}/community">Community</a>
           </li>
           <li{% if page.title == "Documentation" %} class="active"{% endif %}>
-            <a href="{{ site.url }}/workbook/readme">Documentation</a>
+            <a href="{{ site.url }}/workbook/workbook">Documentation</a>
           </li>
         </ul>
         <h3 class="muted">EiffelWeb</h3>
diff --git a/docs/workbook/readme.md b/docs/workbook/readme.md
index 7b3183be..cf2ae584 100644
--- a/docs/workbook/readme.md
+++ b/docs/workbook/readme.md
@@ -1,56 +1,4 @@
-# EWF Workbook
+The [Workbook](workbook) lets you discover the EiffelWeb framework.
 
-##### Table of Contents  
-* [EWF Core](#core)  
-* [EWF Introduction](#introduction)
-* [Handling Requests: Form/Query Parameter](#form_query_parameters)
-* [Handling Requests: Header Fields](#header_fields)
-* [Generating Responses](#generating_responses)
-* [Handling Cookies](#handling_cookies) 
-* [Web User Interface](#wui) 
-* [EWF Deployment](#deployment)
-
-<a name="core"></a>
-
-# EWF Core
-Before reading (or walking throught) the workbook, to get a quick overview of EWF, it is recommended to read the following articles:
-
-* [Getting Started with EWF](http://eiffelwebframework.github.io/EWF/getting-started/)
-* [EWF Documentation](http://eiffelwebframework.github.io/EWF/workbook/workbook)
-* [EWF Application Lifecyle](https://github.com/EiffelWebFramework/ewf_examples/wiki/Application-Lifecycle)
-
-
-<a name="introduction"></a>
-
-## Introduction
-[Basic Concepts](./basics/basics.md).
-
-<a name="form_query_parameters"></a>
-
-## Handling Requests: Form/Query Parameter
-[Handling Requests: Form/Query Parameter](./handling_request/form.md).
-
-<a name="header_fields"></a>
-
-## Handling Requests: Header Fields
-[Handling Requests: Header Fields](./handling_request/headers.md).
-
-<a name="generating_responses"></a>
-
-## Generating Response
-[Generating Responses](./generating_response/generating_response.md)
-
-<a name="wui"></a>
-
-## Web User Interface
-[Web User Interface](./wui/readme.md) 
-
-<a name="handling_cookies"></a>
-
-## Handling Cookies
-[Handling Cookies](./handling_cookies/handling_cookies.md) 
-
-<a name="deployment"></a>
-
-## EWF Deployment
-[EWF Deployment](./deployment/readme.md) 
+[Enter the documentation](workbook)
+		
diff --git a/docs/workbook/workbook.md b/docs/workbook/workbook.md
index 558f2fde..7b3183be 100644
--- a/docs/workbook/workbook.md
+++ b/docs/workbook/workbook.md
@@ -1,2 +1,56 @@
-See [README](./readme.md)
+# EWF Workbook
 
+##### Table of Contents  
+* [EWF Core](#core)  
+* [EWF Introduction](#introduction)
+* [Handling Requests: Form/Query Parameter](#form_query_parameters)
+* [Handling Requests: Header Fields](#header_fields)
+* [Generating Responses](#generating_responses)
+* [Handling Cookies](#handling_cookies) 
+* [Web User Interface](#wui) 
+* [EWF Deployment](#deployment)
+
+<a name="core"></a>
+
+# EWF Core
+Before reading (or walking throught) the workbook, to get a quick overview of EWF, it is recommended to read the following articles:
+
+* [Getting Started with EWF](http://eiffelwebframework.github.io/EWF/getting-started/)
+* [EWF Documentation](http://eiffelwebframework.github.io/EWF/workbook/workbook)
+* [EWF Application Lifecyle](https://github.com/EiffelWebFramework/ewf_examples/wiki/Application-Lifecycle)
+
+
+<a name="introduction"></a>
+
+## Introduction
+[Basic Concepts](./basics/basics.md).
+
+<a name="form_query_parameters"></a>
+
+## Handling Requests: Form/Query Parameter
+[Handling Requests: Form/Query Parameter](./handling_request/form.md).
+
+<a name="header_fields"></a>
+
+## Handling Requests: Header Fields
+[Handling Requests: Header Fields](./handling_request/headers.md).
+
+<a name="generating_responses"></a>
+
+## Generating Response
+[Generating Responses](./generating_response/generating_response.md)
+
+<a name="wui"></a>
+
+## Web User Interface
+[Web User Interface](./wui/readme.md) 
+
+<a name="handling_cookies"></a>
+
+## Handling Cookies
+[Handling Cookies](./handling_cookies/handling_cookies.md) 
+
+<a name="deployment"></a>
+
+## EWF Deployment
+[EWF Deployment](./deployment/readme.md)