diff --git a/runbot/views/bundle_views.xml b/runbot/views/bundle_views.xml
index 8ab8a1bc..2ebaa2d0 100644
--- a/runbot/views/bundle_views.xml
+++ b/runbot/views/bundle_views.xml
@@ -50,6 +50,8 @@
                     <field name="build_all"/>
                     <field name="dockerfile_id"/>
                     <field name="host_id" readonly="0"/>
+                    <field name="commit_limit"/>
+                    <field name="file_limit"/>
                     <field name="branch_ids">
                         <tree>
                             <field name="dname"/>
diff --git a/runbot/views/menus.xml b/runbot/views/menus.xml
index 1e87044b..0b7de659 100644
--- a/runbot/views/menus.xml
+++ b/runbot/views/menus.xml
@@ -2,62 +2,58 @@
 <odoo> 
     <menuitem name="Runbot" id="runbot_menu_root"/>
 
-    <menuitem id="menu_runbot_global_settings" parent="runbot_menu_root" sequence="0" action="action_runbot_configuration" groups="base.group_system"/>
+    <menuitem name="Objects" id="menu_objects" parent="runbot_menu_root" sequence="200"/>
+    <menuitem action="action_build" id="menu_build_build" parent="menu_objects" sequence="10" />
+    <menuitem action="action_build_params" id="menu_build_params" parent="menu_objects" sequence="15" />
+    <menuitem id="menu_bundle" action="action_bundle" parent="menu_objects" sequence="20"/>
+    <menuitem id="menu_bundle_batch" action="action_bundle_batch" parent="menu_objects" sequence="25" />
+    <menuitem name="Branches" id="runbot_menu_branch_tree" parent="menu_objects" sequence="40" action="open_view_branch_tree"/>
+    <menuitem name="Commits" id="runbot_menu_commit_tree" parent="menu_objects" sequence="50" action="open_view_commit_tree"/>
+    <menuitem name="Statistics" id="runbot_menu_stat_tree" parent="menu_objects" sequence="60" action="open_view_stat_sql_tree"/>
+   
 
-    <menuitem name="Build" id="menu_build" parent="runbot_menu_root"/>
-    <menuitem action="action_build" id="menu_build_build" parent="menu_build"/>
-    <menuitem action="action_build_params" id="menu_build_params" parent="menu_build"/>
+    <menuitem name="Hosts" id="runbot_menu_host_tree" parent="runbot_menu_root" sequence="300" action="open_view_host_tree"/>
 
-    <menuitem name="Bundle" id="menu_bundle" parent="runbot_menu_root"/>
-    <menuitem id="menu_bundle_bundle" action="action_bundle" parent="menu_bundle"/>
-    <menuitem id="menu_bundle_project" action="action_bundle_project" parent="menu_bundle"/>
-    <menuitem id="menu_bundle_version" action="action_bundle_version" parent="menu_bundle"/>
-    <menuitem id="menu_bundle_batch" action="action_bundle_batch" parent="menu_bundle"/>
 
-    <menuitem name="Repos" id="runbot_menu_repos_main" parent="runbot_menu_root"/>
-    <menuitem id="runbot_menu_repos" parent="runbot_menu_repos_main" sequence="10" action="runbot_repos_action"/>
-    <menuitem id="runbot_menu_remotes" parent="runbot_menu_repos_main" sequence="20" action="runbot_remotes_action"/>
-    <menuitem id="runbot_menu_trigger" parent="runbot_menu_repos_main" sequence="30" action="runbot_triggers_action"/>
-    <menuitem id="runbot_menu_trigger_category" parent="runbot_menu_repos_main" sequence="40" action="runbot_triggers_category_action"/>
+    <menuitem id="runbot_menu_trigger" parent="runbot_menu_root" sequence="500" action="runbot_triggers_action"/>
 
