Fixed menu bugs