Small menu fixes