fixing menu bugs