diff --git a/addons/website_hr_recruitment/recruitment.py b/addons/website_hr_recruitment/recruitment.py
index a9a32d4408a..c5865f9d22e 100644
--- a/addons/website_hr_recruitment/recruitment.py
+++ b/addons/website_hr_recruitment/recruitment.py
@@ -8,5 +8,5 @@ class hr_job(osv.osv):
     _columns = {
         'write_date': fields.datetime('Update Date', readonly=True),
         'website_published': fields.boolean('Available in the website'),
-        'description_website': fields.html('Description for the website'),
+        'website_description': fields.html('Description for the website'),
     }
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index de31866eb03..64542a3b0b1 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -98,15 +98,22 @@
   		    <div class="container oe_structure">
 			<hr/>
 		        <div class="row">
-			    <div class="pull-left">
-		    	    </div>
-			    <p t-field="job.description_website"></p>
+			    <div t-if="job.website_description">
+                                <div id="job_description" t-att-data-name="job.id"/>
+                            </div>
 			    <t t-call="website_hr_recruitment.applyjobpost"/>				
 		        </div>
 		    </div>
 		</div>
             </t>
         </template>
+
+	<template id="job_description" inherit_option_id="website_hr_recruitment.detail" name="Job Description">
+            <xpath expr="//div[@id='job_description']" position="replace">
+            	    <t t-field="job.website_description"/>
+            </xpath>
+        </template>
+
         <template id="applyjobpost">
             <t t-set="title">Apply Job</t>
             <section id="forms">
diff --git a/addons/website_hr_recruitment/website_hr_recruitment_demo.xml b/addons/website_hr_recruitment/website_hr_recruitment_demo.xml
index 992fe72173d..01b7857db30 100644
--- a/addons/website_hr_recruitment/website_hr_recruitment_demo.xml
+++ b/addons/website_hr_recruitment/website_hr_recruitment_demo.xml
@@ -5,14 +5,11 @@
     <record id="hr.job_marketing" model="hr.job">
         <field name="website_published">True</field>
         <field name="no_of_recruitment">5</field>
-        <field name="description_website"><![CDATA[
-<div class="oe_structure">
+        <field name="website_description" type="html">
 <center><strong>About the company</strong></center>
-<p>&nbsp;</p>
 <p>With a small team of smart people, we built the most disruptive enterprise in the world. Our product is a suite of 3000 business apps. It is fully open source, full featured and it’s online offer is 3 times cheaper than traditional competitors. We have 2.000.000 users, and we're growing fast.</p>
 <p>We are looking for a passionated marketer manager to help us make products people love to use. We need someone who is ambitious, passionated, and ..... not afraid to start new things, a lot of new things and scale them.</p>
 <center><strong>Responsibilities</strong></center>
-<p>&nbsp;</p>
 <p>We are looking for a marketing manager who is able to:</p>
 <ul>
 <li>Hire a team of great marketing people</li>
@@ -22,7 +19,6 @@
 <li>Improve our communication to customers</li>
 <li>Increase the visibility of the product</li>
 </ul>
-<p>&nbsp;</p>
 <p><strong>To succeed you need to be able to:</strong></p>
 <ul>
 <li>Write attractive content and build up marketing materials</li>
@@ -31,7 +27,6 @@
 <li>Scale our events organization all around the world</li>
 <li>Launch new products, marketing campaigns and offers</li>
 </ul>
-<p>&nbsp;</p>
 <p><strong>Your profile</strong></p>
 <ul>
 <li>You are creative</li>
@@ -40,81 +35,58 @@
 <li>You are approachable, honest and fun team player</li>
 </ul>
 <p>If you think you can fit, contact us and help us transform a traditional market.</p>
-<p>&nbsp;</p>
 <p><strong>Interested ?</strong></p>
 <p>If you are interested and if you think you could meet the requirements, please send your resume and application letter to <a href="mailto:jobs@yourcompany.com">jobs@yourcompany.com</a></p>
-<p>&nbsp;</p>
-</div>
-]]></field>
+</field>
     </record>
 	
     <record id="hr.job_developer" model="hr.job">
         <field name="website_published">True</field>
 	<field name="no_of_recruitment">5</field>
