diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py
index 1351efcde36..339b0c8ec41 100644
--- a/addons/website_hr_recruitment/controllers/main.py
+++ b/addons/website_hr_recruitment/controllers/main.py
@@ -82,9 +82,14 @@ class website_hr_recruitment(http.Controller):
            }
         return request.website.render("website_hr_recruitment.thankyou", values)
    
-    @website.route(['/apply'], type='http', auth="public")
-    def applyjobpost(self, **post):
-        return request.website.render("website_hr_recruitment.applyjobpost")
+    @website.route(['/apply/<int:id>'], type='http', auth="public")
+    def applyjobpost(self, id=0):
+        id = id and int(id) or 0
+        job = request.registry['hr.job'].browse(request.cr, request.uid, id)
+        values = {
+            'job': job
+        }
+        return request.website.render("website_hr_recruitment.applyjobpost", values)
 
     @website.route(['/job/detail/<int:job_id>/subscribe'], type='http', auth="public")
     def subscribe(self, job_id=None, **post):
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 9e6ede4e77a..2b3f50f9c88 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -96,8 +96,19 @@
 			<hr/>
 		        <div class="row">
 			    <div t-if="job.website_description">
-                                 <t t-field="job.website_description"/>
-                            </div>				
+                                <t t-field="job.website_description"/>
+				<section snippet-id="cta" class="mt16 mb16">
+				    <div class="container">
+				        <div class="row">
+					    <hr/>
+					    <div class="col-md-12 text-center mt16 mb16">
+					    	<a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
+					    	<a t-attf-href="/apply/#{ job.id }/" class="btn btn-primary btn-lg">Apply</a>
+					    </div>
+				      	</div>
+				    </div>
+				</section> 
+                            </div>
 		        </div>
 		    </div>
 		</div>
@@ -113,9 +124,9 @@
 		        <div class="row">
             <section id="forms">
                     <form class="form-horizontal mt32" action="/job/success" method="post" enctype="multipart/form-data">
-                       <!-- <input type="hidden" t-att-value="job.department_id.id" name="department_id"/>
+                        <input type="hidden" t-att-value="job.department_id.id" name="department_id"/>
                         <input type="hidden" t-att-value="job.id" name="job_id"/>
-                        <input type="hidden" t-att-value="job.name" name="name"/>-->
+                        <input type="hidden" t-att-value="job.name" name="name"/>
                         <div class="form-group">
                             <label class="col-md-3 col-sm-4 control-label" for="partner_name">Name</label>
                             <div class="col-md-7 col-sm-8">
@@ -155,18 +166,11 @@
         <template id="thankyou">
             <t t-call="website.layout">
                 <t t-set="title">Thank You!</t>
-                <div class="col-md-4 pull-right">
-                    <ul class="pager">
-                        <li><a t-att-href="'/job/detail/%%s' %% jobid">All Jobs</a></li>
-                    </ul>
-                </div>
-                <section id="typography">
+		<div id="wrap">
                     <div class="container">
-                        <div class="row">
-                            <h2>You have successfully applied for job.</h2>
-                        </div>
+			<h1>You have successfully applied for job.</h1>
                     </div>
-                </section>
+                </div>
             </t>
         </template>
 	<template id="job_departments" inherit_option_id="website_hr_recruitment.index" name="Job Departments">
diff --git a/addons/website_hr_recruitment/website_hr_recruitment_demo.xml b/addons/website_hr_recruitment/website_hr_recruitment_demo.xml
index e10856d6a68..507a3eb7c4c 100644
--- a/addons/website_hr_recruitment/website_hr_recruitment_demo.xml
+++ b/addons/website_hr_recruitment/website_hr_recruitment_demo.xml
@@ -135,19 +135,6 @@
 		    </div>
 		</div>
 	    </section>
-	    <section snippet-id="cta" class="mt16 mb16">
-            	<div class="container">
-              	    <div class="row">
-			<section snippet-id="hr" class="mt16 mb16 dark">
-			    <hr/>
-	    		</section>
-                	<div class="col-md-12 text-center mt16 mb16">
-                    	    <a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
-                    	    <a href="/page/website_hr_recruitment.applyjobpost" class="btn btn-primary btn-lg">Apply</a>
-                	</div>
-              	    </div>
-            	</div>
-	    </section>
 	</field>
     </record>
 
@@ -184,7 +171,7 @@
 			      <!-- List group -->
 			      <ul class="list-group">
 			        <li class="list-group-item">You will work closely with all developers</li>
-			        <li class="list-group-item">You will report to the head of RD</li>
+			        <li class="list-group-item">You will report to the head of R&amp;D</li>
 			        <li class="list-group-item">You will initially be coached by senior developers</li>
 			        <li class="list-group-item">You will become a technical expert of the product.</li>
 			      </ul>
