diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 0f0f2785fc1..4bc358f4cda 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -466,6 +466,13 @@ class hr_job(osv.osv):
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                     help="Email alias for this job position. New emails will automatically "
                                          "create new applicants for this job position."),
+        'address_id': fields.many2one('res.partner', 'Job Location', help="Address where employees are working"),
+    }
+    def _address_get(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        return user.company_id.partner_id.id
+    _defaults = {
+        'address_id': _address_get
     }
 
     def _auto_init(self, cr, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3bf09d21a17..7a9bb35fec3 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -306,7 +306,14 @@
         <field name="model">hr.job</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="expected_employees" version="7.0" position="after">
+            <group name="job_data" position="inside">
+                <label for="address_id"/>
+                <div>
+                    <field name="address_id"/>
+                    <span class="oe_grey">(empty = remote work)</span>
+                </div>
+            </group>
+            <field name="expected_employees" position="after">
                 <label for="survey_id" groups="base.group_user"/>
                 <div groups="base.group_user">
                     <field name="survey_id" class="oe_inline" domain="[('type','=','Human Resources')]"/>
diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py
index 86c882c8952..9062bcdf1bb 100644
--- a/addons/website_hr_recruitment/controllers/main.py
+++ b/addons/website_hr_recruitment/controllers/main.py
@@ -10,16 +10,37 @@ import base64
 
 
 class website_hr_recruitment(http.Controller):
-
-    @website.route(['/jobs', '/department/<model("hr.department"):id>'], type='http', auth="public", multilang=True)
-    def jobs(self, department=None, page=0):
+    @website.route(['/jobs', '/jobs/department/<model("hr.department"):department>/office/<model("res.partner"):office>', '/jobs/department/<model("hr.department"):department>', '/jobs/office/<model("res.partner"):office>'], type='http', auth="public", multilang=True)
+    def jobs(self, department=None, office=None, page=0):
         hr_job_obj = request.registry['hr.job']
         domain = []
-        if department:
-            domain += [('department_id','=', department.id)]
         jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, order="website_published,no_of_recruitment", context=request.context)
+        jobs = hr_job_obj.browse(request.cr, request.uid, jobpost_ids, request.context)
+
+        departments = set()
+        for job in jobs:
+            if job.department_id:
+                departments.add(job.department_id)
+
+        offices = set()
+        for job in jobs:
+            if job.address_id:
+                offices.add(job.address_id)
+
+        if department or office:
+            if office:
+                domain += [('address_id','=', office.id)]
+            if department:
+                domain += [('department_id','=', department.id)]
+            jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, order="website_published,no_of_recruitment", context=request.context)
+            jobs = hr_job_obj.browse(request.cr, request.uid, jobpost_ids, request.context)
+
         return request.website.render("website_hr_recruitment.index", {
-            'jobs': hr_job_obj.browse(request.cr, request.uid, jobpost_ids, request.context),
+            'jobs': jobs,
+            'departments': departments,
+            'offices': offices,
+            'active': department and department.id or None, 
+            'office': office and office.id or None
         })
 
     @website.route(['/job/detail/<model("hr.job"):job>'], type='http', auth="public", multilang=True)
@@ -39,7 +60,8 @@ class website_hr_recruitment(http.Controller):
             'partner_name': post.get('partner_name', False),
             'description': post.get('description', False),
             'department_id': post.get('department_id', False),
-            'job_id': post.get('job_id', False)
+            'job_id': post.get('job_id', False),
+            'user_id': False
         }
 
         imd = request.registry['ir.model.data']
diff --git a/addons/website_hr_recruitment/models/hr_job.py b/addons/website_hr_recruitment/models/hr_job.py
index bce498d22d0..96e2c1d7efd 100644
--- a/addons/website_hr_recruitment/models/hr_job.py
+++ b/addons/website_hr_recruitment/models/hr_job.py
@@ -6,7 +6,6 @@ from openerp.osv import osv, fields
 class hr_job(osv.osv):
     """ Override to add website-related columns: published, description. """
     _inherit = "hr.job"
