menu fixes #2