Small fixes for menu