diff --git a/caotek_mesavoirs.egg-info/requires.txt b/caotek_mesavoirs.egg-info/requires.txt
index 81afbd7..6a14b3e 100644
--- a/caotek_mesavoirs.egg-info/requires.txt
+++ b/caotek_mesavoirs.egg-info/requires.txt
@@ -10,7 +10,7 @@ zope.sqlalchemy
 waitress
 mysqlclient
 yfinance
-docutils
+markdown2
 
 [testing]
 WebTest>=1.3.1
diff --git a/caotek_mesavoirs/__init__.py b/caotek_mesavoirs/__init__.py
index 3552810..76f21a0 100644
--- a/caotek_mesavoirs/__init__.py
+++ b/caotek_mesavoirs/__init__.py
@@ -3,7 +3,6 @@ from pyramid.authorization import ACLAuthorizationPolicy
 from pyramid.config import Configurator
 from pyramid_mailer import mailer_factory_from_settings
 from pyramid.session import SignedCookieSessionFactory
-from .security import groupfinder
 
 from .security import groupfinder
 
diff --git a/caotek_mesavoirs/layout.py b/caotek_mesavoirs/layout.py
index b783146..3157355 100644
--- a/caotek_mesavoirs/layout.py
+++ b/caotek_mesavoirs/layout.py
@@ -8,7 +8,7 @@ from .views.default import (
     to_decimal,
 )
 
-@layout_config(template='templates/layouts/global_layout.pt')
+@layout_config(template='templates/global_layout.pt')
 class GlobalLayout(object):
     # page_title = "Pagode Tinh-Do"
 
diff --git a/caotek_mesavoirs/models/__init__.py b/caotek_mesavoirs/models/__init__.py
index 18037e8..2750542 100644
--- a/caotek_mesavoirs/models/__init__.py
+++ b/caotek_mesavoirs/models/__init__.py
@@ -9,10 +9,6 @@ from pyramid.security import (
     DENY_ALL,
     )
 
