diff --git a/addons/hr_timesheet/project_timesheet_view.xml b/addons/hr_timesheet/project_timesheet_view.xml
index 85419987cdd..b9a7ec32cf7 100644
--- a/addons/hr_timesheet/project_timesheet_view.xml
+++ b/addons/hr_timesheet/project_timesheet_view.xml
@@ -20,6 +20,22 @@
               </p>
             </field>
         </record>
+
+        <record id="project_project_view_form_simplified_inherit_timesheet" model="ir.ui.view">
+            <field name="name">project.project.view.form.simplified.inherit.timesheet</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="project.project_project_view_form_simplified"/>
+            <field name="priority">24</field>
+            <field name="arch" type="xml">
+                <group name="options" position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </group>
+                <field name="use_tasks" position="after">
+                    <field name="allow_timesheets"/>
+                </field>
+            </field>
+        </record>
+
         <record id="project_invoice_form" model="ir.ui.view">
             <field name="name">Inherit project form : Invoicing Data</field>
             <field name="model">project.project</field>
diff --git a/addons/project/report/project_report_views.xml b/addons/project/report/project_report_views.xml
index 45d6e3303dc..0471402d631 100644
--- a/addons/project/report/project_report_views.xml
+++ b/addons/project/report/project_report_views.xml
@@ -6,9 +6,9 @@
             <field name="model">report.project.task.user</field>
             <field name="arch" type="xml">
                 <pivot string="Tasks Analysis" display_quantity="true" disable_linking="True">
-                     <field name="project_id" type="row"/>
-                 </pivot>
-             </field>
+                    <field name="project_id" type="row"/>
+                </pivot>
+            </field>
         </record>
 
         <record id="view_task_project_user_graph" model="ir.ui.view">
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 35117f0708e..2429c7cdcb0 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -106,16 +106,18 @@
                     <notebook>
                         <page string="Settings">
                             <group>
+                                <field name="user_id" string="Project Manager"
+                                        attrs="{'readonly':[('active','=',False)]}"/>
                                 <field name="privacy_visibility" widget="radio"/>
                                 <field name="partner_id" string="Customer"/>
-                                <field name="user_id" string="Project Manager"
-                                        attrs="{'readonly':[('active','=',False)]}"
-                                        groups="base.group_no_one"/>
                             </group>
                             <group name="misc">
                                 <group string="Configuration" groups="base.group_no_one">
                                     <field name="sequence" groups="base.group_no_one"/>
                                 </group>
+                                <group string="Time Scheduling" groups="base.group_no_one">
+                                    <field name="resource_calendar_id" groups="base.group_no_one"/>
+                                </group>
                             </group>
                         </page>
                         <page string="Emails" attrs="{'invisible': [('alias_domain', '=', False)]}">
@@ -128,9 +130,9 @@
                                         <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
                                     </div>
                                 </div>
-                                <label for="alias_model" string="Incoming Emails create" groups="base.group_no_one"/>
-                                <field name="alias_model" class="oe_inline" nolabel="1" groups="base.group_no_one"/>
-                                <field name="alias_contact" class="oe_inline" groups="base.group_no_one"
+                                <label for="alias_model" string="Incoming Emails create" class="oe_edit_only"/>
+                                <field name="alias_model" class="oe_inline oe_edit_only" nolabel="1"/>
+                                <field name="alias_contact" class="oe_inline oe_edit_only"
                                         string="Accept Emails From"/>
                             </group>
                         </page>
@@ -186,12 +188,17 @@
                 <form string="Project">
                     <sheet>
                         <group>
-                            <field name="name" class="o_project_name oe_inline"
-                                string="Project Name" placeholder="e.g. Office Party"/>
-                            <label for="alias_name" string="Choose a Project Email" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                            <div name="alias_def" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
-                            </div>
+                            <group>
+                                <field name="name" class="o_project_name oe_inline"
+                                    string="Project Name" placeholder="e.g. Office Party"/>
+                                <label for="alias_name" string="Choose a Project Email" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
+                                <div name="alias_def" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <field name="alias_name" class="oe_inline"/>@<field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </div>
+                            </group>
+                            <group name='options' invisible="1">
+                                <field name="use_tasks"/>
+                            </group>
                         </group>
                         <footer>
                             <button string="Create" name="close_dialog" type="object" class="btn-primary"/>
@@ -610,43 +617,43 @@ action = model.activate_sample_project()
             <field name="model">project.task.type</field>
             <field name="arch" type="xml">
                 <form string="Task Stage">
-                    <group>
+                    <sheet>
                         <group>
-                            <field name="name"/>
-                            <field name="mail_template_id" groups="base.group_no_one"/>
+                            <group>
+                                <field name="name"/>
+                                <field name="mail_template_id"/>
+                            </group>
+                            <group>
+                                <field name="fold"/>
+                                <field name="project_ids" widget="many2many_tags" groups="base.group_no_one"/>
+                                <field name="sequence" groups="base.group_no_one"/>
+                            </group>
                         </group>
