further menu fixes