Small fixes for the menu