-                        <group>
-                            <field name="fold"/>
-                            <field name="sequence" groups="base.group_no_one"/>
+                        <group string="Stage Description and Tooltips">
+                            <p class="text-muted" colspan="2">
+                                At each stage employees can block or make task/issue ready for next stage.
+                                You can define here labels that will be displayed for the state instead
+                                of the default labels.
+                            </p>
+                            <label for="legend_normal" string=" " class="oe_kanban_status oe_project_kanban_legend"/>
+                            <field name="legend_normal" nolabel="1"/>
+                            <label for="legend_blocked" string=" " class="oe_kanban_status oe_kanban_status_red oe_project_kanban_legend"/>
+                            <field name="legend_blocked" nolabel="1"/>
+                            <label for="legend_done" string=" " class="oe_kanban_status oe_kanban_status_green oe_project_kanban_legend"/>
+                            <field name="legend_done" nolabel="1"/>
+
+                            <p class="text-muted" colspan="2">
+                                You can also give a tooltip about the use of the stars available in the kanban and form views.
+                            </p>
+                            <label for="legend_priority" string=" " class="fa fa-star fa-lg o_star_on oe_project_kanban_legend"/>
+                            <field name="legend_priority" nolabel="1"/>
+
+                            <p class="text-muted" colspan="2">
+                                You can also add a description to help your coworkers understand the meaning and purpose of the stage.
+                            </p>
+                            <field name="description" placeholder="Add a description..." nolabel="1" colspan="2"/>
                         </group>
-                    </group>
-                    <group string="Stage Description and Tooltips">
-                        <p class="text-muted" colspan="2">
-                            At each stage employees can block or make task/issue ready for next stage.
-                            You can define here labels that will be displayed for the state instead
-                            of the default labels.
-                        </p>
-                        <label for="legend_normal" string=" " class="oe_kanban_status oe_project_kanban_legend"/>
-                        <field name="legend_normal" nolabel="1"/>
-                        <label for="legend_blocked" string=" " class="oe_kanban_status oe_kanban_status_red oe_project_kanban_legend"/>
-                        <field name="legend_blocked" nolabel="1"/>
-                        <label for="legend_done" string=" " class="oe_kanban_status oe_kanban_status_green oe_project_kanban_legend"/>
-                        <field name="legend_done" nolabel="1"/>
-
-                        <p class="text-muted" colspan="2">
-                            You can also give a tooltip about the use of the stars available in the kanban and form views.
-                        </p>
-                        <label for="legend_priority" string=" " class="fa fa-star fa-lg o_star_on oe_project_kanban_legend"/>
-                        <field name="legend_priority" nolabel="1"/>
-
-                        <p class="text-muted" colspan="2">
-                            You can also add a description to help your coworkers understand the meaning and purpose of the stage.
-                        </p>
-                        <field name="description" placeholder="Add a description..." nolabel="1" colspan="2"/>
-                    </group>
-                    <group string="Projects using this stage" groups="base.group_no_one">
-                        <field name="project_ids" widget="many2many_tags"/>
-                    </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/views/project_issue_views.xml b/addons/project_issue/views/project_issue_views.xml
index 97fd873770a..dc8e8aa91b1 100644
--- a/addons/project_issue/views/project_issue_views.xml
+++ b/addons/project_issue/views/project_issue_views.xml
@@ -41,16 +41,18 @@
                         <page string="Extra Info" name="extra_info" groups="project.group_project_manager,project.group_project_user">
                             <group>
                                 <group>
-                                    <field name="id"/>
+                                    <field name="id" groups="base.group_no_one"/>
                                     <field name="day_open"/>
                                     <field name="day_close"/>
+                                    <field name="legend_blocked" invisible="1"/>
+                                    <field name="legend_done" invisible="1"/>
+                                    <field name="legend_normal" invisible="1"/>
+                                </group>
+                                <group>
                                     <field name="working_hours_open" widget="float_time"/>
                                     <field name="working_hours_close" widget="float_time"/>
                                     <field name="inactivity_days"/>
                                     <field name="days_since_creation"/>
-                                    <field name="legend_blocked" invisible="1"/>
-                                    <field name="legend_done" invisible="1"/>
-                                    <field name="legend_normal" invisible="1"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/project_issue/views/project_project_views.xml b/addons/project_issue/views/project_project_views.xml
index e9a86f2be13..b5169400bb3 100644
--- a/addons/project_issue/views/project_project_views.xml
+++ b/addons/project_issue/views/project_project_views.xml
@@ -5,11 +5,14 @@
         <field name="name">project.project.view.form.simplified.inherit.issue</field>
         <field name="model">project.project</field>
         <field name="inherit_id" ref="project.project_project_view_form_simplified"/>
+        <field name="priority">16</field>
         <field name="arch" type="xml">
-            <div name="alias_def" position="after">
-                <field name="use_tasks"/>
+            <group name="options" position="attributes">
+                <attribute name="invisible">0</attribute>
+            </group>
+            <field name="use_tasks" position="after">
                 <field name="use_issues"/>
-            </div>
+            </field>
         </field>
     </record>
 
diff --git a/addons/rating_project/views/project_view.xml b/addons/rating_project/views/project_view.xml
index 6e813b666ff..97e3984ad81 100644
--- a/addons/rating_project/views/project_view.xml
+++ b/addons/rating_project/views/project_view.xml
@@ -86,7 +86,7 @@
             <field name="inherit_id" ref="project.task_type_edit"/>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='sequence']" position="after">
+                <xpath expr="//field[@name='mail_template_id']" position="after">
                     <field name="rating_template_id"/>
                     <field name="auto_validation_kanban_state" attrs="{'invisible': [('rating_template_id','=', False)]}"/>
                 </xpath>