-
     _columns = {
         'website_published': fields.boolean('Available in 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 fb378078027..c663edc1521 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -50,7 +50,10 @@
                     </div>
                     <div class="container oe_website_jobs">
                         <div class="row">
-                            <div class="col-md-12" id="jobs_grid">
+                            <div class="col-md-1" id="jobs_grid_left">
+
+                            </div>
+                            <div class="col-md-9" id="jobs_grid">
                                 <ul class="media-list">
                                     <li t-foreach="jobs" t-as="job" class="media">
                                         <div class="media-body" t-att-data-publish="job.website_published and 'on' or 'off'">
@@ -63,11 +66,11 @@
                                                 </small>
                                             </h3>
 
-                                            <div t-if="job.department_id and job.department_id.company_id">
+                                            <div t-if="job.address_id">
                                                 <i class="icon-map-marker"/>
-                                                <span t-field="job.department_id.company_id.city"/>
-                                                <span t-if="job.department_id.company_id.state_id" t-field="job.department_id.company_id.state_id.name"/>
-                                                , <span t-field="job.department_id.company_id.country_id.name"/>
+                                                <span t-field="job.address_id.city"/>
+                                                <span t-if="job.address_id.state_id" t-field="job.address_id.state_id"/>
+                                                , <span t-field="job.address_id.country_id.name"/>
                                             </div>
                                             <div class="text-muted">
                                                 <i class="icon-time"/> <span t-field="job.write_date"/>
@@ -98,19 +101,29 @@
             <t t-call="website.layout">
             <t t-set="additional_title">Job Detail</t>
             <div id="wrap">
-                <div class="container oe_website_hr_recruitment">
+
+                <section class="container mt8">
                     <div class="row">
-                        <t t-call="website.publish_management">
-                            <t t-set="object" t-value="job"/>
-                            <t t-set="publish_edit" t-value="True"/>
-                            <t t-set="publish_controller">/job/publish</t>
-                        </t>
+                      <div class="col-sm-5">
+                          <ol class="breadcrumb mb0">
+                              <li><a t-href="/jobs">Our Jobs</a></li>
+                              <li class="active"><span t-field="job.name"></span></li>
+                          </ol>
+                      </div><div class="col-sm-7">
+                          <t t-call="website.publish_management">
+                              <t t-set="object" t-value="job"/>
+                              <t t-set="publish_edit" t-value="True"/>
+                              <t t-set="publish_controller">/job/publish</t>
+                          </t>
+                      </div>
                     </div>
-                </div>
+                </section>
+
                 <div class="oe_structure" style="clear:both;">
                     <h1 class="text-center" t-field="job.name"/>
                     <h5 class="text-center">
-                        <i class="icon-map-marker"/> <span t-field="job.company_id.city"> </span>  <span t-if="job.company_id.state_id" t-field="job.company_id.state_id.name"> </span>, <span t-field="job.company_id.country_id.name"> </span></h5>
+                        <i class="icon-map-marker"/> <span t-field="job.address_id.city"/> <span t-if="job.address_id.state_id" t-field="job.address_id.state_id.name"/>, <span t-field="job.address_id.country_id.name"/>
+                    </h5>
                     <h5 class="text-center text-muted">
                                     <i class="icon-time"/> <span><t t-esc="vals_date"/></span>
                     </h5>
@@ -196,52 +209,67 @@
             </t>
         </template>
 
-    <template id="thankyou">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="oe_structure">
-                    <div class="container">
-                        <h1>Thank you!</h1>
-                        <p>
-                            Your job application has been successfully registered,
-                            we will get back to you soon.
-                        </p>
-                    </div>
-                    <section data-snippet-id="cta" class="darken">
+        <template id="thankyou">
+            <t t-call="website.layout">
+                <div id="wrap">
+                    <div class="oe_structure">
                         <div class="container">
-                            <div class="row">
-                                <div class="col-md-12 text-center mt16 mb16">
-                                    <a t-href="/" class="btn btn-primary btn-lg">Continue To Our Website</a>
+                            <h1>Thank you!</h1>
+                            <p>
+                                Your job application has been successfully registered,
+                                we will get back to you soon.
+                            </p>
+                        </div>
+                        <section data-snippet-id="cta" class="darken">
+                            <div class="container">
+                                <div class="row">
+                                    <div class="col-md-12 text-center mt16 mb16">
+                                        <a t-href="/" class="btn btn-primary btn-lg">Continue To Our Website</a>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    </section>
+                        </section>
+                    </div>
                 </div>
-            </div>
-        </t>
-    </template>
+            </t>
+        </template>
 
-    <template id="job_departments" inherit_option_id="website_hr_recruitment.index" name="Job Departments">
-        <xpath expr="//div[@id='jobs_grid']" position="before">
-            <div class="col-md-3">
-                <ul class="nav nav-pills nav-stacked mt16">
+        <template id="job_departments" inherit_option_id="website_hr_recruitment.index" name="Filter on Departments">
+            <xpath expr="//div[@id='jobs_grid_left']" position="inside">
+                <ul class="nav nav-pills nav-stacked mb32">
                     <li t-att-class=" '' if active else 'active' "><a t-href="/jobs">All Departments</a></li>
                     <t t-foreach="departments" t-as="department">
                         <li t-att-class="department.id == active and 'active' or ''">
-                        <a t-href="/department/#{ department.id }/" ><span t-field="department.name"/></a>
+                        <a t-href="/jobs/department/#{ department.id }/" ><span t-field="department.name"/></a>
                         </li>
                     </t>
                 </ul>
-            </div>
-        </xpath>
-        <xpath expr="//div[@id='jobs_grid']" position="attributes">
-            <attribute name="class">col-md-9</attribute>
-        </xpath>
-        <xpath expr="//div[@class='row']/div" position="before">
-            <div class="col-md-4">
-            <h1>Departments</h1>
-            </div>
-        </xpath>
-    </template>
-     </data>
+            </xpath>
+            <xpath expr="//div[@id='jobs_grid_left']" position="attributes">
+                <attribute name="class">col-md-3</attribute>
+            </xpath>
+        </template>
+
+        <template id="job_offices" inherit_option_id="website_hr_recruitment.index" name="Filter on Offices">
+            <xpath expr="//div[@id='jobs_grid_left']" position="inside">
+                <ul class="nav nav-pills nav-stacked mb32">
+                    <li t-att-class=" '' if office else 'active' "><a t-href="/jobs">All Offices</a></li>
+                    <t t-foreach="offices" t-as="thisoffice">
+                        <li t-att-class="thisoffice.id == office and 'active' or ''">
+                            <a t-href="/jobs/office/#{ thisoffice.id }/" >
+                                <span t-field="thisoffice.city"/><t t-if="thisoffice.country_id">, 
+                                    <span t-field="thisoffice.country_id.name"/>
+                                </t>
+                            </a>
+                        </li>
+                    </t>
+                </ul>
+            </xpath>
+            <xpath expr="//div[@id='jobs_grid_left']" position="attributes">
+                <attribute name="class">col-md-3</attribute>
+            </xpath>
+        </template>
+
+
+    </data>
 </openerp>