-        <field name="description_website"><![CDATA[
-<div class="oe_structure">
-<center><strong>About the company</strong></center>
-<p>&nbsp;</p>
-<p>With a small team of smart people, we built the most disruptive enterprise in the world. Our product is a suite of 3000 business apps. It is fully open source, full featured and it’s online offer is 3 times cheaper than traditional competitors. We have 2.000.000 users, and we're growing fast.</p>
-<p>Because of our constant growth, we're now looking for people to reinforce our team of enthusiastic developers. So if working on an open source project in a friendly and cooperative atmosphere sounds like fun to you, read on...</p>
-<p>&nbsp;</p>
-<strong>Job description</strong>
-<p>&nbsp;</p>
-<p>You will be responsible for developing and improving applications, such as the You will work autonomously as well as coordinate and supervise small distributed development teams for specific projects. You will become a technical expert of the product. You will report to the head of R&D and work closely with all developers and functional consultants. You will initially be coached by senior developers.</p>
-<p>&nbsp;</p>
-<center><strong>Your profile</strong></center>
-<p>&nbsp;</p>
-<ul>
-<li>Bachelor, master or engineer in computer science or equivalent by experience</li>
-<li>Preferably at least 1 year of experience</li>
-<li>Interest for enterprise application development</li>
-<li>Required skills:
-	<ul>
-		<li>Good knowledge of object oriented programming</li>
-		<li>Good knowledge of web design</li>
-	</ul>
-</li>
-<li>Nice-to-have skills:
-	<ul>
-		<li>Good knowledge of the used programming language</li>
-		<li>Good knowledge of the latest web technologies</li>
-		<li>Good language skills in other langages (Spanish, French, ...</li>
-		<li>Contributions to open source projects</li>
-	</ul>
-</li>
-<li>Passion for the Internet and its culture</li>
-<li>Quick and autonomous learner, problem-solving personality, enthusiastic when faced with technical challenges</li>
-<li>Team spirit and good communication</li>
-</ul>
-<p>&nbsp;</p>
-<center><strong>What we offer</strong></center>
-<ul>
-<li>A complete technical and functional training</li>
-<li>A nice working atmosphere in a passionate team</li>
-<li>The opportunity to join an open source project</li>
-<li>A full-time job with an attractive salary package</li>
-</ul>
-<p>&nbsp;</p>
-<center><strong>Interested ?</strong></center>
-<p>&nbsp;</p>
-<p>If you are interested and if you think you could meet the requirements, please send your resume and application letter to <a href="mailto:jobs@yourcompany.com">jobs@yourcompany.com</a></p>
-<p>&nbsp;</p>
-</div>
-]]></field>
+        <field name="website_description" type="html">
+	    <section snippet-id="text-block" class="mt16 mb16 dark">
+	    	<div class="container">
+        	    <div class="row">
+            	    	<div class="col-md-12 text-center mt16">
+                	    <h2>Experienced Developer</h2>
+                	    <h3 class="text-muted">Technical expert of the best product ever</h3>
+    			</div>
+			<div class="col-md-8 text-center col-md-offset-2">
+			    	You will be responsible for developing and improving applications, such as the You will work autonomously as well as 					coordinate and supervise small distributed development teams for specific projects. You will become a technical 				expert of the product.
+			</div>
+		    </div>
+		</div>
+	    </section>
+	    <section snippet-id="image-text" class="mt16 mb16">
+                <div class="container">
+                    <div class="row">
+			<div class="col-md-12 text-center mt16">
+                	    <h2>Responsibilities</h2>
+                	    <h5 class="small text-muted">You will ...</h5>
+    			</div>
+			<div class="col-md-8 col-md-offset-2">
+			    <ul>
+				<li>... work closely with all developers</li>
+				<li>... report to the head of RD</li>
+				<li>... initially be coached by senior developers</li>
+				<li>... become a technical expert of the product.</li>
+			    </ul>
+			</div>
+		    </div>
+		</div>
+	    </section>
+	</field>
     </record>
 
     <record id="hr.job_consultant" model="hr.job">
         <field name="website_published">True</field>
 	<field name="no_of_recruitment">5</field>
-        <field name="description_website"><![CDATA[
+        <field name="website_description" type="html">
 <div class="oe_structure">
 <center><strong>About the company</strong></center>
-<p>&nbsp;</p>
 <p>With a small team of smart people, we built the most disruptive enterprise in the world. Our product is a suite of 3000 business apps. It is fully open source, full featured and it’s online offer is 3 times cheaper than traditional competitors. We have 2.000.000 users, and we're growing fast.</p>
 <p>Because of our constant growth, we're now looking for people to reinforce our team of enthusiastic developers. So if working on an open source project in a friendly and cooperative atmosphere sounds like fun to you, read on...</p>
-<p>&nbsp;</p>
 <center><strong>You will be responsible to:</strong></center>
-<p>&nbsp;</p>
 <ul>
 <li>take part in the consulting services we provide to our customers</li>
 <li>analyse customer needs, write specification documents and quotation</li>
@@ -124,9 +96,7 @@
 <li>deliver generic training sessions to train customers</li>
 </ul>
 <p>You will report to the head of consulting services and work closely with all departments.</p>
-<p>&nbsp;</p>
 <center><strong>You will need the following skills:</strong></center>
-<p>&nbsp;</p>
 <ul>
 <li>You have a Master degree in Business Management, IT Management or Computer Sciences</li>
 <li>You have 2 or 3 years of experience</li>
@@ -137,16 +107,12 @@
 <li>You are approachable, honest and fun team player</li>
 <li>You are ready to travel</li>
 </ul>
-<p>&nbsp;</p>
 <center><strong>What do we offer you ?</strong></center>
-<p>&nbsp;</p>
 <p>You will be integrated into a great work ambiance, in a rich function, with a lot of opportunities to grow. Our offices provide a pleasant and friendly working environment for you to flourish in. And, last but not least, we offer you an attractive salary package!</p>
 <center><strong>Interested ?</strong></center>
-<p>&nbsp;</p>
 <p>If you are interested and if you think you could meet the requirements, please send your resume and application letter to <a href="mailto:jobs@yourcompany.com">jobs@yourcompany.com</a></p>
-<p>&nbsp;</p>
 </div>
-]]></field>
+</field>
     </record>
     </data>
 </openerp>