Removed menu bugs