fixes for menu