diff --git a/addons/website_blog/__init__.py b/addons/website_blog/__init__.py
index f184fc83155..2d542504c81 100644
--- a/addons/website_blog/__init__.py
+++ b/addons/website_blog/__init__.py
@@ -20,5 +20,5 @@
 ##############################################################################
 
 import controllers
-import website_blog
+import models
 import wizard
diff --git a/addons/website_blog/__openerp__.py b/addons/website_blog/__openerp__.py
index 987ee74c72f..91e32de882d 100644
--- a/addons/website_blog/__openerp__.py
+++ b/addons/website_blog/__openerp__.py
@@ -32,16 +32,16 @@ OpenERP Blog
     'author': 'OpenERP SA',
     'depends': ['knowledge', 'website_mail'],
     'data': [
-        'website_blog_data.xml',
+        'data/website_blog_data.xml',
         'views/website_blog_classic.xml',
         'views/website_blog_templates.xml',
         # 'wizard/document_page_create_menu_view.xml',
         'wizard/document_page_show_diff_view.xml',
         'security/ir.model.access.csv',
-        'security/website_mail.xml',
+        'security/website_blog.xml',
     ],
     'demo': [
-        'website_blog_demo.xml'
+        'data/website_blog_demo.xml'
     ],
     'test': [
         'test/document_page_test00.yml'
diff --git a/addons/website_blog/website_blog_data.xml b/addons/website_blog/data/website_blog_data.xml
similarity index 100%
rename from addons/website_blog/website_blog_data.xml
rename to addons/website_blog/data/website_blog_data.xml
diff --git a/addons/website_blog/website_blog_demo.xml b/addons/website_blog/data/website_blog_demo.xml
similarity index 100%
rename from addons/website_blog/website_blog_demo.xml
rename to addons/website_blog/data/website_blog_demo.xml
diff --git a/addons/website_blog/models/__init__.py b/addons/website_blog/models/__init__.py
new file mode 100644
index 00000000000..fb5368a71c5
--- /dev/null
+++ b/addons/website_blog/models/__init__.py
@@ -0,0 +1 @@
+import website_blog
diff --git a/addons/website_blog/website_blog.py b/addons/website_blog/models/website_blog.py
similarity index 100%
rename from addons/website_blog/website_blog.py
rename to addons/website_blog/models/website_blog.py
diff --git a/addons/website_blog/security/website_mail.xml b/addons/website_blog/security/website_blog.xml
similarity index 100%
rename from addons/website_blog/security/website_mail.xml
rename to addons/website_blog/security/website_blog.xml
diff --git a/addons/website_blog/tests/test_controllers.py b/addons/website_blog/tests/test_controllers.py
index d1c28cab5af..33b37aede9d 100644
--- a/addons/website_blog/tests/test_controllers.py
+++ b/addons/website_blog/tests/test_controllers.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests.test_mail_base import TestMailBase
+from openerp.addons.mail.tests.common import TestMail
 from openerp.tools import mute_logger, email_split
 
 
-class TestControllers(TestMailBase):
+class TestControllers(TestMail):
 
     def test_00(self):
         cr, uid = self.cr, self.uid
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 1fe8b503c8d..c0565cea7d3 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -13,12 +13,12 @@
     </template>
 
     <!-- Blog Post Summary -->
-    <template id="view_blog_post_short" name="Blog Post Summary">
+    <template id="blog_post_short" name="Blog Post Summary">
         <div>
             <h2 class="text-center">
                 <a t-attf-href="/blog/#{blog_post.category_id.id}/#{blog_post.id}" t-field="blog_post.name"></a>
             </h2>
-            <p class="post-meta text-muted text-center">
+            <p class="post-meta text-muted text-center" name='blog_post_data'>
                 <span class="icon-calendar"> <span t-field="blog_post.create_date"/></span> &amp;nbsp;
                 <span class="icon-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
                 <span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment"> With 
@@ -33,30 +33,46 @@
     </template>
 
     <!-- Options: Blog Post Summary: hide author -->
-    <template id="view_blog_post_short_author" inherit_option_id="website_blog.view_blog_post_short" name="Hide Authors">
+    <template id="opt_blog_post_short_author" name="Hide Authors"
+            inherit_option_id="website_blog.blog_post_short">
         <xpath expr="//span[@class='icon-user']" position="attributes">
             <attribute name="class">hidden</attribute>
         </xpath>
     </template>
 
     <!-- Options: Blog Post Summary: show category -->
-    <template id="view_blog_post_short_category" inherit_option_id="website_blog.view_blog_post_short" name="Show Blog Name">
+    <template id="opt_blog_post_short_category" name="Blog Name"
+            inherit_option_id="website_blog.blog_post_short">
         <xpath expr="//span[@class='icon-user']" position="after">
             <span class="icon-folder-open"> In <span t-field="blog_post.category_id"/> &amp;nbsp;</span>
         </xpath>
     </template>
 
+    <!-- Option: Blog Post Summary: show tags -->
+    <template id="opt_blog_post_short_tags" name="Tags"
+            inherit_option_id="website_blog.blog_post_short" inherit_id="website_blog.blog_post_short">
+        <xpath expr="//p[@name='blog_post_data']" position="after">
+            <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
+                <span class="icon-tags"/>
+                <t t-foreach="blog_post.tag_ids" t-as="tag">
+                    <a t-attf-href="/blog/tag/#{tag.id}" t-esc="tag.name"/> &amp;nbsp;
+                </t>
+            </p>
+        </xpath>
+    </template>
+
     <!-- Blog Post Complete -->
-    <template id="view_blog_post" name="Blog Post">
+    <template id="blog_post_complete" name="Blog Post">
         <div>
             <t t-call="website.publish_management">
                 <t t-set="object" t-value="blog_post"/>
                 <t t-set="publish_edit" t-value="True"/>
             </t>
-        </div><div class="clearfix"/>
+        </div>
+        <div class="clearfix"/>
 
         <h1 class="text-center" t-field="blog_post.name"/>
-        <p class="post-meta text-muted text-center">
+        <p class="post-meta text-muted text-center" name="blog_post_data">
             <span class="icon-calendar"> <span t-field="blog_post.create_date"/></span> &amp;nbsp;
             <span class="icon-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
             <span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment"> With 
@@ -64,12 +80,6 @@
                 <a t-if="len(blog_post.message_ids) > 1" t-attf-href="#comments"><t t-esc="len(blog_post.message_ids)"/> comments</a>
             </span>
         </p>
-        <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
-            <span class="icon-tags"/>
-            <t t-foreach="blog_post.tag_ids" t-as="tag">
-                <a t-attf-href="/blog/tag/#{tag.id}" t-esc="tag.name"/> &amp;nbsp;
-            </t>
-        </p>
 
         <div t-field="blog_post.content" class="mt16"/>
         <hr class="mb32"/>
@@ -102,78 +112,102 @@
     </template>
 
     <!-- Options: Blog Post: user can reply -->
-    <template id="view_blog_post_author" inherit_option_id="website_blog.view_blog_post" name="Hide Authors">
+    <template id="opt_blog_post_complete_comment" name="Comment Form"
+            inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete">
         <xpath expr="//ul[last()]" position="after">
-        <section groups="group_website_blog_reply" class="mb32">
-            <h4>Leave a Comment</h4>
-            <form id="comment" t-attf-action="/blog/#{blog_post.category_id.id}/#{blog_post.id}/post#post"
-                    method="POST">
-                <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
-                <div class="pull-left mb32" style="width: 75%%">
-                    <textarea rows="3" class="form-control" placeholder="Write a comment..."></textarea>
-                    <button type="submit" class="btn btn-danger mt8">Post</button>
-                </div>
-            </form>
-        </section>
+            <section groups="group_website_blog_reply" class="mb32">
+                <h4>Leave a Comment</h4>
+                <form id="comment" t-attf-action="/blog/#{blog_post.category_id.id}/#{blog_post.id}/post#post"
+                        method="POST">
+                    <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
+                    <div class="pull-left mb32" style="width: 75%%">
+                        <textarea rows="3" class="form-control" placeholder="Write a comment..."></textarea>
+                        <button type="submit" class="btn btn-danger mt8">Post</button>
+                    </div>
+                </form>
+            </section>
         </xpath>
     </template>
 
     <!-- Options: Blog Post: hide author -->
-    <template id="view_blog_post_author" inherit_option_id="website_blog.view_blog_post" name="Hide Authors">
+    <template id="opt_blog_post_complete_author" name="Hide Authors"
+            inherit_option_id="website_blog.blog_post_complete">
         <xpath expr="//span[@class='icon-user']" position="attributes">
             <attribute name="class">hidden</attribute>
         </xpath>
     </template>
 
     <!-- Options: Blog Post: show category -->
-    <template id="view_blog_post_show_category" inherit_option_id="website_blog.view_blog_post" name="Show Blog Name">
+    <template id="opt_blog_post_complete_category" name="Blog Name"
+            inherit_option_id="website_blog.blog_post_complete">
         <xpath expr="//span[@class='icon-user']" position="after">
             <span class="icon-folder-open"> In <span t-field="blog_post.category_id"/> &amp;nbsp;</span>
         </xpath>
     </template>
 
+    <!-- Options: Blog Post: show tags -->
+    <template id="opt_blog_post_complete_tags" name="Tags"
+            inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete">
+        <xpath expr="//p[@name='blog_post_data']" position="after">
+            <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
+                <span class="icon-tags"/>
+                <t t-foreach="blog_post.tag_ids" t-as="tag">
+                    <a t-attf-href="/blog/tag/#{tag.id}" t-esc="tag.name"/> &amp;nbsp;
+                </t>
+            </p>
+        </xpath>
+    </template>
+
     <!-- Page --> 
     <template id="index" name="Blogs" page="True">
         <t t-call="website.layout">
-          <t t-set="head">
-              <script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"></script>
-              <link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
-          </t>
-          <t t-set="title">Blog</t>
-          <div id="wrap">
-            <div class="container mt16 js_website_blog">
-                <div class="row">
-                    <div class="col-lg-8 col-sm-9" t-if="not blog_post">
-                        <t t-foreach="blog_posts" t-as="blog_post" data-publish="">
-                            <t t-call="website_blog.view_blog_post_short"/>
-                        </t>
-                        <div class="pull-right" t-call="website.pager"/>
-                    </div>
-                    <div class="col-md-9 col-lg-8" t-if="blog_post">
-                        <t t-call="website_blog.view_blog_post">
-                          <t t-set="blog_post" t-value="blog_post"/>
-                        </t>
+            <t t-set="head">
+                <script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"></script>
+                <link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
+            </t>
+            <t t-set="title">Blog</t>
+            <div id="wrap">
+                <div class="container mt16 js_website_blog">
+                    <div class="row">
+                        <div class="col-lg-12 col-sm-12" t-if="not blog_post" id="blog_post">
+                            <t t-foreach="blog_posts" t-as="blog_post" data-publish="">
+                                <t t-call="website_blog.blog_post_short"/>
+                            </t>
+                            <div class="pull-right" t-call="website.pager"/>
+                        </div>
+                        <div class="col-lg-12 col-sm-12" t-if="blog_post" id="blog_posts_summary">
+                            <t t-call="website_blog.blog_post_complete">
+                                <t t-set="blog_post" t-value="blog_post"/>
+                            </t>
+                        </div>
                     </div>
                 </div>
             </div>
-          </div>
         </t>
     </template>
 
-    <!-- Option: right column -->
-    <template id="blog_right_column" inherit_id="website_blog.index" inherit_option_id="website_blog.index" name="Right Column">
+    <!-- Option: Blog: Right Column -->
+    <template id="blog_right_column" name="Right Column"
+             inherit_option_id="website_blog.index" inherit_id="website_blog.index">
         <xpath expr="//div[@class='row']" position="inside">
-            <div class="col-sm-3 hidden-xs col-lg-offset-1 mb32" id="right_column">
+            <div class="col-lg-3 col-sm-3 hidden-xs col-lg-offset-1 mb32" id="right_column">
                 <t t-if="category and editable">
                     <a t-attf-href="/blog/#{category.id}/new" class="btn btn-primary pull-right">New Blog Post</a>
                 </t>
                 <div class="clearfix mb48"/>
             </div>
         </xpath>
+        <xpath expr="//div[@id='blog_post']" position="attributes">
+            <attribute name="class">col-lg-8 col-sm-8</attribute>
+        </xpath>
+        <xpath expr="//div[@id='blog_posts_summary']" position="attributes">
+            <attribute name="class">col-lg-8 col-sm-8</attribute>
+        </xpath>
     </template>
 
     <!-- Option: Right Column: archives -->
-    <template id="blog_history" inherit_id="website_blog.blog_right_column" inherit_option_id="website_blog.blog_right_column" name="Archives">
+    <template id="opt_blog_rc_history" name="Archives"
+            inherit_option_id="website_blog.blog_right_column" inherit_id="website_blog.blog_right_column">
         <xpath expr="//div[@id='right_column']" position="inside">
             <section>
             <h4>Archives</h4>
@@ -195,7 +229,8 @@
     </template>
 
     <!-- Option: Right Column: about us -->
-    <template id="blog_aboutus" inherit_option_id="website_blog.blog_right_column" inherit_id="website_blog.blog_right_column" name="About" priority="4">
+    <template id="opt_blog_rc_about_us" name="About Us" priority="4"
+            inherit_option_id="website_blog.blog_right_column" inherit_id="website_blog.blog_right_column">
         <xpath expr="//div[@id='right_column']" position="inside">
             <section class="mb16">
             <h4>About us</h4>
@@ -211,7 +246,8 @@
     </template>
 
     <!-- Option: Right Column: follow us -->
-    <template id="blog_followus" inherit_option_id="website_blog.blog_right_column" inherit_id="website_blog.blog_right_column" name="Follow us" priority="2">
+    <template id="opt_blog_rc_follow_us" name="Follow us" priority="2"
+            inherit_option_id="website_blog.blog_right_column" inherit_id="website_blog.blog_right_column">
         <xpath expr="//div[@id='right_column']" position="inside">
             <section class="mb16">
                 <h4>Follow us</h4>
@@ -239,8 +275,9 @@
         </xpath>
     </template>
 
-    <!-- Option: Right Column: categories + category in blog post -->
-    <template id="blog_categories" inherit_option_id="website_blog.blog_right_column" name="Other Blogs" priority="6">
+    <!-- Option: Right Column: categories -->
+    <template id="opt_blog_rc_categories" name="Other Blogs" priority="6"
+            inherit_option_id="website_blog.blog_right_column">
         <xpath expr="//div[@id='right_column']" position="inside">
             <section class="mb16">
             <h4>Other Blogs</h4>
@@ -257,5 +294,5 @@
         </xpath>
     </template>
 
- </data>
+</data>
 </openerp>