Fix toolbar menus organisation