partly refactored menu in Favorites