@@ -284,19 +271,6 @@
 		    </div>
 		</div>
 	    </section>
-	    <section snippet-id="cta" class="mt16 mb16">
-            	<div class="container">
-              	    <div class="row">
-			<section snippet-id="hr" class="mt16 mb16 dark">
-			    <hr/>
-	    		</section>
-                	<div class="col-md-12 text-center mt16 mb16">
-                    	    <a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
-                    	    <a href="/page/website_hr_recruitment.applyjobpost" class="btn btn-primary btn-lg">Apply</a>
-                	</div>
-              	    </div>
-            	</div>
-	    </section>
 	</field>
     </record>
 
@@ -432,19 +406,6 @@
 		    </div>
 		</div>
 	    </section>
-	    <section snippet-id="cta" class="mt16 mb16">
-            	<div class="container">
-              	    <div class="row">
-			<section snippet-id="hr" class="mt16 mb16 dark">
-			    <hr/>
-	    		</section>
-                	<div class="col-md-12 text-center mt16 mb16">
-                    	    <a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
-                    	    <a href="/page/website_hr_recruitment.applyjobpost" class="btn btn-primary btn-lg">Apply</a>
-                	</div>
-              	    </div>
-            	</div>
-	    </section>
 	</field>
     </record>
 
@@ -579,19 +540,6 @@
 		    </div>
 		</div>
 	    </section>
-	    <section snippet-id="cta" class="mt16 mb16">
-            	<div class="container">
-              	    <div class="row">
-			<section snippet-id="hr" class="mt16 mb16 dark">
-			    <hr/>
-	    		</section>
-                	<div class="col-md-12 text-center mt16 mb16">
-                    	    <a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
-                    	    <a href="/page/website_hr_recruitment.applyjobpost" class="btn btn-primary btn-lg">Apply</a>
-                	</div>
-              	    </div>
-            	</div>
-	    </section>
 	</field>
     </record>
 
@@ -626,7 +574,7 @@
 			      <!-- List group -->
 			      <ul class="list-group">
 			        <li class="list-group-item">You will work closely with all technical officer</li>
-			        <li class="list-group-item">You will report to the head of RD</li>
+			        <li class="list-group-item">You will report to the head of R&amp;D</li>
 			        <li class="list-group-item">You will initially be coached by senior technical officer</li>
 			        <li class="list-group-item">You will become a technical expert of the product.</li>
 			      </ul>
@@ -726,19 +674,6 @@
 		    </div>
 		</div>
 	    </section>
-	    <section snippet-id="cta" class="mt16 mb16">
-            	<div class="container">
-              	    <div class="row">
-			<section snippet-id="hr" class="mt16 mb16 dark">
-			    <hr/>
-	    		</section>
-                	<div class="col-md-12 text-center mt16 mb16">
-                    	    <a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
-                    	    <a href="/page/website_hr_recruitment.applyjobpost" class="btn btn-primary btn-lg">Apply</a>
-                	</div>
-              	    </div>
-            	</div>
-	    </section>
 	</field>
     </record>
 
@@ -773,7 +708,7 @@
 			      <!-- List group -->
 			      <ul class="list-group">
 			        <li class="list-group-item">You will work closely with all trainees</li>
-			        <li class="list-group-item">You will report to the head of RD</li>
+			        <li class="list-group-item">You will report to the head of R&amp;D</li>
 			        <li class="list-group-item">You will initially be coached by senior trainees</li>
 			        <li class="list-group-item">You will become a technical expert of the product.</li>
 			      </ul>
@@ -873,19 +808,6 @@
 		    </div>
 		</div>
 	    </section>
-	    <section snippet-id="cta" class="mt16 mb16">
-            	<div class="container">
-              	    <div class="row">
-			<section snippet-id="hr" class="mt16 mb16 dark">
-			    <hr/>
-	    		</section>
-                	<div class="col-md-12 text-center mt16 mb16">
-                    	    <a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
-                    	    <a href="/page/website_hr_recruitment.applyjobpost" class="btn btn-primary btn-lg">Apply</a>
-                	</div>
-              	    </div>
-            	</div>
-	    </section>
 	</field>
     </record>
 
@@ -1020,19 +942,6 @@
 		    </div>
 		</div>
 	    </section>
-	    <section snippet-id="cta" class="mt16 mb16">
-            	<div class="container">
-              	    <div class="row">
-			<section snippet-id="hr" class="mt16 mb16 dark">
-			    <hr/>
-	    		</section>
-                	<div class="col-md-12 text-center mt16 mb16">
-                    	    <a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
-                    	    <a href="/page/website_hr_recruitment.applyjobpost" class="btn btn-primary btn-lg">Apply</a>
-                	</div>
-              	    </div>
-            	</div>
-	    </section>
 	</field>
     </record>
     </data>