Some fixes and improvements in top and main menus in the BO.