fixed menu bugs