-# run configure_mappers after defining all of the models to ensure
-# all relationships can be setup
-configure_mappers()
-
 class RootFactory(object):
     """Defines an ACL for groups/permissions mapping"""
     __acl__ = [ (Allow, Authenticated, 'view'),
@@ -22,6 +18,10 @@ class RootFactory(object):
     def __init__(self, request):
         pass
 
+# run configure_mappers after defining all of the models to ensure
+# all relationships can be setup
+configure_mappers()
+
         
 def get_engine(settings, prefix='sqlalchemy.'):
     return engine_from_config(settings, prefix)
@@ -64,14 +64,18 @@ def includeme(config):
     """
     Initialize the model for a Pyramid app.
 
-    Activate this setup using ``config.include('mondumas.models')``.
+    Activate this setup using ``config.include('caotek_mesavoirs.models')``.
 
     """
     settings = config.get_settings()
+    settings['tm.manager_hook'] = 'pyramid_tm.explicit_manager'
 
     # use pyramid_tm to hook the transaction lifecycle to the request
     config.include('pyramid_tm')
 
+    # use pyramid_retry to retry a request when transient exceptions occur
+    config.include('pyramid_retry')
+
     session_factory = get_session_factory(get_engine(settings))
     config.registry['dbsession_factory'] = session_factory
 
diff --git a/caotek_mesavoirs/templates/404.pt b/caotek_mesavoirs/templates/404.pt
index 6c68121..314cb7e 100644
--- a/caotek_mesavoirs/templates/404.pt
+++ b/caotek_mesavoirs/templates/404.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: global_layout.pt">
 <div metal:fill-slot="content">
 
 <div class="content text-center">
@@ -11,4 +11,4 @@
 <br />
 
 </div><!-- content -->
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/actifs/actif2_edit.pt b/caotek_mesavoirs/templates/actifs/actif2_edit.pt
index 140751d..f2a41cb 100644
--- a/caotek_mesavoirs/templates/actifs/actif2_edit.pt
+++ b/caotek_mesavoirs/templates/actifs/actif2_edit.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
 
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
@@ -112,4 +112,4 @@ $(document).ready(function() {
 </script>
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/actifs/actif_edit.pt b/caotek_mesavoirs/templates/actifs/actif_edit.pt
index 6369518..1a230b7 100644
--- a/caotek_mesavoirs/templates/actifs/actif_edit.pt
+++ b/caotek_mesavoirs/templates/actifs/actif_edit.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
 
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
@@ -128,4 +128,4 @@ $(document).ready(function() {
 </script>
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/actifs/allocation_edit.pt b/caotek_mesavoirs/templates/actifs/allocation_edit.pt
index c8ae858..db9662b 100644
--- a/caotek_mesavoirs/templates/actifs/allocation_edit.pt
+++ b/caotek_mesavoirs/templates/actifs/allocation_edit.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
 
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
@@ -59,4 +59,4 @@ $(document).ready(function() {
 </script>
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/actifs/histo_edit.pt b/caotek_mesavoirs/templates/actifs/histo_edit.pt
index 01624b8..568b76f 100644
--- a/caotek_mesavoirs/templates/actifs/histo_edit.pt
+++ b/caotek_mesavoirs/templates/actifs/histo_edit.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
 
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
@@ -64,4 +64,4 @@ $(document).ready(function() {
 </script>
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/actifs/histo_list.pt b/caotek_mesavoirs/templates/actifs/histo_list.pt
index 12fd2f3..85d6078 100644
--- a/caotek_mesavoirs/templates/actifs/histo_list.pt
+++ b/caotek_mesavoirs/templates/actifs/histo_list.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
   <div metal:fill-slot="content">
 
     <p>
@@ -53,6 +53,6 @@
 </script>
 
 </div><!-- content -->
-</metal:block>
+</div>
 
 
diff --git a/caotek_mesavoirs/templates/actifs/portfolio.pt b/caotek_mesavoirs/templates/actifs/portfolio.pt
index 5be5955..58c0b79 100644
--- a/caotek_mesavoirs/templates/actifs/portfolio.pt
+++ b/caotek_mesavoirs/templates/actifs/portfolio.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
 
 	<div tal:condition="message" tal:content="message" class="alert alert-success" />
@@ -228,5 +228,5 @@
 	</script>
 
 </div><!-- content -->
-</metal:block>
+</div>
 
diff --git a/caotek_mesavoirs/templates/apropos.pt b/caotek_mesavoirs/templates/apropos.pt
index d994025..c603ca1 100644
--- a/caotek_mesavoirs/templates/apropos.pt
+++ b/caotek_mesavoirs/templates/apropos.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: global_layout.pt">
 <div metal:fill-slot="content">
 
 	<br />
@@ -31,4 +31,4 @@
 	</div>
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/archives.pt b/caotek_mesavoirs/templates/archives.pt
index 8ab61c6..9afad88 100644
--- a/caotek_mesavoirs/templates/archives.pt
+++ b/caotek_mesavoirs/templates/archives.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: global_layout.pt">
 <div metal:fill-slot="content">
 
 	<div class="row">
@@ -19,5 +19,5 @@
 	<br />
 </div>
 
-</metal:block>
+</div>
 
diff --git a/caotek_mesavoirs/templates/doc_edit.pt b/caotek_mesavoirs/templates/doc_edit.pt
index e910f78..7b4a11d 100644
--- a/caotek_mesavoirs/templates/doc_edit.pt
+++ b/caotek_mesavoirs/templates/doc_edit.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: global_layout.pt">
 <div metal:fill-slot="content">
 
 	<div class="alert alert-danger" tal:condition="message" tal:content="message" />
@@ -84,4 +84,4 @@ $(document).ready(function() {
 </script>
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/doc_search.pt b/caotek_mesavoirs/templates/doc_search.pt
index 83019ed..56b88c5 100644
--- a/caotek_mesavoirs/templates/doc_search.pt
+++ b/caotek_mesavoirs/templates/doc_search.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: global_layout.pt">
 <div metal:fill-slot="content">
 
     <div class="row">
@@ -74,4 +74,4 @@ $(document).ready(function() {
 </script>
 	
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/doc_view.pt b/caotek_mesavoirs/templates/doc_view.pt
index 8563b82..2d5a981 100644
--- a/caotek_mesavoirs/templates/doc_view.pt
+++ b/caotek_mesavoirs/templates/doc_view.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: global_layout.pt">
 <div metal:fill-slot="content">
 
 	<p>
@@ -17,4 +17,4 @@
 	<br />
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/layouts/global_layout.pt b/caotek_mesavoirs/templates/global_layout.pt
similarity index 97%
rename from caotek_mesavoirs/templates/layouts/global_layout.pt
rename to caotek_mesavoirs/templates/global_layout.pt
index 9025f53..7ea9b81 100644
--- a/caotek_mesavoirs/templates/layouts/global_layout.pt
+++ b/caotek_mesavoirs/templates/global_layout.pt
@@ -17,26 +17,6 @@
     <!--    Custom CSS    -->
     <link href="${request.static_url('caotek_mesavoirs:static/css/style.less')}" type="text/css" rel="stylesheet/less">
 
-    <!--    Bootstrap + jQuery JavaScript plugins) -->
-    <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
-    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-
-    <!--    Bootstrap moment plugin   -->
-    <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment.min.js"></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/locale/fr.js"></script>
-    <!--    Bootstrap Datepicker plugin   -->
-    <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script>
-    <!--    Datatable  -->   
-    <script src="//cdn.datatables.net/1.10.18/js/jquery.dataTables.min.js"></script>
-    <script src="//cdn.datatables.net/1.10.18/js/dataTables.bootstrap.min.js"></script>
-    <script src="//cdn.datatables.net/plug-ins/1.10.19/sorting/datetime-moment.js"></script>
-    <!--    FormValidation plugin   -->
-    <script src="${request.static_url('caotek_mesavoirs:static/dist/formvalidation/js/formValidation.min.js')}"></script>
-    <script src="${request.static_url('caotek_mesavoirs:static/dist/formvalidation/js/framework/bootstrap.min.js')}"></script>
-    <script src="${request.static_url('caotek_mesavoirs:static/dist/formvalidation/js/language/fr_FR.js')}" type="text/javascript"></script>
-
-    <!--    Less -->
-    <script src="//cdnjs.cloudflare.com/ajax/libs/less.js/2.5.3/less.min.js" type="text/javascript"></script>
 </head>
 <body>
 
@@ -107,7 +87,29 @@
         </div>
     </footer>
 
-    <div metal:define-slot="additional_scripts" />
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <!--    Bootstrap + jQuery JavaScript plugins) -->
+    <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+    <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+
+    <!--    Bootstrap moment plugin   -->
+    <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/locale/fr.js"></script>
+    <!--    Bootstrap Datepicker plugin   -->
+    <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/js/bootstrap-datetimepicker.min.js"></script>
+    <!--    Datatable  -->   
+    <script src="//cdn.datatables.net/1.10.18/js/jquery.dataTables.min.js"></script>
+    <script src="//cdn.datatables.net/1.10.18/js/dataTables.bootstrap.min.js"></script>
+    <script src="//cdn.datatables.net/plug-ins/1.10.19/sorting/datetime-moment.js"></script>
+    <!--    FormValidation plugin   -->
+    <script src="${request.static_url('caotek_mesavoirs:static/dist/formvalidation/js/formValidation.min.js')}"></script>
+    <script src="${request.static_url('caotek_mesavoirs:static/dist/formvalidation/js/framework/bootstrap.min.js')}"></script>
+    <script src="${request.static_url('caotek_mesavoirs:static/dist/formvalidation/js/language/fr_FR.js')}" type="text/javascript"></script>
+
+    <!--    Less -->
+    <script src="//cdnjs.cloudflare.com/ajax/libs/less.js/2.5.3/less.min.js" type="text/javascript"></script>
 
 </body>
 </html>
diff --git a/caotek_mesavoirs/templates/home.pt b/caotek_mesavoirs/templates/home.pt
index 9669b15..94fbe52 100644
--- a/caotek_mesavoirs/templates/home.pt
+++ b/caotek_mesavoirs/templates/home.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: global_layout.pt">
 <div metal:fill-slot="content">
 
 	<div class="row">
@@ -37,5 +37,5 @@
 	</div>
 
 </div><!-- content -->
-</metal:block>
+</div>
 
diff --git a/caotek_mesavoirs/templates/members/envoyer_mdp.pt b/caotek_mesavoirs/templates/members/envoyer_mdp.pt
index b02c754..54c0c82 100644
--- a/caotek_mesavoirs/templates/members/envoyer_mdp.pt
+++ b/caotek_mesavoirs/templates/members/envoyer_mdp.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
 
     <div class="container">
@@ -25,4 +25,4 @@
 
     </div><!-- container -->
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/members/login.pt b/caotek_mesavoirs/templates/members/login.pt
index b5d530e..0ba057c 100644
--- a/caotek_mesavoirs/templates/members/login.pt
+++ b/caotek_mesavoirs/templates/members/login.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
 <div class="row">
@@ -76,4 +76,4 @@ $(document).ready(function() {
 </script>
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/members/preferences.pt b/caotek_mesavoirs/templates/members/preferences.pt
index e2d7a46..97cbf9a 100644
--- a/caotek_mesavoirs/templates/members/preferences.pt
+++ b/caotek_mesavoirs/templates/members/preferences.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
 
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
@@ -67,4 +67,4 @@ $(document).ready(function() {
 </script>
 
 </div>
-</metal:block>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/caotek_mesavoirs/templates/members/redefinir_mdp.pt b/caotek_mesavoirs/templates/members/redefinir_mdp.pt
index 11c956c..42df564 100644
--- a/caotek_mesavoirs/templates/members/redefinir_mdp.pt
+++ b/caotek_mesavoirs/templates/members/redefinir_mdp.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
     <div class="container">
 
@@ -43,4 +43,4 @@ $(document).ready(function() {
 });
 </script>
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/members/user_edit.pt b/caotek_mesavoirs/templates/members/user_edit.pt
index 9eb5046..09fbc5d 100644
--- a/caotek_mesavoirs/templates/members/user_edit.pt
+++ b/caotek_mesavoirs/templates/members/user_edit.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
 <div metal:fill-slot="content">
 
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
@@ -99,4 +99,4 @@ $(document).ready(function() {
 </script>
 
 </div>
-</metal:block>
+</div>
diff --git a/caotek_mesavoirs/templates/members/users_list.pt b/caotek_mesavoirs/templates/members/users_list.pt
index d7cd33c..e2ac6e7 100644
--- a/caotek_mesavoirs/templates/members/users_list.pt
+++ b/caotek_mesavoirs/templates/members/users_list.pt
@@ -1,4 +1,4 @@
-<metal:block use-macro="main_template">
+<div metal:use-macro="load: ../global_layout.pt">
   <div metal:fill-slot="content">
 
     <p>
@@ -49,6 +49,6 @@
 </script>
 
 </div><!-- content -->
-</metal:block>
+</div>
 
 
diff --git a/caotek_mesavoirs/views/default.py b/caotek_mesavoirs/views/default.py
index 2b98b97..1507580 100644
--- a/caotek_mesavoirs/views/default.py
+++ b/caotek_mesavoirs/views/default.py
@@ -12,7 +12,6 @@ from pyramid.httpexceptions import (
 )
 from pyramid_mailer import get_mailer
 from pyramid_mailer.message import Message, Attachment
-from docutils.core import publish_parts
 
 from sqlalchemy.exc import DBAPIError
 from ..security import groupfinder
@@ -125,7 +124,6 @@ def doc_edit(request):
                 new_values[param] = request.params[param]
 
         if new_values:   
-            import pdb;pdb.set_trace()
             update_doc(request, doc_id, new_values)              
             if doc_id != '0':
                 return HTTPFound(location=request.route_url('doc_view', doc_id=doc_id))
@@ -192,10 +190,7 @@ def doc_view(request):
     
     # insèrer le path de static/img
     texte = doc.texte.replace('static/img/', "%s/static/img/" % request.application_url)
-    
-    # convertir reST en HTML
-    # texte = publish_parts(texte, writer_name='html')['html_body']
-    
+       
     # convertir mardown en HTML
     from markdown2 import Markdown
     markdowner = Markdown()
@@ -229,3 +224,4 @@ monaa.caotek.fr
     mailer.send_immediately(message)
 
 
+
diff --git a/caotek_mesavoirs/views/members.py b/caotek_mesavoirs/views/members.py
index d60196e..7f11003 100644
--- a/caotek_mesavoirs/views/members.py
+++ b/caotek_mesavoirs/views/members.py
@@ -128,7 +128,6 @@ def redefinir_mdp(request):
 @forbidden_view_config(renderer='../templates/members/login.pt')
 def login(request):
 
-    current_route_path = request.current_route_path()
     login = ''
     login_url = request.route_url('login')
 
diff --git a/setup.py b/setup.py
index 53353bc..b51c259 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ requires = [
     'waitress',
     'mysqlclient',
     'yfinance',
-    'docutils',
+    'markdown2',
     ]
 
 tests_require = [