Several menu fixes