menu bugs squashed