more changes to Menu