menu bugs fixed