menus managment improved. better navigation