Fixing menu bugs