-    <menuitem name="Branches" id="runbot_menu_branch_tree" parent="runbot_menu_root" sequence="20" action="open_view_branch_tree"/>
-
-    <menuitem name="Commits" id="runbot_menu_commit_tree" parent="runbot_menu_root" sequence="20" action="open_view_commit_tree"/>
-
-    <menuitem name="Configs" id="runbot_menu_configs" parent="runbot_menu_root" sequence="30"/>
+    <menuitem name="Configs" id="runbot_menu_configs" parent="runbot_menu_root" sequence="600"/>
     <menuitem id="runbot_menu_job_config_tree" parent="runbot_menu_configs" sequence="10" action="open_view_job_config_tree"/>
     <menuitem id="runbot_menu_job_tree" parent="runbot_menu_configs" sequence="20" action="open_view_job_tree"/>
-    <menuitem id="runbot_menu_upgrade_exceptions_tree" parent="runbot_menu_configs" sequence="30" action="open_view_upgrade_exception_tree"/>
-    <menuitem id="runbot_menu_upgrade_regex_tree" parent="runbot_menu_configs" sequence="30" action="open_view_upgrade_regex_tree"/>
+    <menuitem name="CodeOwners" id="runbot_menu_codeowner_tree" parent="runbot_menu_configs" sequence="30" action="open_view_codeowner_tree"/>
 
-    <menuitem name="Build Hosts" id="runbot_menu_host_tree" parent="runbot_menu_root" sequence="32" action="open_view_host_tree"/>
+    <menuitem id="runbot_menu_upgrade_exceptions_tree" parent="runbot_menu_root" sequence="700" action="open_view_upgrade_exception_tree"/>
 
-    <menuitem name="Docker" id="menu_docker" parent="runbot_menu_root" sequence="34"/>
-    <menuitem name="Dockerfiles" id="menu_dockerfile" parent="menu_docker" action="open_view_dockerfile_tree" sequence="10"/>
+    <menuitem name="Docker" id="menu_dockerfile" parent="runbot_menu_root" action="open_view_dockerfile_tree" sequence="800"/>
 
-    <menuitem name="Manage errors" id="runbot_menu_manage_errors" parent="runbot_menu_root" sequence="40"/>
+    <menuitem name="Manage errors" id="runbot_menu_manage_errors" parent="runbot_menu_root" sequence="900"/>
     <menuitem name="Build errors" id="runbot_menu_build_error_tree" parent="runbot_menu_manage_errors" sequence="10" action="open_view_build_error_tree"/>
-    <menuitem name="Error regex" id="runbot_menu_error_regex_tree" parent="runbot_menu_manage_errors" sequence="20" action="open_view_error_regex"/>
-    <menuitem name="Runbot Teams" id="runbot_menu_team_tree" parent="runbot_menu_manage_errors" sequence="30" action="open_view_runbot_team"/>
-    <menuitem name="Runbot Dashboards" id="runbot_menu_runbot_dashboard_tree" parent="runbot_menu_manage_errors" sequence="40" action="open_view_runbot_dashboard"/>
-    <menuitem name="Runbot Dashboard Tiles" id="runbot_menu_runbot_dashboard_tile_tree" parent="runbot_menu_manage_errors" sequence="50" action="open_view_runbot_dashboard_tile"/>
-    <menuitem name="CodeOwners" id="runbot_menu_codeowner_tree" parent="runbot_menu_manage_errors" sequence="90" action="open_view_codeowner_tree"/>
+    <menuitem name="Error Logs" id="runbot_menu_error_logs" parent="runbot_menu_manage_errors" sequence="20" action="open_view_error_log_tree"/>
 
