Update menu management and handle fragment so that menu is correctly rendered