added helps in the menus
Fix conflicts