-    <menuitem name="Logs" id="runbot_log_menu" parent="runbot_menu_root" sequence="50"/>
-    <menuitem name="Error Logs" id="runbot_menu_error_logs" parent="runbot_log_menu" sequence="20" action="open_view_error_log_tree"/>
+    <menuitem name="Teams" id="runbot_menu_teams" parent="runbot_menu_root" sequence="1000"/>
+    <menuitem name="Teams" id="runbot_menu_team_tree" parent="runbot_menu_teams" sequence="30" action="open_view_runbot_team"/>
+    <menuitem name="Dashboards" id="runbot_menu_runbot_dashboard_tree" parent="runbot_menu_teams" sequence="40" action="open_view_runbot_dashboard"/>
+    <menuitem name="Dashboard Tiles" id="runbot_menu_runbot_dashboard_tile_tree" parent="runbot_menu_teams" sequence="50" action="open_view_runbot_dashboard_tile"/>
+   
+    <menuitem name="Warnings" id="runbot_menu_warning_root" parent="runbot_menu_root" sequence="1200" action="open_view_warning_tree"/>
 
-    <menuitem name="Build Statistics" id="runbot_menu_stat_root" parent="runbot_menu_root" sequence="100"/>
-    <menuitem name="Build Statistics" id="runbot_menu_stat_tree" parent="runbot_menu_stat_root" sequence="10" action="open_view_stat_sql_tree"/>
-    <menuitem name="Stats Regexes" id="runbot_menu_manage_stat_regexes" parent="runbot_menu_stat_root" sequence="20" action="open_view_stat_regex_tree"/>
-    <menuitem name="Stat Regex Wizard" id="runbot_menu_stat_regex_wizard" parent="runbot_menu_stat_root" sequence="150" action="runbot_stat_regex_wizard_action"/>
-
-    <menuitem name="Warnings" id="runbot_menu_warning_root" parent="runbot_menu_root" sequence="110" action="open_view_warning_tree"/>
-
-    <menuitem name="Technical" id="runbot_menu_technical" parent="runbot_menu_root" sequence="1000"/>
+    <menuitem name="Settings" id="menu_runbot_settings" parent="runbot_menu_root" sequence="9000" />
+    <menuitem id="menu_runbot_global_settings" parent="menu_runbot_settings" action="action_runbot_configuration" groups="base.group_system"/>
+    <menuitem id="menu_bundle_project" action="action_bundle_project"  sequence="10" parent="menu_runbot_settings"/>
+    <menuitem id="menu_bundle_version" action="action_bundle_version"  sequence="20" parent="menu_runbot_settings"/>
+    <menuitem id="runbot_menu_repos" parent="menu_runbot_settings" sequence="30" action="runbot_repos_action"/>
+    <menuitem id="runbot_menu_remotes" parent="menu_runbot_settings" sequence="40" action="runbot_remotes_action"/>
+    <menuitem id="runbot_menu_trigger_category" parent="menu_runbot_settings" sequence="50" action="runbot_triggers_category_action"/>
+    <menuitem id="runbot_menu_upgrade_regex_tree" parent="menu_runbot_settings" sequence="60" action="open_view_upgrade_regex_tree"/>
+    <menuitem name="Stats Regexes" id="runbot_menu_stat" parent="menu_runbot_settings" sequence="70" action="open_view_stat_regex_tree"/>
+    <menuitem name="Stat Regex Wizard" id="runbot_menu_stat_wizard" parent="menu_runbot_settings" sequence="80" action="runbot_stat_regex_wizard_action"/>
+    <menuitem name="Error regex" id="runbot_menu_error_regex_tree" parent="menu_runbot_settings" sequence="20" action="open_view_error_regex"/>
+    
+    <menuitem name="Technical" id="runbot_menu_technical" parent="menu_runbot_settings" sequence="10000"/>
     <menuitem id="runbot_menu_ir_cron_act" action="base.ir_cron_act" parent="runbot_menu_technical"/>
     <menuitem id="runbot_menu_base_automation_act" action="base_automation.base_automation_act" parent="runbot_menu_technical"/>
     <menuitem id="runbot_menu_action_ui_view" action="base.action_ui_view" parent="runbot_menu_technical"/>
 
-    <menuitem name="▶" id="runbot_menu_website" parent="runbot_menu_root" sequence="1001" action="website.action_website"/>
+    <menuitem name="▶" id="runbot_menu_website" parent="runbot_menu_root" sequence="20000" action="website.action_website"/>
 
 </odoo>