diff --git a/runbot/views/build_error_views.xml b/runbot/views/build_error_views.xml
index 61e23581..7ca0c566 100644
--- a/runbot/views/build_error_views.xml
+++ b/runbot/views/build_error_views.xml
@@ -94,7 +94,7 @@
</notebook>
</sheet>
<div class="oe_chatter">
- <field name="message_follower_ids" widget="mail_followers"/>
+ <field name="message_follower_ids"/>
<field name="message_ids"/>
<field name="activity_ids"/>
</div>
@@ -178,7 +178,7 @@
</group>
</sheet>
<div class="oe_chatter">
- <field name="message_follower_ids" widget="mail_followers"/>
+ <field name="message_follower_ids"/>
<field name="message_ids"/>
</div>
</form>
diff --git a/runbot/views/bundle_views.xml b/runbot/views/bundle_views.xml
index c4df31ef..04952c79 100644
--- a/runbot/views/bundle_views.xml
+++ b/runbot/views/bundle_views.xml
@@ -37,52 +37,58 @@
<field name="arch" type="xml">
<form string="Bundles">
<sheet>
- <div class="oe_button_box" name="button_box">
- </div>
<group>
- <field name="name" widget="char_frontend_url"/>
- <field name="project_id"/>
- <field name="sticky" readonly="0"/>
- <field name="to_upgrade" readonly="0"/>
- <field name="is_base"/>
- <field name="base_id"/>
- <field name="defined_base_id"/>
- <field name="version_id"/>
- <field name="no_build"/>
- <field name="no_auto_run"/>
- <field name="priority"/>
- <field name="build_all"/>
- <field name="dockerfile_id"/>
- <field name="host_id" readonly="0"/>
- <field name="commit_limit"/>
- <field name="file_limit"/>
- <field name="disable_codeowner"/>
- <field name="for_next_freeze"/>
- <field name="branch_ids">
- <tree>
- <field name="dname"/>
- <field name="remote_id"/>
- <field name="pull_head_name"/>
- <field name="target_branch_name"/>
- </tree>
- </field>
- <field string="Trigger customisations" name="trigger_custom_ids">
- <tree editable="bottom">
- <field name="start_mode"/>
- <field name="trigger_id" domain="[('project_id', '=', parent.project_id)]"/>
- <field name="config_id"/>
- <field name="extra_params"/>
- <field name="config_data" widget="jsonb"/>
- </tree>
- </field>
- <field string="Last batches" name="last_batchs">
- <tree>
- <field name="state"/>
- <field name="commit_link_ids"/>
- <field name="slot_ids"/>
- </tree>
- </field>
+ <group string="Base options">
+ <field name="name" widget="char_frontend_url"/>
+ <field name="project_id"/>
+ <field name="sticky" readonly="0"/>
+ <field name="to_upgrade" readonly="0"/>
+ <field name="is_base"/>
+ <field name="base_id"/>
+ <field name="defined_base_id"/>
+ <field name="version_id"/>
+ <field name="for_next_freeze"/>
+ </group>
+ <group string="Testing options">
+ <field name="no_build"/>
+ <field name="no_auto_run"/>
+ <field name="priority"/>
+ <field name="build_all"/>
+ <field name="dockerfile_id"/>
+ <field name="host_id" readonly="0"/>
+ <field name="commit_limit"/>
+ <field name="file_limit"/>
+ <field name="disable_codeowner"/>
+ </group>
</group>
+ <group string="branches"/>
+ <field name="branch_ids" nolabel="1">
+ <tree>
+ <field name="dname"/>
+ <field name="remote_id"/>
+ <field name="pull_head_name"/>
+ <field name="target_branch_name"/>
+ </tree>
+ </field>
+ <group string="Trigger customisation"/>
+ <field name="trigger_custom_ids" nolabel="1">
+ <tree editable="bottom">
+ <field name="start_mode"/>
+ <field name="trigger_id" domain="[('project_id', '=', parent.project_id)]"/>
+ <field name="config_id"/>
+ <field name="extra_params"/>
+ <field name="config_data" widget="jsonb"/>
+ </tree>
+ </field>
+ <group string="Last batchs"/>
+ <field name="last_batchs" nolabel="1">
+ <tree>
+ <field name="id" widget="char_frontend_url"/>
+ <field name="state"/>
+ <field name="commit_link_ids"/>
+ <field name="slot_ids"/>
+ </tree>
+ </field>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids"/>