Better fix for menu