diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4aae6c42a18..caf5a354f0c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,13 +30,14 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name" class="oe_inline"/>
-                                <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
-                                <field class="oe_inline" name="job_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                <label class="oe_inline" string="at" attrs="{'invisible': [('work_location', '=', False)]}"/>
-                                <field class="oe_inline" name="work_location" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}"/>
+                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                             </h1>
                             <label for="department_id" class="oe_edit_only"/>
                             <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
+                            <label for="category_ids" class="oe_edit_only"/>
                             <h3><field name="category_ids" widget="many2many_tags"/></h3>
                         </div>
                         <group colspan="4" col="4">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5769bbdce0b..51709935fd8 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -132,10 +132,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Miscellaneous" position="after">
+                <page string="Personal Information" position="after">
                     <page string="Appraisal" groups="base.group_hr_user">
-                        <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
-                        <field name="evaluation_date"/>
+                        <group col="4">
+                            <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
+                            <field name="evaluation_date"/>
+                        </group>
                     </page>
                 </page>
             </field>